jumper423 / decaptcha

tests/DeCaptchaAbstractTest.php

Spacing +23 added lines, -23 removed lines

@@ -16,7 +16,7 @@ 
     public function testGetBaseUrl()
     {
         $abstract = $this->newInstance();
-        $getBaseUrlCaller = function () {
+        $getBaseUrlCaller = function() {
             return $this->getBaseUrl();
         };
         $abstract->domain = 'domain';
@@ -28,16 +28,16 @@ 
     {
         $abstract = $this->newInstance();
         $abstract->setApiKey('123456val');
-        $apiKeyValCaller = function () {
+        $apiKeyValCaller = function() {
             return $this->apiKey;
         };
         $bound = $apiKeyValCaller->bindTo($abstract, $abstract);
         $this->assertEquals('123456val', $bound());
 
-        $abstract->setApiKey(function () {
-            return '123456'.'fun';
+        $abstract->setApiKey(function() {
+            return '123456' . 'fun';
         });
-        $apiKeyFunCaller = function () {
+        $apiKeyFunCaller = function() {
             return $this->apiKey;
         };
         $bound = $apiKeyFunCaller->bindTo($abstract, $abstract);
@@ -47,12 +47,12 @@ 
     public function testGetActionUrl()
     {
         $abstract = $this->newInstance();
-        $getBaseUrlGetCodeCaller = function () {
+        $getBaseUrlGetCodeCaller = function() {
             $this->captchaId = 123;
 
             return $this->getActionUrl('get_code');
         };
-        $getBaseUrlGetBalanceCaller = function () {
+        $getBaseUrlGetBalanceCaller = function() {
             $this->captchaId = 234;
 
             return $this->getActionUrl('get_balance');
@@ -68,13 +68,13 @@ 
     public function testGetFilePath()
     {
         $abstract = $this->newInstance();
-        $getFilePathCaller = function ($val) {
+        $getFilePathCaller = function($val) {
             return $this->getFilePath($val);
         };
         $bound = $getFilePathCaller->bindTo($abstract, $abstract);
-        $this->assertEquals(__DIR__.'/data/Captcha.jpg', $bound(__DIR__.'/data/Captcha.jpg'));
+        $this->assertEquals(__DIR__ . '/data/Captcha.jpg', $bound(__DIR__ . '/data/Captcha.jpg'));
         $filePathUpload = $bound('https://upload.wikimedia.org/wikipedia/commons/6/69/Captcha.jpg');
-        $file1 = file_get_contents(__DIR__.'/data/Captcha.jpg');
+        $file1 = file_get_contents(__DIR__ . '/data/Captcha.jpg');
         $file2 = file_get_contents($filePathUpload);
         $this->assertEquals($file1, $file2);
     }
@@ -86,11 +86,11 @@ 
     public function testGetFilePathErrorFileNotFound()
     {
         $abstract = $this->newInstance();
-        $getFilePathCaller = function ($val) {
+        $getFilePathCaller = function($val) {
             return $this->getFilePath($val);
         };
         $bound = $getFilePathCaller->bindTo($abstract, $abstract);
-        $bound(__DIR__.'/data/Captcha1.jpg');
+        $bound(__DIR__ . '/data/Captcha1.jpg');
     }
 
     /**
@@ -101,7 +101,7 @@ 
     public function testGetFilePathErrorFileIsNotLoaded()
     {
         $abstract = $this->newInstance();
-        $getFilePathCaller = function ($val) {
+        $getFilePathCaller = function($val) {
             return $this->getFilePath($val);
         };
         $bound = $getFilePathCaller->bindTo($abstract, $abstract);
@@ -112,7 +112,7 @@ 
     {
         $abstract = $this->newInstance();
         $abstract->domain = 'echo.jsontest.com/aaa/bbb';
-        $getResponseCaller = function ($val) {
+        $getResponseCaller = function($val) {
             return $this->getResponse($val);
         };
         $bound = $getResponseCaller->bindTo($abstract, $abstract);
@@ -123,7 +123,7 @@ 
     public function testExecutionDelayed()
     {
         $abstract = $this->newInstance();
-        $executionDelayedCaller = function ($second, $call = null) {
+        $executionDelayedCaller = function($second, $call = null) {
             return $this->executionDelayed($second, $call);
         };
         $bound = $executionDelayedCaller->bindTo($abstract, $abstract);
@@ -134,7 +134,7 @@ 
         $this->assertTrue(abs($timePassed - 0.1) < 0.035);
 
         $start = microtime(true);
-        $bound(0.15, function () {
+        $bound(0.15, function() {
             sleep(0.2);
         });
         $bound(0.1);
@@ -142,14 +142,14 @@ 
         $this->assertTrue(abs($timePassed - 0.25) < 0.035);
 
         $start = microtime(true);
-        $bound(0.15, function () {
+        $bound(0.15, function() {
             sleep(0.2);
         });
         $bound(0.3);
         $timePassed = microtime(true) - $start;
         $this->assertTrue(abs($timePassed - 0.45) < 0.035);
 
-        $this->assertEquals(2, $bound(0, function () {
+        $this->assertEquals(2, $bound(0, function() {
             return 2;
         }));
         $this->assertEquals(null, $bound(0));
@@ -158,7 +158,7 @@ 
     public function testGetInUrl()
     {
         $abstract = $this->newInstance();
-        $getInUrlCaller = function () {
+        $getInUrlCaller = function() {
             return $this->getInUrl();
         };
         $abstract->domain = 'domain';
@@ -174,7 +174,7 @@ 
     public function testIsError()
     {
         $abstract = $this->newInstance();
-        $isErrorCaller = function ($val) {
+        $isErrorCaller = function($val) {
             return $this->isError($val);
         };
         $bound = $isErrorCaller->bindTo($abstract, $abstract);
@@ -184,7 +184,7 @@ 
     public function testIsErrorNot()
     {
         $abstract = $this->newInstance();
-        $isErrorCaller = function ($val) {
+        $isErrorCaller = function($val) {
             return $this->isError($val);
         };
         $bound = $isErrorCaller->bindTo($abstract, $abstract);
@@ -200,7 +200,7 @@ 
     {
         $abstract = $this->newInstance();
         $abstract->domain = 'domain';
-        $getCurlResponseCaller = function ($val) {
+        $getCurlResponseCaller = function($val) {
             return $this->getCurlResponse($val);
         };
         $bound = $getCurlResponseCaller->bindTo($abstract, $abstract);
@@ -211,7 +211,7 @@ 
     {
         $abstract = $this->newInstance();
         $abstract->domain = 'httpbin.org';
-        $getCurlResponseCaller = function ($val) {
+        $getCurlResponseCaller = function($val) {
             $this->inUrl = 'post';
 
             return $this->getCurlResponse($val);

src/services/Rucaptcha.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
             $postData = [
                 'method'   => 'post',
                 'key'      => $this->apiKey,
-                'file'     => (version_compare(PHP_VERSION, '5.5.0') >= 0) ? new \CURLFile($filePath) : '@'.$filePath,
+                'file'     => (version_compare(PHP_VERSION, '5.5.0') >= 0) ? new \CURLFile($filePath) : '@' . $filePath,
                 'phrase'   => $this->isPhrase,
                 'regsense' => $this->isRegSense,
                 'numeric'  => $this->isNumeric,

src/core/DeCaptchaAbstract.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
      */
     protected function getInUrl()
     {
-        return $this->getBaseUrl().$this->inUrl;
+        return $this->getBaseUrl() . $this->inUrl;
     }
 
     /**

src/core/DeCaptchaBase.php

Spacing +8 added lines, -8 removed lines

@@ -99,29 +99,29 @@ 
 
     protected $params = [];
 
-    protected function getParams(){
+    protected function getParams() {
         $params = [];
         foreach ($this->paramsSettings as $field => $settings) {
             $value = null;
             if (array_key_exists($field, $this->params) && (!array_key_exists(self::PARAM_SLUG_VARIABLE, $settings) ^ (array_key_exists(self::PARAM_SLUG_VARIABLE, $settings) && $settings[self::PARAM_SLUG_VARIABLE] === false))) {
                 $value = $this->params[$field];
             }
-            if(array_key_exists(self::PARAM_SLUG_DEFAULT, $settings)) {
+            if (array_key_exists(self::PARAM_SLUG_DEFAULT, $settings)) {
                 $value = $settings[self::PARAM_SLUG_DEFAULT];
             }
-            if(array_key_exists(self::PARAM_SLUG_SPEC, $settings) && array_key_exists($settings[self::PARAM_SLUG_SPEC], $this->paramsSpec)) {
+            if (array_key_exists(self::PARAM_SLUG_SPEC, $settings) && array_key_exists($settings[self::PARAM_SLUG_SPEC], $this->paramsSpec)) {
                 $value = $this->paramsSpec[$settings[self::PARAM_SLUG_SPEC]];
             }
-            if(array_key_exists(self::PARAM_SLUG_REQUIRE, $settings) && $settings[self::PARAM_SLUG_REQUIRE] === true && is_null($value)) {
+            if (array_key_exists(self::PARAM_SLUG_REQUIRE, $settings) && $settings[self::PARAM_SLUG_REQUIRE] === true && is_null($value)) {
                 throw new Exception('Нет данных');
             }
-            if(array_key_exists($field, $this->paramsNames)) {
+            if (array_key_exists($field, $this->paramsNames)) {
                 switch ($settings[self::PARAM_SLUG_TYPE]) {
                     case self::PARAM_FIELD_TYPE_INTEGER:
-                        $params[$this->paramsNames[$field]] = (int)$value;
+                        $params[$this->paramsNames[$field]] = (int) $value;
                         break;
                     case self::PARAM_FIELD_TYPE_STRING:
-                        $params[$this->paramsNames[$field]] = (string)$value;
+                        $params[$this->paramsNames[$field]] = (string) $value;
                         break;
                 }
             }
@@ -203,7 +203,7 @@ 
         return [
             'method'   => 'post',
             'key'      => $this->apiKey,
-            'file'     => (version_compare(PHP_VERSION, '5.5.0') >= 0) ? new \CURLFile($filePath) : '@'.$filePath,
+            'file'     => (version_compare(PHP_VERSION, '5.5.0') >= 0) ? new \CURLFile($filePath) : '@' . $filePath,
             'phrase'   => $this->isPhrase,
             'regsense' => $this->isRegSense,
             'numeric'  => $this->isNumeric,