diff options
| -rw-r--r-- | app/Api/Auth.php | 4 | ||||
| -rw-r--r-- | app/Api/Base.php | 2 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | composer.lock | 14 | ||||
| -rw-r--r-- | tests/integration/Base.php | 6 | ||||
| -rw-r--r-- | tests/integration/MeTest.php | 10 |
6 files changed, 19 insertions, 19 deletions
diff --git a/app/Api/Auth.php b/app/Api/Auth.php index 6c6e1ebe..1cc6627f 100644 --- a/app/Api/Auth.php +++ b/app/Api/Auth.php @@ -2,7 +2,7 @@ namespace Kanboard\Api; -use JsonRPC\AuthenticationFailure; +use JsonRPC\Exception\AuthenticationFailureException; /** * Base class @@ -32,7 +32,7 @@ class Auth extends Base $this->checkProcedurePermission(false, $method); } else { $this->logger->error('API authentication failure for '.$username); - throw new AuthenticationFailure('Wrong credentials'); + throw new AuthenticationFailureException('Wrong credentials'); } } diff --git a/app/Api/Base.php b/app/Api/Base.php index 2cc62da8..ea817f7d 100644 --- a/app/Api/Base.php +++ b/app/Api/Base.php @@ -2,7 +2,7 @@ namespace Kanboard\Api; -use JsonRPC\AccessDeniedException; +use JsonRPC\Exception\AccessDeniedException; /** * Base class diff --git a/composer.json b/composer.json index 7224f1ef..61f0218c 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "christian-riesen/otp" : "1.4", "eluceo/ical": "0.8.0", "erusev/parsedown" : "1.6.0", - "fguillot/json-rpc" : "1.0.3", + "fguillot/json-rpc" : "1.1.0", "fguillot/picodb" : "1.0.8", "fguillot/simpleLogger" : "1.0.0", "fguillot/simple-validator" : "1.0.0", diff --git a/composer.lock b/composer.lock index 70881a39..1c736f1d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "ecdd93c089273876816339ff22d67cc7", - "content-hash": "a5edc6f9c9ae2cd356e3f8ac96ef5532", + "hash": "715601e3833e0ee04d8d00d266302f8b", + "content-hash": "ef38cdd1e92bd2cd299db9c6d429d24f", "packages": [ { "name": "christian-riesen/base32", @@ -203,16 +203,16 @@ }, { "name": "fguillot/json-rpc", - "version": "v1.0.3", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/fguillot/JsonRPC.git", - "reference": "0a77cd311783431c851e4c8eed33858663c17277" + "reference": "e915dab71940e7ac251955c785570048f460d332" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fguillot/JsonRPC/zipball/0a77cd311783431c851e4c8eed33858663c17277", - "reference": "0a77cd311783431c851e4c8eed33858663c17277", + "url": "https://api.github.com/repos/fguillot/JsonRPC/zipball/e915dab71940e7ac251955c785570048f460d332", + "reference": "e915dab71940e7ac251955c785570048f460d332", "shasum": "" }, "require": { @@ -235,7 +235,7 @@ ], "description": "Simple Json-RPC client/server library that just works", "homepage": "https://github.com/fguillot/JsonRPC", - "time": "2015-09-19 02:27:10" + "time": "2016-04-27 02:48:10" }, { "name": "fguillot/picodb", diff --git a/tests/integration/Base.php b/tests/integration/Base.php index 983d0ed9..6f3ae076 100644 --- a/tests/integration/Base.php +++ b/tests/integration/Base.php @@ -35,15 +35,15 @@ abstract class Base extends PHPUnit_Framework_TestCase { $this->app = new JsonRPC\Client(API_URL); $this->app->authentication('jsonrpc', API_KEY); - // $this->app->debug = true; + $this->app->getHttpClient()->withDebug(); $this->admin = new JsonRPC\Client(API_URL); $this->admin->authentication('admin', 'admin'); - // $this->admin->debug = true; + $this->admin->getHttpClient()->withDebug(); $this->user = new JsonRPC\Client(API_URL); $this->user->authentication('user', 'password'); - // $this->user->debug = true; + $this->user->getHttpClient()->withDebug(); } protected function getProjectId() diff --git a/tests/integration/MeTest.php b/tests/integration/MeTest.php index 21f61756..1b028b84 100644 --- a/tests/integration/MeTest.php +++ b/tests/integration/MeTest.php @@ -15,7 +15,7 @@ class MeTest extends Base } /** - * @expectedException JsonRPC\AccessDeniedException + * @expectedException JsonRPC\Exception\AccessDeniedException */ public function testNotAllowedAppProcedure() { @@ -23,7 +23,7 @@ class MeTest extends Base } /** - * @expectedException JsonRPC\AccessDeniedException + * @expectedException JsonRPC\Exception\AccessDeniedException */ public function testNotAllowedUserProcedure() { @@ -31,7 +31,7 @@ class MeTest extends Base } /** - * @expectedException JsonRPC\AccessDeniedException + * @expectedException JsonRPC\Exception\AccessDeniedException */ public function testNotAllowedProjectForUser() { @@ -140,7 +140,7 @@ class MeTest extends Base } /** - * @expectedException JsonRPC\AccessDeniedException + * @expectedException JsonRPC\Exception\AccessDeniedException */ public function testGetAdminTask() { @@ -148,7 +148,7 @@ class MeTest extends Base } /** - * @expectedException JsonRPC\AccessDeniedException + * @expectedException JsonRPC\Exception\AccessDeniedException */ public function testGetProjectActivityDenied() { |