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/Captcha.php

Braces +12 added lines, -4 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,
@@ -474,7 +476,9 @@ 
             $value = $this->str->lower($value);
         }
 
-        if($encrypt) $key = Crypt::decrypt($key);
+        if($encrypt) {
+            $key = Crypt::decrypt($key);
+        }
         $check = $this->hasher->check($value, $key);
         // if verify pass,remove session
         if ($check) {
@@ -500,8 +504,12 @@ 
 
         $this->configure($config);
 
-        if(!$this->sensitive) $value = $this->str->lower($value);
-        if($this->encrypt) $key = Crypt::decrypt($key);
+        if(!$this->sensitive) {
+            $value = $this->str->lower($value);
+        }
+        if($this->encrypt) {
+            $key = Crypt::decrypt($key);
+        }
         return $this->hasher->check($value, $key);
     }
 

Spacing +24 added lines, -24 removed lines

@@ -233,7 +233,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',  dirname(__DIR__) . '/assets/fonts');
+        $this->fontsDirectory = config('captcha.fontsDirectory', dirname(__DIR__).'/assets/fonts');
     }
 
     /**
@@ -242,8 +242,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;
             }
         }
@@ -259,11 +259,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);
@@ -276,7 +276,7 @@ 
         $generator = $this->generate();
         $this->text = $generator['value'];
 
-        $this->canvas = $this->imageManager->create($this->width , $this->height)->fill($this->fill);
+        $this->canvas = $this->imageManager->create($this->width, $this->height)->fill($this->fill);
 
 
         if ($this->bgImage) {
@@ -356,7 +356,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,
@@ -391,7 +391,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());
@@ -430,10 +430,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;
@@ -457,9 +457,9 @@ 
     protected function lines()
     {
         for ($i = 0; $i <= $this->lines; $i++) {
-            $this->image->drawLine(function (LineFactory $line) use ($i) {
-                $line->from(rand(0, $this->image->width()) + $i * rand(0, $this->image->height()) , rand(0, $this->image->height()));
-                $line->to( rand(0, $this->image->width()), rand(0, $this->image->height()));
+            $this->image->drawLine(function(LineFactory $line) use ($i) {
+                $line->from(rand(0, $this->image->width()) + $i * rand(0, $this->image->height()), rand(0, $this->image->height()));
+                $line->to(rand(0, $this->image->width()), rand(0, $this->image->height()));
                 $line->color($this->fontColor()); // color of line
                 $line->width($this->lineWidth); // line width in pixels
             });
@@ -476,7 +476,7 @@ 
      */
     public function check(string $value): bool
     {
-        if (!$this->session->has('captcha')) {
+        if ( ! $this->session->has('captcha')) {
             return false;
         }
 
@@ -484,16 +484,16 @@ 
         $sensitive = $this->session->get('captcha.sensitive');
         $encrypt = $this->session->get('captcha.encrypt');
 
-        if (!Cache::pull($this->get_cache_key($key))) {
+        if ( ! Cache::pull($this->get_cache_key($key))) {
             $this->session->remove('captcha');
             return false;
         }
 
-        if (!$sensitive) {
+        if ( ! $sensitive) {
             $value = $this->str->lower($value);
         }
 
-        if($encrypt) $key = Crypt::decrypt($key);
+        if ($encrypt) $key = Crypt::decrypt($key);
         $check = $this->hasher->check($value, $key);
         // if verify pass,remove session
         if ($check) {
@@ -510,7 +510,7 @@ 
      * @return string
      */
     protected function get_cache_key($key) {
-        return 'captcha_' . md5($key);
+        return 'captcha_'.md5($key);
     }
 
     /**
@@ -523,14 +523,14 @@ 
      */
     public function check_api($value, $key, $config = 'default'): bool
     {
-        if (!Cache::pull($this->get_cache_key($key))) {
+        if ( ! Cache::pull($this->get_cache_key($key))) {
             return false;
         }
 
         $this->configure($config);
 
-        if(!$this->sensitive) $value = $this->str->lower($value);
-        if($this->encrypt) $key = Crypt::decrypt($key);
+        if ( ! $this->sensitive) $value = $this->str->lower($value);
+        if ($this->encrypt) $key = Crypt::decrypt($key);
         return $this->hasher->check($value, $key);
     }
 
@@ -542,7 +542,7 @@ 
      */
     public function src(string $config = 'default'): string
     {
-        return url('captcha/' . $config) . '?' . $this->str->random(8);
+        return url('captcha/'.$config).'?'.$this->str->random(8);
     }
 
     /**
@@ -562,8 +562,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).'>');
     }
 }

src/CaptchaServiceProvider.php

Spacing +7 added lines, -7 removed lines

@@ -21,11 +21,11 @@ 
     {
         // Publish configuration files
         $this->publishes([
-            __DIR__ . '/../config/captcha.php' => config_path('captcha.php')
+            __DIR__.'/../config/captcha.php' => config_path('captcha.php')
         ], 'config');
 
         // HTTP routing
-        if(!config('captcha.disable')){
+        if ( ! config('captcha.disable')) {
             if (strpos($this->app->version(), 'Lumen') !== false) {
                 /* @var Router $router */
                 $router = $this->app;
@@ -34,7 +34,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 {
@@ -48,12 +48,12 @@ 
         $validator = $this->app['validator'];
 
         // Validator extensions
-        $validator->extend('captcha', function ($attribute, $value, $parameters) {
+        $validator->extend('captcha', function($attribute, $value, $parameters) {
             return config('captcha.disable') || ($value && captcha_check($value));
         });
 
         // Validator extensions
-        $validator->extend('captcha_api', function ($attribute, $value, $parameters) {
+        $validator->extend('captcha_api', function($attribute, $value, $parameters) {
             return config('captcha.disable') || ($value && captcha_api_check($value, $parameters[0], $parameters[1] ?? 'default'));
         });
     }
@@ -67,12 +67,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'],