jumper423 / decaptcha

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);

src/core/DeCaptchaWiki.php

Doc Comments +10 added lines, -1 removed lines

@@ -14,11 +14,17 @@ 
     private $class;
     private $lang = 'en';
 
+    /**
+     * @param string $lang
+     */
     public function setLang($lang)
     {
         $this->lang = $lang;
     }
 
+    /**
+     * @param DeCaptchaBase $class
+     */
     public function __construct($class)
     {
         $this->class = $class;
@@ -251,7 +257,7 @@ 
     }
 
     /**
-     * @param string|array $name
+     * @param string[] $name
      * @param string       $separator
      *
      * @return string|array
@@ -397,6 +403,9 @@ 
         return $str;
     }
 
+    /**
+     * @param string $keyMask
+     */
     private function getNameConst($keyMask, $value)
     {
         $constants = (new \ReflectionClass($this->class))->getConstants();

Spacing +132 added lines, -132 removed lines

@@ -29,160 +29,160 @@ 
             'recognize_file'                                    => true,
             'recognize_data_file'                               => 'http://site.com/captcha.jpg',
             'recognize_data'                                    => [],
-            'field_main_name_'.($this->class)::ACTION_FIELD_KEY => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_KEY => [
                 'ru' => 'Ключ',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_KEY => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_KEY => [
                 'ru' => 'Ключ от учетной записи',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_LANGUAGE => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_LANGUAGE => [
                 'ru' => 'Язык',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_LANGUAGE => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_LANGUAGE => [
                 'ru' => 'На каком языке текст на капче',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_FILE => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_FILE => [
                 'ru' => 'Картинка',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_FILE => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_FILE => [
                 'ru' => 'Путь на файл с картинкой или ссылка на него',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_PHRASE => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_PHRASE => [
                 'ru' => 'Несколько слов',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_PHRASE => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_PHRASE => [
                 'ru' => 'Работник должен ввести текст с одним или несколькими пробелами',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_REGSENSE => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_REGSENSE => [
                 'ru' => 'Регистр',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_REGSENSE => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_REGSENSE => [
                 'ru' => 'Работник должен ввсести ответ с учетом регистра',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_NUMERIC => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_NUMERIC => [
                 'ru' => 'Символы',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_NUMERIC => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_NUMERIC => [
                 'ru' => 'Какие символы используется в капче',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_CALC => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_CALC => [
                 'ru' => 'Вычисление',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_CALC => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_CALC => [
                 'ru' => 'На капче изображенно математичекая выражение и её необходимо решить',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_MIN_LEN => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_MIN_LEN => [
                 'ru' => 'Длина min',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_MIN_LEN => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_MIN_LEN => [
                 'ru' => 'Минимальная длина капчи',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_MAX_LEN => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_MAX_LEN => [
                 'ru' => 'Длина max',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_MAX_LEN => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_MAX_LEN => [
                 'ru' => 'Максимальная длина капчи',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_QUESTION => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_QUESTION => [
                 'ru' => 'Вопрос',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_QUESTION => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_QUESTION => [
                 'ru' => 'На изображении задан вопрос, работник должен написать ответ',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_IS_RUSSIAN => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_IS_RUSSIAN => [
                 'ru' => 'Кириллица',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_IS_RUSSIAN => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_IS_RUSSIAN => [
                 'ru' => 'На изображении присутствуют русские символы',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_LANGUAGE => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_LANGUAGE => [
                 'ru' => 'Язык',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_LANGUAGE => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_LANGUAGE => [
                 'ru' => 'Символы какого языка размещенны на капче',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_HEADER_ACAO => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_HEADER_ACAO => [
                 'ru' => 'Кросс-доменный',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_HEADER_ACAO => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_HEADER_ACAO => [
                 'ru' => 'Необходимо для кросс-доменных AJAX запросов в браузерных приложениях.',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_INSTRUCTIONS => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_INSTRUCTIONS => [
                 'ru' => 'Инструкция',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_INSTRUCTIONS => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_INSTRUCTIONS => [
                 'ru' => 'Текстовая капча или инструкция для прохождения капчи.',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_PINGBACK => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_PINGBACK => [
                 'ru' => 'Ответ на',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_PINGBACK => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_PINGBACK => [
                 'ru' => 'Указание для сервера, что после распознания изображения, нужно отправить ответ на указанный адрес.',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_LABEL => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_LABEL => [
                 'ru' => 'От куда',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_LABEL => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_LABEL => [
                 'ru' => 'Пояснение от куда пришла капча ("vk", "google", "recaptcha", "yandex", "mailru", "yahoo" и т.д.).',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_PAGEURL => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_PAGEURL => [
                 'ru' => 'Адрес',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_PAGEURL => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_PAGEURL => [
                 'ru' => 'Адрес страницы на которой решается капча.',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_GOOGLEKEY => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_GOOGLEKEY => [
                 'ru' => 'Google key',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_GOOGLEKEY => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_GOOGLEKEY => [
                 'ru' => 'Ключ-индентификатор рекапчи на целевой странице. <div class="g-recaptcha" data-sitekey="ВОТ_ЭТОТ"></div>',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_GOOGLETOKEN => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_GOOGLETOKEN => [
                 'ru' => 'Google token',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_GOOGLETOKEN => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_GOOGLETOKEN => [
                 'ru' => 'Секретный токен для предыдущей версии рекапчи. В большинстве случаев сайты используют новую версию и этот токен не требуется. Секретный токен генерируется на сервере Google и вставляется на страницу в атрибуте data-stoken. Выглядит это примерно так: <script type="text/javascript" src="...." data-type="normal"  data-ray="..." async data-sitekey="..." data-stoken="ВОТ_ЭТОТ"></script> Токен действует пару минут после генерации, затем нужно снова зайти на страницу и получить его.',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_PROXYTYPE => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_PROXYTYPE => [
                 'ru' => 'Тип прокси',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_PROXYTYPE => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_PROXYTYPE => [
                 'ru' => 'Тип прокси (http, socks4, ...)',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_PROXY => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_PROXY => [
                 'ru' => 'Адрес прокси',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_PROXY => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_PROXY => [
                 'ru' => 'IP адрес прокси ipv4/ipv6.',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_PROXYPORT => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_PROXYPORT => [
                 'ru' => 'Порт прокси',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_PROXYPORT => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_PROXYPORT => [
                 'ru' => 'Порт прокси.',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_PROXYLOGIN => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_PROXYLOGIN => [
                 'ru' => 'Логин прокси',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_PROXYLOGIN => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_PROXYLOGIN => [
                 'ru' => 'Логин от прокси-сервера.',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_PROXYPASS => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_PROXYPASS => [
                 'ru' => 'Пароль прокси',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_PROXYPASS => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_PROXYPASS => [
                 'ru' => 'Пароль от прокси-сервера.',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_USERAGENT => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_USERAGENT => [
                 'ru' => 'User-Agent браузера',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_USERAGENT => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_USERAGENT => [
                 'ru' => 'User-Agent браузера, используемый в эмуляции. Необходимо использовать подпись современного браузера, иначе Google будет возвращать ошибку, требуя обновить браузер.',
             ],
-            'field_main_name_'.($this->class)::ACTION_FIELD_COOKIES => [
+            'field_main_name_' . ($this->class)::ACTION_FIELD_COOKIES => [
                 'ru' => 'Куки',
             ],
-            'field_main_desc_'.($this->class)::ACTION_FIELD_COOKIES => [
+            'field_main_desc_' . ($this->class)::ACTION_FIELD_COOKIES => [
                 'ru' => 'Дополнительные cookies которые мы должны использовать во время взаимодействия с целевой страницей.',
             ],
             'table_th_name' => [
@@ -302,7 +302,7 @@ 
      */
     public function getText($name, $separator = '; ')
     {
-        $getResult = function ($name, $texts) {
+        $getResult = function($name, $texts) {
             if (is_array($name)) {
                 $name = implode('_', $name);
             }
@@ -331,17 +331,17 @@ 
 
     private function viewInstall()
     {
-        $str = "{$this->getText(['install', 'preferred'])} [composer](http://getcomposer.org/download/).".PHP_EOL;
+        $str = "{$this->getText(['install', 'preferred'])} [composer](http://getcomposer.org/download/)." . PHP_EOL;
         $str .= PHP_EOL;
-        $str .= "{$this->getText(['install', 'start'])}".PHP_EOL;
-        $str .= '```'.PHP_EOL;
-        $str .= 'php composer.phar require --prefer-dist jumper423/decaptcha "*"'.PHP_EOL;
-        $str .= '```'.PHP_EOL;
-        $str .= "{$this->getText(['install', 'add'])}".PHP_EOL;
-        $str .= '```'.PHP_EOL;
-        $str .= '"jumper423/decaptcha": "*"'.PHP_EOL;
-        $str .= '```'.PHP_EOL;
-        $str .= "{$this->getText(['install', 'add', 'file'])} `composer.json`.".PHP_EOL;
+        $str .= "{$this->getText(['install', 'start'])}" . PHP_EOL;
+        $str .= '```' . PHP_EOL;
+        $str .= 'php composer.phar require --prefer-dist jumper423/decaptcha "*"' . PHP_EOL;
+        $str .= '```' . PHP_EOL;
+        $str .= "{$this->getText(['install', 'add'])}" . PHP_EOL;
+        $str .= '```' . PHP_EOL;
+        $str .= '"jumper423/decaptcha": "*"' . PHP_EOL;
+        $str .= '```' . PHP_EOL;
+        $str .= "{$this->getText(['install', 'add', 'file'])} `composer.json`." . PHP_EOL;
 
         return $str;
     }
@@ -350,12 +350,12 @@ 
     {
         $rc = (new \ReflectionClass($this->class));
 
-        $str = "#####{$this->getText(['example', 'initialization'])}".PHP_EOL;
-        $str .= "{$this->getText(['example', 'initialization', 'desc'])}".PHP_EOL;
-        $str .= '```'.PHP_EOL;
-        $str .= "use {$rc->getName()};".PHP_EOL;
-        $str .= ''.PHP_EOL;
-        $str .= '$captcha = new '.$rc->getShortName().'(['.PHP_EOL;
+        $str = "#####{$this->getText(['example', 'initialization'])}" . PHP_EOL;
+        $str .= "{$this->getText(['example', 'initialization', 'desc'])}" . PHP_EOL;
+        $str .= '```' . PHP_EOL;
+        $str .= "use {$rc->getName()};" . PHP_EOL;
+        $str .= '' . PHP_EOL;
+        $str .= '$captcha = new ' . $rc->getShortName() . '([' . PHP_EOL;
         foreach ($this->texts['constructor_data'] as $key => $val) {
             $str .= "    {$rc->getShortName()}::{$this->getNameConst('ACTION_FIELD_', $key)} => ";
             if (is_string($val)) {
@@ -363,14 +363,14 @@ 
             } else {
                 $str .= "{$val}";
             }
-            $str .= ','.PHP_EOL;
+            $str .= ',' . PHP_EOL;
         }
-        $str .= ']);'.PHP_EOL;
-        $str .= '```'.PHP_EOL;
+        $str .= ']);' . PHP_EOL;
+        $str .= '```' . PHP_EOL;
 
-        $str .= "#####{$this->getText(['example', 'recognize'])}".PHP_EOL;
-        $str .= "{$this->getText(['example', 'recognize', 'desc'])}".PHP_EOL;
-        $str .= '```'.PHP_EOL;
+        $str .= "#####{$this->getText(['example', 'recognize'])}" . PHP_EOL;
+        $str .= "{$this->getText(['example', 'recognize', 'desc'])}" . PHP_EOL;
+        $str .= '```' . PHP_EOL;
         $str .= 'if ($captcha->recognize(';
         if ($this->texts['recognize_file']) {
             $str .= "'{$this->getText(['recognize', 'data', 'file'])}'";
@@ -379,7 +379,7 @@ 
             if ($this->texts['recognize_file']) {
                 $str .= ', ';
             }
-            $str .= '['.PHP_EOL;
+            $str .= '[' . PHP_EOL;
             foreach ($this->texts['recognize_data'] as $key => $val) {
                 $str .= "    {$rc->getShortName()}::{$this->getNameConst('ACTION_FIELD_', $key)} => ";
                 if (is_string($val)) {
@@ -387,46 +387,46 @@ 
                 } else {
                     $str .= "{$val}";
                 }
-                $str .= ','.PHP_EOL;
+                $str .= ',' . PHP_EOL;
             }
             $str .= ']';
         }
-        $str .= ')) {'.PHP_EOL;
-        $str .= '    $code = $captcha->getCode();'.PHP_EOL;
-        $str .= '} else {'.PHP_EOL;
-        $str .= '    $error = $captcha->getError();'.PHP_EOL;
-        $str .= '}'.PHP_EOL;
-        $str .= '```'.PHP_EOL;
+        $str .= ')) {' . PHP_EOL;
+        $str .= '    $code = $captcha->getCode();' . PHP_EOL;
+        $str .= '} else {' . PHP_EOL;
+        $str .= '    $error = $captcha->getError();' . PHP_EOL;
+        $str .= '}' . PHP_EOL;
+        $str .= '```' . PHP_EOL;
 
         if (in_array('notTrue', get_class_methods($this->class))) {
-            $str .= "#####{$this->getText(['example', 'nottrue'])}".PHP_EOL;
-            $str .= "{$this->getText(['example', 'nottrue', 'desc'])}".PHP_EOL;
-            $str .= '```'.PHP_EOL;
-            $str .= '$captcha->notTrue();'.PHP_EOL;
-            $str .= '```'.PHP_EOL;
+            $str .= "#####{$this->getText(['example', 'nottrue'])}" . PHP_EOL;
+            $str .= "{$this->getText(['example', 'nottrue', 'desc'])}" . PHP_EOL;
+            $str .= '```' . PHP_EOL;
+            $str .= '$captcha->notTrue();' . PHP_EOL;
+            $str .= '```' . PHP_EOL;
         }
 
         if (in_array('getBalance', get_class_methods($this->class))) {
-            $str .= "#####{$this->getText(['example', 'balance'])}".PHP_EOL;
-            $str .= '```'.PHP_EOL;
-            $str .= '$balance = $captcha->getBalance();'.PHP_EOL;
-            $str .= '```'.PHP_EOL;
+            $str .= "#####{$this->getText(['example', 'balance'])}" . PHP_EOL;
+            $str .= '```' . PHP_EOL;
+            $str .= '$balance = $captcha->getBalance();' . PHP_EOL;
+            $str .= '```' . PHP_EOL;
         }
 
         if ($this->getText(['example', 'error', 'lang', 'if'])) {
-            $str .= "#####{$this->getText(['example', 'error', 'lang'])}".PHP_EOL;
-            $str .= "{$this->getText(['example', 'error', 'lang', 'desc'])}".PHP_EOL;
-            $str .= '```'.PHP_EOL;
-            $str .= '$captcha->setErrorLang(\jumper423\decaptcha\core\DeCaptchaErrors::LANG_RU);'.PHP_EOL;
-            $str .= '```'.PHP_EOL;
+            $str .= "#####{$this->getText(['example', 'error', 'lang'])}" . PHP_EOL;
+            $str .= "{$this->getText(['example', 'error', 'lang', 'desc'])}" . PHP_EOL;
+            $str .= '```' . PHP_EOL;
+            $str .= '$captcha->setErrorLang(\jumper423\decaptcha\core\DeCaptchaErrors::LANG_RU);' . PHP_EOL;
+            $str .= '```' . PHP_EOL;
         }
 
-        $str .= "#####{$this->getText(['example', 'error', 'interception'])}".PHP_EOL;
-        $str .= "{$this->getText(['example', 'error', 'interception', 'desc'])}".PHP_EOL;
-        $str .= '```'.PHP_EOL;
-        $str .= '$captcha->setCauseAnError(true);'.PHP_EOL;
+        $str .= "#####{$this->getText(['example', 'error', 'interception'])}" . PHP_EOL;
+        $str .= "{$this->getText(['example', 'error', 'interception', 'desc'])}" . PHP_EOL;
+        $str .= '```' . PHP_EOL;
+        $str .= '$captcha->setCauseAnError(true);' . PHP_EOL;
         $str .= PHP_EOL;
-        $str .= 'try {'.PHP_EOL;
+        $str .= 'try {' . PHP_EOL;
         $str .= '    $captcha->recognize(';
         if ($this->texts['recognize_file']) {
             $str .= "'{$this->getText(['recognize', 'data', 'file'])}'";
@@ -435,7 +435,7 @@ 
             if ($this->texts['recognize_file']) {
                 $str .= ', ';
             }
-            $str .= '['.PHP_EOL;
+            $str .= '[' . PHP_EOL;
             foreach ($this->texts['recognize_data'] as $key => $val) {
                 $str .= "       {$rc->getShortName()}::{$this->getNameConst('ACTION_FIELD_', $key)} => ";
                 if (is_string($val)) {
@@ -443,24 +443,24 @@ 
                 } else {
                     $str .= "{$val}";
                 }
-                $str .= ','.PHP_EOL;
+                $str .= ',' . PHP_EOL;
             }
             $str .= '    ]';
         }
-        $str .= ');'.PHP_EOL;
-        $str .= '    $code = $captcha->getCode();'.PHP_EOL;
-        $str .= '} catch (\jumper423\decaptcha\core\DeCaptchaErrors $e) {'.PHP_EOL;
-        $str .= '    ...'.PHP_EOL;
-        $str .= '}'.PHP_EOL;
-        $str .= '```'.PHP_EOL;
+        $str .= ');' . PHP_EOL;
+        $str .= '    $code = $captcha->getCode();' . PHP_EOL;
+        $str .= '} catch (\jumper423\decaptcha\core\DeCaptchaErrors $e) {' . PHP_EOL;
+        $str .= '    ...' . PHP_EOL;
+        $str .= '}' . PHP_EOL;
+        $str .= '```' . PHP_EOL;
 
         return $str;
     }
 
     private function viewFields()
     {
-        $str = " {$this->getText(['table', 'th', 'name'])} | {$this->getText(['table', 'th', 'code'])} | {$this->getText(['table', 'th', 'type'])} | {$this->getText(['table', 'th', 'req'])} | {$this->getText(['table', 'th', 'def'])} | {$this->getText(['table', 'th', 'enum'])} | {$this->getText(['table', 'th', 'desc'])} ".PHP_EOL;
-        $str .= ' --- | --- | --- | --- | --- | --- | --- '.PHP_EOL;
+        $str = " {$this->getText(['table', 'th', 'name'])} | {$this->getText(['table', 'th', 'code'])} | {$this->getText(['table', 'th', 'type'])} | {$this->getText(['table', 'th', 'req'])} | {$this->getText(['table', 'th', 'def'])} | {$this->getText(['table', 'th', 'enum'])} | {$this->getText(['table', 'th', 'desc'])} " . PHP_EOL;
+        $str .= ' --- | --- | --- | --- | --- | --- | --- ' . PHP_EOL;
         foreach ($this->class->actions[($this->class)::ACTION_RECOGNIZE][($this->class)::ACTION_FIELDS] as $param => $setting) {
             if (array_key_exists(($this->class)::ACTION_FIELDS, $setting) && is_array($setting[($this->class)::ACTION_FIELDS])) {
                 foreach ($setting[($this->class)::ACTION_FIELDS] as $param1 => $setting1) {
@@ -484,12 +484,12 @@ 
         $str = " {$this->getText(['field', 'main', 'name', $param])} |";
         $str .= " {$this->getNameConst('ACTION_FIELD_', $param)} |";
 //        if (isset($setting[($this->class)::PARAM_SLUG_TYPE])) {
-            $str .= ' '.substr($this->getNameConst('PARAM_FIELD_TYPE_', $setting[($this->class)::PARAM_SLUG_TYPE]), 17).' |';
+            $str .= ' ' . substr($this->getNameConst('PARAM_FIELD_TYPE_', $setting[($this->class)::PARAM_SLUG_TYPE]), 17) . ' |';
 //        } else {
 //            $str .= ' |';
 //        }
-        $str .= ' '.(array_key_exists(($this->class)::PARAM_SLUG_REQUIRE, $setting) ? '+' : '-').' |';
-        $str .= ' '.(array_key_exists(($this->class)::PARAM_SLUG_DEFAULT, $setting) ? $setting[($this->class)::PARAM_SLUG_DEFAULT] : '').' |';
+        $str .= ' ' . (array_key_exists(($this->class)::PARAM_SLUG_REQUIRE, $setting) ? '+' : '-') . ' |';
+        $str .= ' ' . (array_key_exists(($this->class)::PARAM_SLUG_DEFAULT, $setting) ? $setting[($this->class)::PARAM_SLUG_DEFAULT] : '') . ' |';
         $str .= " {$this->getText(['field', 'slug', ($this->class)::PARAM_SLUG_ENUM, $param])} |";
         $str .= " {$this->getText(['field', 'main', 'desc', $param])} |";
         $str .= PHP_EOL;
@@ -511,22 +511,22 @@ 
 
     public function view()
     {
-        $str = $this->getText(['service', 'name']).PHP_EOL;
-        $str .= '=============='.PHP_EOL;
-        $str .= "###{$this->getText(['slug', 'link'])}".PHP_EOL;
-        $str .= "[{$this->getText(['slug', 'link', 'to_service'])} {$this->getText(['service', 'name'])}]({$this->getText(['service', 'href'])})".PHP_EOL.PHP_EOL;
-        $str .= "###{$this->getText(['slug', 'service', 'desc'])}".PHP_EOL;
-        $str .= "{$this->getText(['service', 'desc'])}".PHP_EOL.PHP_EOL;
-        $str .= "###{$this->getText(['slug', 'price'])}".PHP_EOL;
-        $str .= "{$this->getText(['recognize', 'price'])}".PHP_EOL.PHP_EOL;
-        $str .= "###{$this->getText(['slug', 'recognize', 'desc'])}".PHP_EOL;
-        $str .= "{$this->getText(['recognize', 'desc'])}".PHP_EOL.PHP_EOL;
-        $str .= "###{$this->getText(['install'])}".PHP_EOL;
-        $str .= "{$this->viewInstall()}".PHP_EOL.PHP_EOL;
-        $str .= "###{$this->getText(['example'])}".PHP_EOL;
-        $str .= "{$this->viewExamples()}".PHP_EOL.PHP_EOL;
-        $str .= "###{$this->getText(['slug', 'fields', 'desc'])}".PHP_EOL;
-        $str .= $this->viewFields().PHP_EOL;
+        $str = $this->getText(['service', 'name']) . PHP_EOL;
+        $str .= '==============' . PHP_EOL;
+        $str .= "###{$this->getText(['slug', 'link'])}" . PHP_EOL;
+        $str .= "[{$this->getText(['slug', 'link', 'to_service'])} {$this->getText(['service', 'name'])}]({$this->getText(['service', 'href'])})" . PHP_EOL . PHP_EOL;
+        $str .= "###{$this->getText(['slug', 'service', 'desc'])}" . PHP_EOL;
+        $str .= "{$this->getText(['service', 'desc'])}" . PHP_EOL . PHP_EOL;
+        $str .= "###{$this->getText(['slug', 'price'])}" . PHP_EOL;
+        $str .= "{$this->getText(['recognize', 'price'])}" . PHP_EOL . PHP_EOL;
+        $str .= "###{$this->getText(['slug', 'recognize', 'desc'])}" . PHP_EOL;
+        $str .= "{$this->getText(['recognize', 'desc'])}" . PHP_EOL . PHP_EOL;
+        $str .= "###{$this->getText(['install'])}" . PHP_EOL;
+        $str .= "{$this->viewInstall()}" . PHP_EOL . PHP_EOL;
+        $str .= "###{$this->getText(['example'])}" . PHP_EOL;
+        $str .= "{$this->viewExamples()}" . PHP_EOL . PHP_EOL;
+        $str .= "###{$this->getText(['slug', 'fields', 'desc'])}" . PHP_EOL;
+        $str .= $this->viewFields() . PHP_EOL;
 
         return $str;
     }
@@ -538,6 +538,6 @@ 
 
     public function save()
     {
-        file_put_contents(__DIR__.'/../../docs/'.$this->getFileName().'-'.$this->lang.'.md', $this->view());
+        file_put_contents(__DIR__ . '/../../docs/' . $this->getFileName() . '-' . $this->lang . '.md', $this->view());
     }
 }

tests/TwoCaptchaTest.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
         $captcha->setErrorLang(\jumper423\decaptcha\core\DeCaptchaErrors::LANG_RU);
         $captcha->setCauseAnError(true);
         try {
-            $captcha->recognize(__DIR__.'/data/Captcha.jpg');
+            $captcha->recognize(__DIR__ . '/data/Captcha.jpg');
         } catch (\jumper423\decaptcha\core\DeCaptchaErrors $e) {
         }
     }
@@ -29,7 +29,7 @@ 
             \jumper423\decaptcha\services\TwoCaptcha::ACTION_FIELD_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/wiki.php

Indentation +15 added lines, -15 removed lines

@@ -22,21 +22,21 @@
 
 foreach (['ru', 'en'] as $lang) {
     foreach ([
-                 new \jumper423\decaptcha\services\RuCaptcha([]),
-                 new \jumper423\decaptcha\services\RuCaptchaReCaptcha([]),
-                 new \jumper423\decaptcha\services\RuCaptchaInstruction([]),
-                 new \jumper423\decaptcha\services\RuCaptchaGrid([]),
-                 new \jumper423\decaptcha\services\RuCaptchaClick([]),
-                 new \jumper423\decaptcha\services\TwoCaptcha([]),
-                 new \jumper423\decaptcha\services\TwoCaptchaReCaptcha([]),
-                 new \jumper423\decaptcha\services\TwoCaptchaInstruction([]),
-                 new \jumper423\decaptcha\services\TwoCaptchaGrid([]),
-                 new \jumper423\decaptcha\services\TwoCaptchaClick([]),
-                 new \jumper423\decaptcha\services\Anticaptcha([]),
-                 new \jumper423\decaptcha\services\AnticaptchaReCaptcha([]),
-                 new \jumper423\decaptcha\services\AnticaptchaReCaptchaProxeless([]),
-                 new \jumper423\decaptcha\services\Captcha24([]),
-             ] as $class) {
+                    new \jumper423\decaptcha\services\RuCaptcha([]),
+                    new \jumper423\decaptcha\services\RuCaptchaReCaptcha([]),
+                    new \jumper423\decaptcha\services\RuCaptchaInstruction([]),
+                    new \jumper423\decaptcha\services\RuCaptchaGrid([]),
+                    new \jumper423\decaptcha\services\RuCaptchaClick([]),
+                    new \jumper423\decaptcha\services\TwoCaptcha([]),
+                    new \jumper423\decaptcha\services\TwoCaptchaReCaptcha([]),
+                    new \jumper423\decaptcha\services\TwoCaptchaInstruction([]),
+                    new \jumper423\decaptcha\services\TwoCaptchaGrid([]),
+                    new \jumper423\decaptcha\services\TwoCaptchaClick([]),
+                    new \jumper423\decaptcha\services\Anticaptcha([]),
+                    new \jumper423\decaptcha\services\AnticaptchaReCaptcha([]),
+                    new \jumper423\decaptcha\services\AnticaptchaReCaptchaProxeless([]),
+                    new \jumper423\decaptcha\services\Captcha24([]),
+                ] as $class) {
         $tt = $class->getWiki($lang);
         $tt->save();
     }

Spacing +19 added lines, -19 removed lines

@@ -1,24 +1,24 @@
 <?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/RuCaptchaReCaptcha.php';
-include_once __DIR__.'/../src/services/RuCaptchaInstruction.php';
-include_once __DIR__.'/../src/services/RuCaptchaGrid.php';
-include_once __DIR__.'/../src/services/RuCaptchaClick.php';
-include_once __DIR__.'/../src/services/TwoCaptcha.php';
-include_once __DIR__.'/../src/services/TwoCaptchaReCaptcha.php';
-include_once __DIR__.'/../src/services/TwoCaptchaInstruction.php';
-include_once __DIR__.'/../src/services/TwoCaptchaGrid.php';
-include_once __DIR__.'/../src/services/TwoCaptchaClick.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/services/Captcha24.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/RuCaptchaReCaptcha.php';
+include_once __DIR__ . '/../src/services/RuCaptchaInstruction.php';
+include_once __DIR__ . '/../src/services/RuCaptchaGrid.php';
+include_once __DIR__ . '/../src/services/RuCaptchaClick.php';
+include_once __DIR__ . '/../src/services/TwoCaptcha.php';
+include_once __DIR__ . '/../src/services/TwoCaptchaReCaptcha.php';
+include_once __DIR__ . '/../src/services/TwoCaptchaInstruction.php';
+include_once __DIR__ . '/../src/services/TwoCaptchaGrid.php';
+include_once __DIR__ . '/../src/services/TwoCaptchaClick.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/services/Captcha24.php';
+include_once __DIR__ . '/../src/core/DeCaptchaWiki.php';
 
 foreach (['ru', 'en'] as $lang) {
     foreach ([