mewebstudio / captcha

src/helpers.php

Spacing +5 added lines, -5 removed lines

@@ -2,7 +2,7 @@ 
 
 use Intervention\Image\ImageManager;
 
-if (!function_exists('captcha')) {
+if ( ! function_exists('captcha')) {
     /**
      * @param string $config
      * @return array|ImageManager|mixed
@@ -14,7 +14,7 @@ 
     }
 }
 
-if (!function_exists('captcha_src')) {
+if ( ! function_exists('captcha_src')) {
     /**
      * @param string $config
      * @return string
@@ -25,7 +25,7 @@ 
     }
 }
 
-if (!function_exists('captcha_img')) {
+if ( ! function_exists('captcha_img')) {
 
     /**
      * @param string $config
@@ -37,7 +37,7 @@ 
     }
 }
 
-if (!function_exists('captcha_check')) {
+if ( ! function_exists('captcha_check')) {
     /**
      * @param string $value
      * @return bool
@@ -48,7 +48,7 @@ 
     }
 }
 
-if (!function_exists('captcha_api_check')) {
+if ( ! function_exists('captcha_api_check')) {
     /**
      * @param string $value
      * @param string $key

src/CaptchaServiceProvider.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
     {
         // Publish configuration files
         $this->publishes([
-            __DIR__ . '/../config/captcha.php' => config_path('captcha.php')
+            __DIR__.'/../config/captcha.php' => config_path('captcha.php')
         ], 'config');
 
         // HTTP routing
@@ -33,7 +33,7 @@ 
         } else {
             /* @var Router $router */
             $router = $this->app['router'];
-            if ((double)$this->app->version() >= 5.2) {
+            if ((double) $this->app->version() >= 5.2) {
                 $router->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi')->middleware('web');
                 $router->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha')->middleware('web');
             } else {
@@ -46,12 +46,12 @@ 
         $validator = $this->app['validator'];
 
         // Validator extensions
-        $validator->extend('captcha', function ($attribute, $value, $parameters) {
+        $validator->extend('captcha', function($attribute, $value, $parameters) {
             return captcha_check($value);
         });
 
         // Validator extensions
-        $validator->extend('captcha_api', function ($attribute, $value, $parameters) {
+        $validator->extend('captcha_api', function($attribute, $value, $parameters) {
             return captcha_api_check($value, $parameters[0]);
         });
     }
@@ -65,12 +65,12 @@ 
     {
         // Merge configs
         $this->mergeConfigFrom(
-            __DIR__ . '/../config/captcha.php',
+            __DIR__.'/../config/captcha.php',
             'captcha'
         );
 
         // Bind captcha
-        $this->app->bind('captcha', function ($app) {
+        $this->app->bind('captcha', function($app) {
             return new Captcha(
                 $app['Illuminate\Filesystem\Filesystem'],
                 $app['Illuminate\Contracts\Config\Repository'],

src/Captcha.php

Spacing +19 added lines, -19 removed lines

@@ -216,7 +216,7 @@ 
         $this->hasher = $hasher;
         $this->str = $str;
         $this->characters = config('captcha.characters', ['1', '2', '3', '4', '6', '7', '8', '9']);
-        $this->fontsDirectory = config('captcha.fontsDirectory', __DIR__ . '/../assets/fonts');
+        $this->fontsDirectory = config('captcha.fontsDirectory', __DIR__.'/../assets/fonts');
     }
 
     /**
@@ -225,8 +225,8 @@ 
      */
     protected function configure($config)
     {
-        if ($this->config->has('captcha.' . $config)) {
-            foreach ($this->config->get('captcha.' . $config) as $key => $val) {
+        if ($this->config->has('captcha.'.$config)) {
+            foreach ($this->config->get('captcha.'.$config) as $key => $val) {
                 $this->{$key} = $val;
             }
         }
@@ -242,11 +242,11 @@ 
      */
     public function create(string $config = 'default', bool $api = false)
     {
-        $this->backgrounds = $this->files->files(__DIR__ . '/../assets/backgrounds');
+        $this->backgrounds = $this->files->files(__DIR__.'/../assets/backgrounds');
         $this->fonts = $this->files->files($this->fontsDirectory);
 
         if (version_compare(app()->version(), '5.5.0', '>=')) {
-            $this->fonts = array_map(function ($file) {
+            $this->fonts = array_map(function($file) {
                 /* @var File $file */
                 return $file->getPathName();
             }, $this->fonts);
@@ -294,7 +294,7 @@ 
         }
 
         if ($api) {
-            Cache::put('captcha_record_' . $generator['key'], $generator['value'], $this->expire);
+            Cache::put('captcha_record_'.$generator['key'], $generator['value'], $this->expire);
         }
 
         return $api ? [
@@ -341,7 +341,7 @@ 
         }
 
         $hash = $this->hasher->make($key);
-        if($this->encrypt) $hash = Crypt::encrypt($hash);
+        if ($this->encrypt) $hash = Crypt::encrypt($hash);
         
         $this->session->put('captcha', [
             'sensitive' => $this->sensitive,
@@ -372,7 +372,7 @@ 
         foreach ($text as $key => $char) {
             $marginLeft = $this->textLeftPadding + ($key * ($this->image->width() - $this->textLeftPadding) / $this->length);
 
-            $this->image->text($char, $marginLeft, $marginTop, function ($font) {
+            $this->image->text($char, $marginLeft, $marginTop, function($font) {
                 /* @var Font $font */
                 $font->file($this->font());
                 $font->size($this->fontSize());
@@ -411,10 +411,10 @@ 
      */
     protected function fontColor(): string
     {
-        if (!empty($this->fontColors)) {
+        if ( ! empty($this->fontColors)) {
             $color = $this->fontColors[rand(0, count($this->fontColors) - 1)];
         } else {
-            $color = '#' . str_pad(dechex(mt_rand(0, 0xFFFFFF)), 6, '0', STR_PAD_LEFT);
+            $color = '#'.str_pad(dechex(mt_rand(0, 0xFFFFFF)), 6, '0', STR_PAD_LEFT);
         }
 
         return $color;
@@ -443,7 +443,7 @@ 
                 rand(0, $this->image->height()),
                 rand(0, $this->image->width()),
                 rand(0, $this->image->height()),
-                function ($draw) {
+                function($draw) {
                     /* @var Font $draw */
                     $draw->color($this->fontColor());
                 }
@@ -461,18 +461,18 @@ 
      */
     public function check(string $value): bool
     {
-        if (!$this->session->has('captcha')) {
+        if ( ! $this->session->has('captcha')) {
             return false;
         }
 
         $key = $this->session->get('captcha.key');
         $sensitive = $this->session->get('captcha.sensitive');
 
-        if (!$sensitive) {
+        if ( ! $sensitive) {
             $value = $this->str->lower($value);
         }
 
-        if($this->encrypt) $key = Crypt::decrypt($key);
+        if ($this->encrypt) $key = Crypt::decrypt($key);
         $check = $this->hasher->check($value, $key);
         // if verify pass,remove session
         if ($check) {
@@ -491,11 +491,11 @@ 
      */
     public function check_api($value, $key): bool
     {
-        if (!Cache::pull('captcha_record_' . $key)) {
+        if ( ! Cache::pull('captcha_record_'.$key)) {
             return false;
         }
 
-        if($this->encrypt) $key = Crypt::decrypt($key);
+        if ($this->encrypt) $key = Crypt::decrypt($key);
         return $this->hasher->check($value, $key);
     }
 
@@ -507,7 +507,7 @@ 
      */
     public function src(string $config = 'default'): string
     {
-        return url('captcha/' . $config) . '?' . $this->str->random(8);
+        return url('captcha/'.$config).'?'.$this->str->random(8);
     }
 
     /**
@@ -527,8 +527,8 @@ 
                 continue;
             }
 
-            $attrs_str .= $attr . '="' . $value . '" ';
+            $attrs_str .= $attr.'="'.$value.'" ';
         }
-        return new HtmlString('<img src="' . $this->src($config) . '" ' . trim($attrs_str) . '>');
+        return new HtmlString('<img src="'.$this->src($config).'" '.trim($attrs_str).'>');
     }
 }

Braces +9 added lines, -3 removed lines

@@ -341,7 +341,9 @@ 
         }
 
         $hash = $this->hasher->make($key);
-        if($this->encrypt) $hash = Crypt::encrypt($hash);
+        if($this->encrypt) {
+            $hash = Crypt::encrypt($hash);
+        }
         
         $this->session->put('captcha', [
             'sensitive' => $this->sensitive,
@@ -472,7 +474,9 @@ 
             $value = $this->str->lower($value);
         }
 
-        if($this->encrypt) $key = Crypt::decrypt($key);
+        if($this->encrypt) {
+            $key = Crypt::decrypt($key);
+        }
         $check = $this->hasher->check($value, $key);
         // if verify pass,remove session
         if ($check) {
@@ -495,7 +499,9 @@ 
             return false;
         }
 
-        if($this->encrypt) $key = Crypt::decrypt($key);
+        if($this->encrypt) {
+            $key = Crypt::decrypt($key);
+        }
         return $this->hasher->check($value, $key);
     }