jumper423 / decaptcha

src/core/DeCaptchaAbstract.php

Spacing +4 added lines, -5 removed lines

@@ -96,8 +96,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:
@@ -158,7 +157,7 @@ 
      */
     protected function getActionUrl($action)
     {
-        return $this->getBaseUrl().$this->actions[$action][static::ACTION_URI];
+        return $this->getBaseUrl() . $this->actions[$action][static::ACTION_URI];
     }
 
     /**
@@ -201,7 +200,7 @@ 
         }
         switch ($param) {
             case static::PARAM_SPEC_FILE:
-                return (version_compare(PHP_VERSION, '5.5.0') >= 0) ? new \CURLFile($this->params[$param]) : '@'.$this->params[$param];
+                return (version_compare(PHP_VERSION, '5.5.0') >= 0) ? new \CURLFile($this->params[$param]) : '@' . $this->params[$param];
             case static::PARAM_SPEC_KEY:
                 return is_callable($this->params[$param]) ? $this->params[$param]() : $this->params[$param];
             case static::PARAM_SPEC_CAPTCHA:
@@ -301,7 +300,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')) {

tests/DeCaptchaAbstractTest.php

Spacing +7 added lines, -7 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);

tests/RucaptchaTest.php

Spacing +3 added lines, -3 removed lines

@@ -10,19 +10,19 @@
         $re = new \jumper423\decaptcha\services\TwoCaptcha([
             \jumper423\decaptcha\services\TwoCaptcha::PARAM_SPEC_API_KEY => 'b7e7f1002f0f917ca5a852e1c0312e8f',
         ]);
-        if ($re->recognize(__DIR__.'/data/Captcha.jpg')) {
+        if ($re->recognize(__DIR__ . '/data/Captcha.jpg')) {
             $this->assertEquals('11111111111111', $re->getCode());
         } else {
             $this->assertEquals('22222222222222', $re->getError());
         }
 
-        $post_data_1 = [ 'file' => new CURLFile('file.txt') ];
+        $post_data_1 = ['file' => new CURLFile('file.txt')];
         $curl_1 = curl_init();
         curl_setopt($curl_1, CURLOPT_POSTFIELDS, $post_data_1);
         echo "OK\n";
 
 // exactly the same as above + added a reference to 'file' element
-        $post_data_2 = [ 'file' => new CURLFile('file.txt') ];
+        $post_data_2 = ['file' => new CURLFile('file.txt')];
         $ref = & $post_data_2['file']; // ***
         $curl_2 = curl_init();
         curl_setopt($curl_2, CURLOPT_POSTFIELDS, $post_data_2);