jumper423 / decaptcha

tests/TwoCaptchaTest.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
         ]);
         $captcha->setErrorLang(\jumper423\decaptcha\core\DeCaptchaErrors::LANG_RU);
         $captcha->setCauseAnError(true);
-        $captcha->recognize(__DIR__.'/data/Captcha.jpg');
+        $captcha->recognize(__DIR__ . '/data/Captcha.jpg');
     }
 
     public function testRecognizeBalanceError2()
@@ -26,7 +26,7 @@ 
             \jumper423\decaptcha\services\TwoCaptcha::PARAM_SPEC_API_KEY => '200a1ed2b6ca001d8171c655658086ed',
         ]);
         $captcha->setErrorLang(\jumper423\decaptcha\core\DeCaptchaErrors::LANG_RU);
-        if ($captcha->recognize(__DIR__.'/data/Captcha.jpg')) {
+        if ($captcha->recognize(__DIR__ . '/data/Captcha.jpg')) {
             $this->assertEquals('11111111111111', $captcha->getCode());
         } else {
             $this->assertEquals('Нулевой либо отрицательный баланс', $captcha->getError());

tests/DeCaptchaAbstractTest.php

Spacing +12 added lines, -12 removed lines

@@ -19,7 +19,7 @@ 
     public function testGetBaseUrl()
     {
         $abstract = $this->newInstance();
-        $getBaseUrlCaller = function () {
+        $getBaseUrlCaller = function() {
             $this->host = 'domain';
 
             return $this->getBaseUrl();
@@ -28,7 +28,7 @@ 
         $this->assertEquals('http://domain/', $bound());
 
         $abstract = $this->newInstance();
-        $getBaseUrlCaller = function () {
+        $getBaseUrlCaller = function() {
             $this->host = 'domain';
             $this->scheme = 'https';
 
@@ -62,13 +62,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);
     }
@@ -80,11 +80,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');
     }
 
     /**
@@ -95,7 +95,7 @@ 
     public function testGetFilePathErrorFileIsNotLoaded()
     {
         $abstract = $this->newInstance();
-        $getFilePathCaller = function ($val) {
+        $getFilePathCaller = function($val) {
             return $this->getFilePath($val);
         };
         $bound = $getFilePathCaller->bindTo($abstract, $abstract);
@@ -117,7 +117,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);
@@ -128,7 +128,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);
@@ -136,14 +136,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));

tests/AnticaptchaTest.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
             \jumper423\decaptcha\services\Anticaptcha::PARAM_SPEC_API_KEY => '5464654645646',
         ]);
         $captcha->setErrorLang(\jumper423\decaptcha\core\DeCaptchaErrors::LANG_RU);
-        if ($captcha->recognize(__DIR__.'/data/Captcha.jpg')) {
+        if ($captcha->recognize(__DIR__ . '/data/Captcha.jpg')) {
             $this->assertEquals('11111111111111', $captcha->getCode());
         } else {
             $this->assertEquals('Использован несуществующий key', $captcha->getError());
@@ -25,7 +25,7 @@ 
             \jumper423\decaptcha\services\Anticaptcha::ACTION_FIELD_LANGUAGE => 'ru',
         ]);
         $captcha->setErrorLang(\jumper423\decaptcha\core\DeCaptchaErrors::LANG_RU);
-        if ($captcha->recognize(__DIR__.'/data/Captcha.jpg')) {
+        if ($captcha->recognize(__DIR__ . '/data/Captcha.jpg')) {
             $this->assertEquals('11111111111111', $captcha->getCode());
         } else {
             $this->assertEquals('Нет в допустимых значиниях поля: languagePool = ru', $captcha->getError());

src/core/DeCaptchaAbstract.php

Spacing +6 added lines, -7 removed lines

@@ -101,8 +101,7 @@ 
         }
         $decodeSetting = $this->decodeSettings[static::DECODE_ACTION][$action];
         $decodeFormat = array_key_exists(static::DECODE_FORMAT, $decodeSetting) ?
-            $decodeSetting[static::DECODE_FORMAT] :
-            $this->decodeSettings[static::DECODE_FORMAT];
+            $decodeSetting[static::DECODE_FORMAT] : $this->decodeSettings[static::DECODE_FORMAT];
         $values = [];
         switch ($decodeFormat) {
             case static::RESPONSE_TYPE_STRING:
@@ -179,7 +178,7 @@ 
      */
     protected function getActionUrl($action)
     {
-        return $this->getBaseUrl().$this->actions[$action][static::ACTION_URI];
+        return $this->getBaseUrl() . $this->actions[$action][static::ACTION_URI];
     }
 
     /**
@@ -229,7 +228,7 @@ 
                         return base64_encode(file_get_contents($this->params[$param]));
                 }
 
-                return (version_compare(PHP_VERSION, '5.5.0') >= 0) ? new \CURLFile($this->getFilePath($this->params[$param])) : '@'.$this->getFilePath($this->params[$param]);
+                return (version_compare(PHP_VERSION, '5.5.0') >= 0) ? new \CURLFile($this->getFilePath($this->params[$param])) : '@' . $this->getFilePath($this->params[$param]);
             case static::PARAM_SPEC_API_KEY:
                 return is_callable($this->params[$param]) ? $this->params[$param]() : $this->params[$param];
             case static::PARAM_SPEC_CAPTCHA:
@@ -296,7 +295,7 @@ 
                         break;
                 }
                 if (array_key_exists(self::PARAM_SLUG_ENUM, $settings) && !in_array($value, $settings[static::PARAM_SLUG_ENUM])) {
-                    throw new DeCaptchaErrors(DeCaptchaErrors::ERROR_PARAM_ENUM, (array_key_exists($field, $this->paramsNames) ? $this->paramsNames[$field] : $field).' = '.$value, $this->errorLang);
+                    throw new DeCaptchaErrors(DeCaptchaErrors::ERROR_PARAM_ENUM, (array_key_exists($field, $this->paramsNames) ? $this->paramsNames[$field] : $field) . ' = ' . $value, $this->errorLang);
                 }
                 $params[$this->paramsNames[$field]] = $value;
             }
@@ -360,7 +359,7 @@ 
             foreach ($data as $key => $value) {
                 $uri[] = "$key=$value";
             }
-            $url .= '?'.implode('&', $uri);
+            $url .= '?' . implode('&', $uri);
         }
         curl_setopt($ch, CURLOPT_URL, $url);
         if (!$isJson && version_compare(PHP_VERSION, '5.5.0') >= 0 && version_compare(PHP_VERSION, '7.0') < 0 && defined('CURLOPT_SAFE_UPLOAD')) {
@@ -378,7 +377,7 @@ 
             curl_setopt($ch, CURLOPT_HTTPHEADER, [
                 'Content-Type: application/json; charset=utf-8',
                 'Accept: application/json',
-                'Content-Length: '.strlen($data),
+                'Content-Length: ' . strlen($data),
             ]);
         }
         $result = curl_exec($ch);

tests/wiki.php

Spacing +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 
-include_once __DIR__.'/../src/core/DeCaptchaErrors.php';
-include_once __DIR__.'/../src/core/DeCaptchaInterface.php';
-include_once __DIR__.'/../src/core/DeCaptchaAbstract.php';
-include_once __DIR__.'/../src/core/DeCaptchaBase.php';
-include_once __DIR__.'/../src/services/RuCaptcha.php';
-include_once __DIR__.'/../src/services/Anticaptcha.php';
-include_once __DIR__.'/../src/services/AnticaptchaReCaptchaProxeless.php';
-include_once __DIR__.'/../src/services/AnticaptchaReCaptcha.php';
-include_once __DIR__.'/../src/core/DeCaptchaWiki.php';
+include_once __DIR__ . '/../src/core/DeCaptchaErrors.php';
+include_once __DIR__ . '/../src/core/DeCaptchaInterface.php';
+include_once __DIR__ . '/../src/core/DeCaptchaAbstract.php';
+include_once __DIR__ . '/../src/core/DeCaptchaBase.php';
+include_once __DIR__ . '/../src/services/RuCaptcha.php';
+include_once __DIR__ . '/../src/services/Anticaptcha.php';
+include_once __DIR__ . '/../src/services/AnticaptchaReCaptchaProxeless.php';
+include_once __DIR__ . '/../src/services/AnticaptchaReCaptcha.php';
+include_once __DIR__ . '/../src/core/DeCaptchaWiki.php';
 
 $rr = new \jumper423\decaptcha\core\DeCaptchaWiki();
 $rr->view();

src/core/DeCaptchaWiki.php

Spacing +5 added lines, -5 removed lines

@@ -236,8 +236,8 @@ 
             1 | 2 | 3
          *
          * */
-        echo ' Название | Код | Тип | Обязательное | По умолчания | Возможные значения | Описание '.PHP_EOL;
-        echo ' --- | --- | --- | --- | --- | ---| --- '.PHP_EOL;
+        echo ' Название | Код | Тип | Обязательное | По умолчания | Возможные значения | Описание ' . PHP_EOL;
+        echo ' --- | --- | --- | --- | --- | ---| --- ' . PHP_EOL;
         $rr = (new \ReflectionClass($rucaptcha))->getConstants();
 //        print_r($rucaptcha->actions);
         foreach ($rucaptcha->actions[RuCaptcha::ACTION_RECOGNIZE][RuCaptcha::ACTION_FIELDS] as $param => $setting) {
@@ -270,9 +270,9 @@ 
             echo ' |';
         }
         echo " {$this->ggg($rr, 'ACTION_FIELD_', $param)} |";
-        echo ' '.substr($this->ggg($rr, 'PARAM_FIELD_TYPE_', $setting[RuCaptcha::PARAM_SLUG_TYPE]), 17).' |';
-        echo ' '.(array_key_exists(RuCaptcha::PARAM_SLUG_REQUIRE, $setting) ? '+' : '-').' |';
-        echo ' '.(array_key_exists(RuCaptcha::PARAM_SLUG_DEFAULT, $setting) ? $setting[RuCaptcha::PARAM_SLUG_DEFAULT] : '').' |';
+        echo ' ' . substr($this->ggg($rr, 'PARAM_FIELD_TYPE_', $setting[RuCaptcha::PARAM_SLUG_TYPE]), 17) . ' |';
+        echo ' ' . (array_key_exists(RuCaptcha::PARAM_SLUG_REQUIRE, $setting) ? '+' : '-') . ' |';
+        echo ' ' . (array_key_exists(RuCaptcha::PARAM_SLUG_DEFAULT, $setting) ? $setting[RuCaptcha::PARAM_SLUG_DEFAULT] : '') . ' |';
         echo ' |';
         if (isset($this->texts[$param])) {
             echo " {$this->texts[$param]['desc']['ru']} ";