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 +11 added lines, -11 removed lines

@@ -19,7 +19,7 @@ 
     public function testGetBaseUrl()
     {
         $abstract = $this->newInstance();
-        $getBaseUrlCaller = function () {
+        $getBaseUrlCaller = function() {
             $this->domain = 'domain';
 
             return $this->getBaseUrl();
@@ -52,13 +52,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);
     }
@@ -70,11 +70,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');
     }
 
     /**
@@ -85,7 +85,7 @@ 
     public function testGetFilePathErrorFileIsNotLoaded()
     {
         $abstract = $this->newInstance();
-        $getFilePathCaller = function ($val) {
+        $getFilePathCaller = function($val) {
             return $this->getFilePath($val);
         };
         $bound = $getFilePathCaller->bindTo($abstract, $abstract);
@@ -107,7 +107,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);
@@ -118,7 +118,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);
@@ -126,14 +126,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));

src/core/DeCaptchaAbstract.php

Spacing +4 added lines, -5 removed lines

@@ -92,8 +92,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:
@@ -154,7 +153,7 @@ 
      */
     protected function getActionUrl($action)
     {
-        return $this->getBaseUrl().$this->actions[$action][static::ACTION_URI];
+        return $this->getBaseUrl() . $this->actions[$action][static::ACTION_URI];
     }
 
     /**
@@ -198,7 +197,7 @@ 
         }
         switch ($param) {
             case static::PARAM_SPEC_FILE:
-                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:
@@ -305,7 +304,7 @@ 
             foreach ($data as $key => $value) {
                 $uri[] = "$key=$value";
             }
-            $url .= '?'.implode('&', $uri);
+            $url .= '?' . implode('&', $uri);
         }
         curl_setopt($ch, CURLOPT_URL, $url);
         if (version_compare(PHP_VERSION, '5.5.0') >= 0 && version_compare(PHP_VERSION, '7.0') < 0 && defined('CURLOPT_SAFE_UPLOAD')) {