mewebstudio / captcha

src/Captcha.php

Braces +2 added lines, -4 removed lines

@@ -232,8 +232,7 @@ 
                 $this->height
             );
             $this->canvas->insert($this->image);
-        }
-        else
+        } else
         {
             $this->image = $this->canvas;
         }
@@ -351,8 +350,7 @@ 
         if ( ! empty($this->fontColors))
         {
             $color = $this->fontColors[rand(0, count($this->fontColors) - 1)];
-        }
-        else
+        } else
         {
             $color = [rand(0, 255), rand(0, 255), rand(0, 255)];
         }

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
 use Illuminate\Config\Repository;
 use Illuminate\Hashing\BcryptHasher as Hasher;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Str;
 use Intervention\Image\ImageManager;
 use Illuminate\Session\Store as Session;

Doc Comments +1 added lines, -1 removed lines

@@ -492,7 +492,7 @@
      * @param null $config
      * @param array $attrs HTML attributes supplied to the image tag where key is the attribute
      * and the value is the attribute value
-     * @return string
+     * @return HtmlString
      */
     public function img($config = null, $attrs = [])
     {

Indentation +40 added lines, -40 removed lines

@@ -283,9 +283,9 @@ 
         }
 
         return $api ? [
-	        'sensitive' => $generator['sensitive'],
-	        'key'       => $generator['key'],
-        	'img'       => $this->image->encode('data-url')->encoded
+            'sensitive' => $generator['sensitive'],
+            'key'       => $generator['key'],
+            'img'       => $this->image->encode('data-url')->encoded
         ] : $this->image->response('png', $this->quality);
     }
 
@@ -319,7 +319,7 @@ 
             $key .= '';
         } else {
             for ($i = 0; $i < $this->length; $i++) {
-            	$char = $characters[rand(0, count($characters) - 1)];
+                $char = $characters[rand(0, count($characters) - 1)];
                 $bag[] = $this->sensitive ? $char : $this->str->lower($char);
             }
             $key = implode('', $bag);
@@ -332,9 +332,9 @@ 
         ]);
 
         return [
-        	'value'     => $bag,
-	        'sensitive' => $this->sensitive,
-	        'key'       => $hash
+            'value'     => $bag,
+            'sensitive' => $this->sensitive,
+            'key'       => $hash
         ];
     }
 
@@ -343,10 +343,10 @@ 
      */
     protected function text()
     {
-	    $marginTop = $this->image->height() / $this->length;
+        $marginTop = $this->image->height() / $this->length;
 
-	    $text = $this->text;
-	    if (is_string($text)) {
+        $text = $this->text;
+        if (is_string($text)) {
             $text = str_split($text);
         }
 
@@ -435,26 +435,26 @@ 
         return $this->image;
     }
 
-	/**
-	 * Captcha check
-	 *
-	 * @param $value
-	 * @return bool
-	 */
-	public function check($value)
-	{
-		if ( ! $this->session->has('captcha'))
-		{
-			return false;
-		}
+    /**
+     * Captcha check
+     *
+     * @param $value
+     * @return bool
+     */
+    public function check($value)
+    {
+        if ( ! $this->session->has('captcha'))
+        {
+            return false;
+        }
 
-		$key = $this->session->get('captcha.key');
-		$sensitive = $this->session->get('captcha.sensitive');
+        $key = $this->session->get('captcha.key');
+        $sensitive = $this->session->get('captcha.sensitive');
 
-		if ( ! $sensitive)
-		{
-			$value = $this->str->lower($value);
-		}
+        if ( ! $sensitive)
+        {
+            $value = $this->str->lower($value);
+        }
 
 
         $res = $this->hasher->check($value, $key);
@@ -464,18 +464,18 @@ 
         }
 
         return $res;
-	}
-
-	/**
-	 * Captcha check
-	 *
-	 * @param $value
-	 * @return bool
-	 */
-	public function check_api($value, $key)
-	{
-		return $this->hasher->check($value, $key);
-	}
+    }
+
+    /**
+     * Captcha check
+     *
+     * @param $value
+     * @return bool
+     */
+    public function check_api($value, $key)
+    {
+        return $this->hasher->check($value, $key);
+    }
 
     /**
      * Generate captcha image source

Spacing +13 added lines, -13 removed lines

@@ -198,7 +198,7 @@ 
         $this->session = $session;
         $this->hasher = $hasher;
         $this->str = $str;
-        $this->characters = config('captcha.characters',['1','2','3','4','6','7','8','9']);
+        $this->characters = config('captcha.characters', ['1', '2', '3', '4', '6', '7', '8', '9']);
     }
 
     /**
@@ -207,9 +207,9 @@ 
      */
     protected function configure($config)
     {
-        if ($this->config->has('captcha.' . $config))
+        if ($this->config->has('captcha.'.$config))
         {
-            foreach($this->config->get('captcha.' . $config) as $key => $val)
+            foreach ($this->config->get('captcha.'.$config) as $key => $val)
             {
                 $this->{$key} = $val;
             }
@@ -225,10 +225,10 @@ 
      */
     public function create($config = 'default', $api = false)
     {
-        $this->backgrounds = $this->files->files(__DIR__ . '/../assets/backgrounds');
-        $this->fonts = $this->files->files(__DIR__ . '/../assets/fonts');
+        $this->backgrounds = $this->files->files(__DIR__.'/../assets/backgrounds');
+        $this->fonts = $this->files->files(__DIR__.'/../assets/fonts');
 
-        if (app()->version() >= 5.5){
+        if (app()->version() >= 5.5) {
             $this->fonts = array_map(function($file) {
                 return $file->getPathName();
             }, $this->fonts);
@@ -350,8 +350,8 @@ 
             $text = str_split($text);
         }
 
-        foreach($text as $key => $char) {
-            $marginLeft = $this->textLeftPadding +  ($key * ($this->image->width() - $this->textLeftPadding) / $this->length);
+        foreach ($text as $key => $char) {
+            $marginLeft = $this->textLeftPadding + ($key * ($this->image->width() - $this->textLeftPadding) / $this->length);
 
             $this->image->text($char, $marginLeft, $marginTop, function($font) {
                 $font->file($this->font());
@@ -420,14 +420,14 @@ 
      */
     protected function lines()
     {
-        for($i = 0; $i <= $this->lines; $i++)
+        for ($i = 0; $i <= $this->lines; $i++)
         {
             $this->image->line(
                 rand(0, $this->image->width()) + $i * rand(0, $this->image->height()),
                 rand(0, $this->image->height()),
                 rand(0, $this->image->width()),
                 rand(0, $this->image->height()),
-                function ($draw) {
+                function($draw) {
                     $draw->color($this->fontColor());
                 }
             );
@@ -485,7 +485,7 @@ 
      */
     public function src($config = null)
     {
-        return url('captcha' . ($config ? '/' . $config : '/default')) . '?' . $this->str->random(8);
+        return url('captcha'.($config ? '/'.$config : '/default')).'?'.$this->str->random(8);
     }
 
     /**
@@ -499,8 +499,8 @@ 
     public function img($config = null, $attrs = [])
     {
         $attrs_str = '';
-        foreach($attrs as $attr => $value){
-            if ($attr == 'src'){
+        foreach ($attrs as $attr => $value) {
+            if ($attr == 'src') {
                 //Neglect src attribute
                 continue;
             }

src/helpers.php

Indentation +16 added lines, -16 removed lines

@@ -36,23 +36,23 @@
 }
 
 if ( ! function_exists('captcha_check')) {
-	/**
-	 * @param $value
-	 * @return bool
-	 */
-	function captcha_check($value)
-	{
-		return app('captcha')->check($value);
-	}
+    /**
+     * @param $value
+     * @return bool
+     */
+    function captcha_check($value)
+    {
+        return app('captcha')->check($value);
+    }
 }
 
 if ( ! function_exists('captcha_api_check')) {
-	/**
-	 * @param $value
-	 * @return bool
-	 */
-	function captcha_api_check($value, $key)
-	{
-		return app('captcha')->check_api($value, $key);
-	}
+    /**
+     * @param $value
+     * @return bool
+     */
+    function captcha_api_check($value, $key)
+    {
+        return app('captcha')->check_api($value, $key);
+    }
 }

src/CaptchaServiceProvider.php

Indentation +16 added lines, -16 removed lines

@@ -24,29 +24,29 @@
 
         // HTTP routing
         if (strpos($this->app->version(), 'Lumen') !== false) {
-	        $this->app->get('captcha[/api/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptchaApi');
-	        $this->app->get('captcha[/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptcha');
+            $this->app->get('captcha[/api/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptchaApi');
+            $this->app->get('captcha[/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptcha');
         } else {
             if ((double) $this->app->version() >= 5.2) {
-	            $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi')->middleware('web');
-	            $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha')->middleware('web');
+                $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi')->middleware('web');
+                $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha')->middleware('web');
             } else {
-	            $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi');
-	            $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha');
+                $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi');
+                $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha');
             }
         }
 
-	    // Validator extensions
-	    $this->app['validator']->extend('captcha', function($attribute, $value, $parameters)
-	    {
-		    return captcha_check($value);
-	    });
+        // Validator extensions
+        $this->app['validator']->extend('captcha', function($attribute, $value, $parameters)
+        {
+            return captcha_check($value);
+        });
 
-	    // Validator extensions
-	    $this->app['validator']->extend('captcha_api', function($attribute, $value, $parameters)
-	    {
-		    return captcha_api_check($value, $parameters[0]);
-	    });
+        // Validator extensions
+        $this->app['validator']->extend('captcha_api', function($attribute, $value, $parameters)
+        {
+            return captcha_api_check($value, $parameters[0]);
+        });
     }
 
     /**

src/CaptchaController.php

Indentation +26 added lines, -26 removed lines

@@ -11,32 +11,32 @@
 class CaptchaController extends Controller
 {
 
-	/**
-	 * get CAPTCHA
-	 *
-	 * @param \Mews\Captcha\Captcha $captcha
-	 * @param string $config
-	 * @return \Intervention\Image\ImageManager->response
-	 */
-	public function getCaptcha(Captcha $captcha, $config = 'default')
-	{
-		if (ob_get_contents())
-		{
-			ob_clean();
-		}
-		return $captcha->create($config);
-	}
+    /**
+     * get CAPTCHA
+     *
+     * @param \Mews\Captcha\Captcha $captcha
+     * @param string $config
+     * @return \Intervention\Image\ImageManager->response
+     */
+    public function getCaptcha(Captcha $captcha, $config = 'default')
+    {
+        if (ob_get_contents())
+        {
+            ob_clean();
+        }
+        return $captcha->create($config);
+    }
 
-	/**
-	 * get CAPTCHA api
-	 *
-	 * @param \Mews\Captcha\Captcha $captcha
-	 * @param string $config
-	 * @return \Intervention\Image\ImageManager->response
-	 */
-	public function getCaptchaApi(Captcha $captcha, $config = 'default')
-	{
-		return $captcha->create($config, true);
-	}
+    /**
+     * get CAPTCHA api
+     *
+     * @param \Mews\Captcha\Captcha $captcha
+     * @param string $config
+     * @return \Intervention\Image\ImageManager->response
+     */
+    public function getCaptchaApi(Captcha $captcha, $config = 'default')
+    {
+        return $captcha->create($config, true);
+    }
 
 }

config/captcha.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 return [
 
-    'characters' => ['2','3','4','6','7','8','9','a','b','c','d','e','f','g','h','j','m','n','p','q','r','t','u','x','y','z','A','B','C','D','E','F','G','H','J','M','N','P','Q','R','T','U','X','Y','Z'],
+    'characters' => ['2', '3', '4', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'm', 'n', 'p', 'q', 'r', 't', 'u', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'M', 'N', 'P', 'Q', 'R', 'T', 'U', 'X', 'Y', 'Z'],
 
     'default'   => [
         'length'    => 9,