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

src/core/DeCaptchaWiki.php

Spacing +1 added lines, -1 removed lines

@@ -246,7 +246,7 @@
      */
     public function getText($name, $separator = '; ')
     {
-        $getResult = function ($name, $texts) {
+        $getResult = function($name, $texts) {
             if (is_array($name)) {
                 $name = implode('_', $name);
             }

Indentation +8 added lines, -8 removed lines

@@ -519,14 +519,14 @@
         $str .= "+ [{$this->getText(['slug', 'menu', 'another'])}](../blob/master/docs/".$this->getFileName($this->lang == 'ru' ? 'en' : 'ru').')'.PHP_EOL;
         $str .= "+ {$this->getText(['slug', 'menu', 'anchor'])}".PHP_EOL;
         foreach ([
-                     ['slug', 'link'],
-                     ['slug', 'service', 'desc'],
-                     ['slug', 'price'],
-                     ['slug', 'recognize', 'desc'],
-                     ['install'],
-                     ['example'],
-                     ['slug', 'fields', 'desc'],
-                 ] as $anchor) {
+                        ['slug', 'link'],
+                        ['slug', 'service', 'desc'],
+                        ['slug', 'price'],
+                        ['slug', 'recognize', 'desc'],
+                        ['install'],
+                        ['example'],
+                        ['slug', 'fields', 'desc'],
+                    ] as $anchor) {
             $str .= "  + [{$this->getText($anchor)}](#".implode('-', explode(' ', $this->getText($anchor))).')'.PHP_EOL;
         }
         if ($this->getText(['menu', 'from_service'])) {

Doc Comments +11 added lines, -2 removed lines

@@ -14,6 +14,9 @@ 
     protected $class;
     protected $lang = 'en';
 
+    /**
+     * @param string $lang
+     */
     public function setLang($lang)
     {
         $this->lang = $lang;
@@ -312,10 +315,10 @@ 
     }
 
     /**
-     * @param string|array $name
+     * @param string[] $name
      * @param string       $separator
      *
-     * @return string|array
+     * @return string
      */
     public function getText($name, $separator = '; ')
     {
@@ -541,6 +544,9 @@ 
         return $str;
     }
 
+    /**
+     * @param string $keyMask
+     */
     protected function getNameConst($keyMask, $value)
     {
         $class = $this->class;
@@ -578,6 +584,9 @@ 
         return $str;
     }
 
+    /**
+     * @param string $lang
+     */
     public function getFileName($lang = null)
     {
         if (is_null($lang)) {

tests/wiki.php

Indentation +17 added lines, -17 removed lines

@@ -24,23 +24,23 @@
 
 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([]),
-                 new \jumper423\decaptcha\services\Pixodrom([]),
-                 new \jumper423\decaptcha\services\Ripcaptcha([]),
-             ] 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([]),
+                    new \jumper423\decaptcha\services\Pixodrom([]),
+                    new \jumper423\decaptcha\services\Ripcaptcha([]),
+                ] as $class) {
         $tt = $class->getWiki($lang);
         $tt->save();
     }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include_once __DIR__.'/../vendor/autoload.php';
+include_once __DIR__ . '/../vendor/autoload.php';
 
 $mainWiki = new \jumper423\decaptcha\core\DeCaptchaWikiMain(new \jumper423\decaptcha\services\RuCaptcha([]));
 foreach (['ru', 'en'] as $lang) {

src/core/DeCaptchaWikiMain.php

Indentation +6 added lines, -6 removed lines

@@ -119,12 +119,12 @@
     {
         $str = "+ [{$this->getText(['slug', 'menu', 'another'])}](../docs/" . $this->getFileName($this->lang == 'ru' ? 'en' : 'ru') . ')' . PHP_EOL;
         foreach ([
-                     ['slug', 'menu', 'desc'],
-                     ['slug', 'menu', 'features'],
-                     ['slug', 'menu', 'services'],
-                     ['install'],
-                     ['example'],
-                 ] as $anchor) {
+                        ['slug', 'menu', 'desc'],
+                        ['slug', 'menu', 'features'],
+                        ['slug', 'menu', 'services'],
+                        ['install'],
+                        ['example'],
+                    ] as $anchor) {
             $str .= "+ [{$this->getText($anchor)}](#" . implode('-', explode(' ', $this->getText($anchor))) . ')' . PHP_EOL;
         }
 

Spacing +21 added lines, -21 removed lines

@@ -103,7 +103,7 @@ 
      */
     public function getText($name, $separator = '; ')
     {
-        $getResult = function ($name, $texts) {
+        $getResult = function($name, $texts) {
             if (is_array($name)) {
                 $name = implode('_', $name);
             }
@@ -132,7 +132,7 @@ 
 
     protected function viewMenu($master = '')
     {
-        $str = "+ [{$this->getText(['slug', 'menu', 'another'])}](../{$master}docs/".$this->getFileName($this->lang == 'ru' ? 'en' : 'ru').')'.PHP_EOL;
+        $str = "+ [{$this->getText(['slug', 'menu', 'another'])}](../{$master}docs/" . $this->getFileName($this->lang == 'ru' ? 'en' : 'ru') . ')' . PHP_EOL;
         foreach ([
                      ['slug', 'menu', 'desc'],
                      ['slug', 'menu', 'features'],
@@ -140,7 +140,7 @@ 
                      ['install'],
                      ['example'],
                  ] as $anchor) {
-            $str .= "+ [{$this->getText($anchor)}](#".implode('-', explode(' ', ($this->lang === 'en' ? mb_strtolower($this->getText($anchor)) : $this->getText($anchor)))).')'.PHP_EOL;
+            $str .= "+ [{$this->getText($anchor)}](#" . implode('-', explode(' ', ($this->lang === 'en' ? mb_strtolower($this->getText($anchor)) : $this->getText($anchor)))) . ')' . PHP_EOL;
         }
 
         return $str;
@@ -156,7 +156,7 @@ 
             }
             $tt[$class->getWiki($this->lang)->getFileName()] = true;
             $fromServiceObjectWiki = $class->getWiki($this->lang);
-            $str .= "+ [{$fromServiceObjectWiki->getText(['service', 'name'])}](../{$master}docs/{$fromServiceObjectWiki->getFileName()})".PHP_EOL;
+            $str .= "+ [{$fromServiceObjectWiki->getText(['service', 'name'])}](../{$master}docs/{$fromServiceObjectWiki->getFileName()})" . PHP_EOL;
         }
 
         return $str;
@@ -164,25 +164,25 @@ 
 
     public function view($master = '')
     {
-        $str = $this->viewHeader().PHP_EOL;
+        $str = $this->viewHeader() . PHP_EOL;
 
-        $str .= "###{$this->getText(['slug', 'menu'])}".PHP_EOL;
-        $str .= $this->viewMenu($master).PHP_EOL.PHP_EOL;
+        $str .= "###{$this->getText(['slug', 'menu'])}" . PHP_EOL;
+        $str .= $this->viewMenu($master) . PHP_EOL . PHP_EOL;
 
-        $str .= "###{$this->getText(['slug', 'menu', 'desc'])}".PHP_EOL;
-        $str .= $this->getText(['readme', 'main', 'desc']).PHP_EOL.PHP_EOL;
+        $str .= "###{$this->getText(['slug', 'menu', 'desc'])}" . PHP_EOL;
+        $str .= $this->getText(['readme', 'main', 'desc']) . PHP_EOL . PHP_EOL;
 
-        $str .= "###{$this->getText(['slug', 'menu', 'features'])}".PHP_EOL;
-        $str .= $this->getText(['readme', 'main', 'features'], PHP_EOL).PHP_EOL.PHP_EOL;
+        $str .= "###{$this->getText(['slug', 'menu', 'features'])}" . PHP_EOL;
+        $str .= $this->getText(['readme', 'main', 'features'], PHP_EOL) . PHP_EOL . PHP_EOL;
 
-        $str .= "###{$this->getText(['slug', 'menu', 'services'])}".PHP_EOL;
-        $str .= "{$this->getText(['readme', 'main', 'services'])}".PHP_EOL.PHP_EOL;
-        $str .= "{$this->viewServices($master)}".PHP_EOL.PHP_EOL;
+        $str .= "###{$this->getText(['slug', 'menu', 'services'])}" . PHP_EOL;
+        $str .= "{$this->getText(['readme', 'main', 'services'])}" . PHP_EOL . PHP_EOL;
+        $str .= "{$this->viewServices($master)}" . 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(['install'])}" . PHP_EOL;
+        $str .= "{$this->viewInstall()}" . PHP_EOL . PHP_EOL;
+        $str .= "###{$this->getText(['example'])}" . PHP_EOL;
+        $str .= "{$this->viewExamples()}" . PHP_EOL . PHP_EOL;
 
         return $str;
     }
@@ -193,12 +193,12 @@ 
             $lang = $this->lang;
         }
 
-        return 'README-'.$lang.'.md';
+        return 'README-' . $lang . '.md';
     }
 
     public function save()
     {
-        file_put_contents(__DIR__.'/../../docs/'.$this->getFileName(), $this->view());
-        file_put_contents(__DIR__.'/../../README.md', $this->view('master/'));
+        file_put_contents(__DIR__ . '/../../docs/' . $this->getFileName(), $this->view());
+        file_put_contents(__DIR__ . '/../../README.md', $this->view('master/'));
     }
 }