diff --git a/composer.json b/composer.json index 50f39c8..1e91784 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Client of LimeSurvey API", "type": "library", "license": "MIT", - "version": "0.0.2", + "version": "0.0.3", "authors": [ { "name": "Meritoo", diff --git a/src/Meritoo/LimeSurvey/ApiClient/Client/Client.php b/src/Meritoo/LimeSurvey/ApiClient/Client/Client.php index a9d9316..d14d123 100644 --- a/src/Meritoo/LimeSurvey/ApiClient/Client/Client.php +++ b/src/Meritoo/LimeSurvey/ApiClient/Client/Client.php @@ -77,7 +77,8 @@ class Client public function run($method, $arguments = []) { /* - * Let's validate method + * Let's validate method. + * It's called in the JsonRpcClientManager::runMethod() too, but I want to verify it before getting session key. */ $method = MethodType::getValidatedMethod($method); diff --git a/src/Meritoo/LimeSurvey/ApiClient/Type/MethodType.php b/src/Meritoo/LimeSurvey/ApiClient/Type/MethodType.php index c9ee1ce..9b950d7 100644 --- a/src/Meritoo/LimeSurvey/ApiClient/Type/MethodType.php +++ b/src/Meritoo/LimeSurvey/ApiClient/Type/MethodType.php @@ -96,7 +96,7 @@ class MethodType extends BaseType */ public static function getValidatedMethod($method) { - if ((new static())->isCorrectType($method)) { + if ((new static())->isCorrectType($method) || (new SystemMethodType())->isCorrectType($method)) { return $method; } diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Type/MethodTypeTest.php b/tests/Meritoo/LimeSurvey/Test/ApiClient/Type/MethodTypeTest.php index d4571d0..0e9f24b 100644 --- a/tests/Meritoo/LimeSurvey/Test/ApiClient/Type/MethodTypeTest.php +++ b/tests/Meritoo/LimeSurvey/Test/ApiClient/Type/MethodTypeTest.php @@ -12,6 +12,7 @@ use Generator; use Meritoo\Common\Test\Base\BaseTypeTestCase; use Meritoo\LimeSurvey\ApiClient\Exception\UnknownMethodException; use Meritoo\LimeSurvey\ApiClient\Type\MethodType; +use Meritoo\LimeSurvey\ApiClient\Type\SystemMethodType; /** * Test case of the type of method used while talking with LimeSurvey's API @@ -88,6 +89,14 @@ class MethodTypeTest extends BaseTypeTestCase yield[ MethodType::LIST_SURVEYS, ]; + + yield[ + SystemMethodType::GET_SESSION_KEY, + ]; + + yield[ + SystemMethodType::RELEASE_SESSION_KEY, + ]; } /**