mewebstudio / captcha

src/CaptchaServiceProvider.php

Spacing +9 added lines, -9 removed lines

@@ -22,11 +22,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;
@@ -35,7 +35,7 @@ 
             } else {
                 /* @var Router $router */
                 $router = $this->app['router'];
-                if ((float)$this->app->version() >= 5.2) {
+                if ((float) $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 {
@@ -49,12 +49,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'));
         });
     }
@@ -68,19 +68,19 @@ 
     {
         // Merge configs
         $this->mergeConfigFrom(
-            __DIR__ . '/../config/captcha.php',
+            __DIR__.'/../config/captcha.php',
             'captcha'
         );
 
         // if Intervention\Image\ImageManager is not bound
-        if (!$this->app->bound('Intervention\Image\ImageManager')) {
-            $this->app->singleton('Intervention\Image\ImageManager', function ($app) {
+        if ( ! $this->app->bound('Intervention\Image\ImageManager')) {
+            $this->app->singleton('Intervention\Image\ImageManager', function($app) {
                 return new \Intervention\Image\ImageManager(new Driver());
             });
         }
 
         // 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 +18 added lines, -18 removed lines

@@ -229,7 +229,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');
     }
 
     /**
@@ -238,8 +238,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;
             }
         }
@@ -255,11 +255,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);
@@ -387,7 +387,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());
@@ -426,10 +426,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;
@@ -453,7 +453,7 @@ 
     protected function lines()
     {
         for ($i = 0; $i <= $this->lines; $i++) {
-            $this->image->drawLine(function (LineFactory $line) use ($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()));
                 $line->color('ff00ff'); // color of line
@@ -472,7 +472,7 @@ 
      */
     public function check(string $value): bool
     {
-        if (!$this->session->has('captcha')) {
+        if ( ! $this->session->has('captcha')) {
             return false;
         }
 
@@ -480,12 +480,12 @@ 
         $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);
         }
 
@@ -507,7 +507,7 @@ 
      */
     protected function get_cache_key($key)
     {
-        return 'captcha_' . md5($key);
+        return 'captcha_'.md5($key);
     }
 
     /**
@@ -520,13 +520,13 @@ 
      */
     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->sensitive) $value = $this->str->lower($value);
         if ($this->encrypt) $key = Crypt::decrypt($key);
         return $this->hasher->check($value, $key);
     }
@@ -539,7 +539,7 @@ 
      */
     public function src(string $config = 'default'): string
     {
-        return url('captcha/' . $config) . '?' . $this->str->random(8);
+        return url('captcha/'.$config).'?'.$this->str->random(8);
     }
 
     /**
@@ -559,8 +559,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 +12 added lines, -4 removed lines

@@ -352,7 +352,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,
@@ -489,7 +491,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) {
@@ -526,8 +530,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);
     }