Completed
Pull Request — master (#158)
by MOHAMMAD
01:34
created
src/Captcha.php 5 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -232,8 +232,7 @@  discard block
 block discarded – undo
232 232
                 $this->height
233 233
             );
234 234
             $this->canvas->insert($this->image);
235
-        }
236
-        else
235
+        } else
237 236
         {
238 237
             $this->image = $this->canvas;
239 238
         }
@@ -351,8 +350,7 @@  discard block
 block discarded – undo
351 350
         if ( ! empty($this->fontColors))
352 351
         {
353 352
             $color = $this->fontColors[rand(0, count($this->fontColors) - 1)];
354
-        }
355
-        else
353
+        } else
356 354
         {
357 355
             $color = [rand(0, 255), rand(0, 255), rand(0, 255)];
358 356
         }
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,6 @@
 block discarded – undo
18 18
 use Illuminate\Config\Repository;
19 19
 use Illuminate\Hashing\BcryptHasher as Hasher;
20 20
 use Illuminate\Filesystem\Filesystem;
21
-use Illuminate\Support\Facades\Crypt;
22 21
 use Illuminate\Support\Str;
23 22
 use Intervention\Image\ImageManager;
24 23
 use Illuminate\Session\Store as Session;
Please login to merge, or discard this patch.
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -277,9 +277,9 @@  discard block
 block discarded – undo
277 277
         }
278 278
 
279 279
         return $api ? [
280
-	        'sensitive' => $generator['sensitive'],
281
-	        'key'       => $generator['key'],
282
-        	'img'       => $this->image->encode('data-url')->encoded
280
+            'sensitive' => $generator['sensitive'],
281
+            'key'       => $generator['key'],
282
+            'img'       => $this->image->encode('data-url')->encoded
283 283
         ] : $this->image->response('png', $this->quality);
284 284
     }
285 285
 
@@ -317,9 +317,9 @@  discard block
 block discarded – undo
317 317
         ]);
318 318
 
319 319
         return [
320
-        	'value'     => $bag,
321
-	        'sensitive' => $this->sensitive,
322
-	        'key'       => $hash
320
+            'value'     => $bag,
321
+            'sensitive' => $this->sensitive,
322
+            'key'       => $hash
323 323
         ];
324 324
     }
325 325
 
@@ -419,26 +419,26 @@  discard block
 block discarded – undo
419 419
         return $this->image;
420 420
     }
421 421
 
422
-	/**
423
-	 * Captcha check
424
-	 *
425
-	 * @param $value
426
-	 * @return bool
427
-	 */
428
-	public function check($value)
429
-	{
430
-		if ( ! $this->session->has('captcha'))
431
-		{
432
-			return false;
433
-		}
422
+    /**
423
+     * Captcha check
424
+     *
425
+     * @param $value
426
+     * @return bool
427
+     */
428
+    public function check($value)
429
+    {
430
+        if ( ! $this->session->has('captcha'))
431
+        {
432
+            return false;
433
+        }
434 434
 
435
-		$key = $this->session->get('captcha.key');
436
-		$sensitive = $this->session->get('captcha.sensitive');
435
+        $key = $this->session->get('captcha.key');
436
+        $sensitive = $this->session->get('captcha.sensitive');
437 437
 
438
-		if ( ! $sensitive)
439
-		{
440
-			$value = $this->str->lower($value);
441
-		}
438
+        if ( ! $sensitive)
439
+        {
440
+            $value = $this->str->lower($value);
441
+        }
442 442
 
443 443
 
444 444
         $res = $this->hasher->check($value, $key);
@@ -448,18 +448,18 @@  discard block
 block discarded – undo
448 448
         }
449 449
 
450 450
         return $res;
451
-	}
452
-
453
-	/**
454
-	 * Captcha check
455
-	 *
456
-	 * @param $value
457
-	 * @return bool
458
-	 */
459
-	public function check_api($value, $key)
460
-	{
461
-		return $this->hasher->check($value, $key);
462
-	}
451
+    }
452
+
453
+    /**
454
+     * Captcha check
455
+     *
456
+     * @param $value
457
+     * @return bool
458
+     */
459
+    public function check_api($value, $key)
460
+    {
461
+        return $this->hasher->check($value, $key);
462
+    }
463 463
 
464 464
     /**
465 465
      * Generate captcha image source
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -492,7 +492,7 @@
 block discarded – undo
492 492
      * @param null $config
493 493
      * @param array $attrs HTML attributes supplied to the image tag where key is the attribute
494 494
      * and the value is the attribute value
495
-     * @return string
495
+     * @return HtmlString
496 496
      */
497 497
     public function img($config = null, $attrs = [])
498 498
     {
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
         $this->session = $session;
199 199
         $this->hasher = $hasher;
200 200
         $this->str = $str;
201
-        $this->characters = config('captcha.characters','2346789abcdefghjmnpqrtuxyzABCDEFGHJMNPQRTUXYZ');
201
+        $this->characters = config('captcha.characters', '2346789abcdefghjmnpqrtuxyzABCDEFGHJMNPQRTUXYZ');
202 202
     }
203 203
 
204 204
     /**
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
      */
208 208
     protected function configure($config)
209 209
     {
210
-        if ($this->config->has('captcha.' . $config))
210
+        if ($this->config->has('captcha.'.$config))
211 211
         {
212
-            foreach($this->config->get('captcha.' . $config) as $key => $val)
212
+            foreach ($this->config->get('captcha.'.$config) as $key => $val)
213 213
             {
214 214
                 $this->{$key} = $val;
215 215
             }
@@ -225,10 +225,10 @@  discard block
 block discarded – undo
225 225
      */
226 226
     public function create($config = 'default', $api = false)
227 227
     {
228
-        $this->backgrounds = $this->files->files(__DIR__ . '/../assets/backgrounds');
229
-        $this->fonts = $this->files->files(__DIR__ . '/../assets/fonts');
228
+        $this->backgrounds = $this->files->files(__DIR__.'/../assets/backgrounds');
229
+        $this->fonts = $this->files->files(__DIR__.'/../assets/fonts');
230 230
 
231
-        if (app()->version() >= 5.5){
231
+        if (app()->version() >= 5.5) {
232 232
             $this->fonts = array_map(function($file) {
233 233
                 return $file->getPathName();
234 234
             }, $this->fonts);
@@ -345,9 +345,9 @@  discard block
 block discarded – undo
345 345
         $marginTop = $this->image->height() / $this->length;
346 346
 
347 347
         $i = 0;
348
-        foreach(str_split($this->text) as $char)
348
+        foreach (str_split($this->text) as $char)
349 349
         {
350
-            $marginLeft = $this->textLeftPadding +  ($i * ($this->image->width() - $this->textLeftPadding) / $this->length);
350
+            $marginLeft = $this->textLeftPadding + ($i * ($this->image->width() - $this->textLeftPadding) / $this->length);
351 351
 
352 352
             $this->image->text($char, $marginLeft, $marginTop, function($font) {
353 353
                 $font->file($this->font());
@@ -418,14 +418,14 @@  discard block
 block discarded – undo
418 418
      */
419 419
     protected function lines()
420 420
     {
421
-        for($i = 0; $i <= $this->lines; $i++)
421
+        for ($i = 0; $i <= $this->lines; $i++)
422 422
         {
423 423
             $this->image->line(
424 424
                 rand(0, $this->image->width()) + $i * rand(0, $this->image->height()),
425 425
                 rand(0, $this->image->height()),
426 426
                 rand(0, $this->image->width()),
427 427
                 rand(0, $this->image->height()),
428
-                function ($draw) {
428
+                function($draw) {
429 429
                     $draw->color($this->fontColor());
430 430
                 }
431 431
             );
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
483 483
      */
484 484
     public function src($config = null)
485 485
     {
486
-        return url('captcha' . ($config ? '/' . $config : '/default')) . '?' . $this->str->random(8);
486
+        return url('captcha'.($config ? '/'.$config : '/default')).'?'.$this->str->random(8);
487 487
     }
488 488
 
489 489
     /**
@@ -497,8 +497,8 @@  discard block
 block discarded – undo
497 497
     public function img($config = null, $attrs = [])
498 498
     {
499 499
         $attrs_str = '';
500
-        foreach($attrs as $attr => $value){
501
-            if ($attr == 'src'){
500
+        foreach ($attrs as $attr => $value) {
501
+            if ($attr == 'src') {
502 502
                 //Neglect src attribute
503 503
                 continue;
504 504
             }
Please login to merge, or discard this patch.
src/helpers.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -36,23 +36,23 @@
 block discarded – undo
36 36
 }
37 37
 
38 38
 if ( ! function_exists('captcha_check')) {
39
-	/**
40
-	 * @param $value
41
-	 * @return bool
42
-	 */
43
-	function captcha_check($value)
44
-	{
45
-		return app('captcha')->check($value);
46
-	}
39
+    /**
40
+     * @param $value
41
+     * @return bool
42
+     */
43
+    function captcha_check($value)
44
+    {
45
+        return app('captcha')->check($value);
46
+    }
47 47
 }
48 48
 
49 49
 if ( ! function_exists('captcha_api_check')) {
50
-	/**
51
-	 * @param $value
52
-	 * @return bool
53
-	 */
54
-	function captcha_api_check($value, $key)
55
-	{
56
-		return app('captcha')->check_api($value, $key);
57
-	}
50
+    /**
51
+     * @param $value
52
+     * @return bool
53
+     */
54
+    function captcha_api_check($value, $key)
55
+    {
56
+        return app('captcha')->check_api($value, $key);
57
+    }
58 58
 }
Please login to merge, or discard this patch.
src/CaptchaServiceProvider.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -24,29 +24,29 @@
 block discarded – undo
24 24
 
25 25
         // HTTP routing
26 26
         if (strpos($this->app->version(), 'Lumen') !== false) {
27
-	        $this->app->get('captcha[/api/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptchaApi');
28
-	        $this->app->get('captcha[/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptcha');
27
+            $this->app->get('captcha[/api/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptchaApi');
28
+            $this->app->get('captcha[/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptcha');
29 29
         } else {
30 30
             if ((double) $this->app->version() >= 5.2) {
31
-	            $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi')->middleware('web');
32
-	            $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha')->middleware('web');
31
+                $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi')->middleware('web');
32
+                $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha')->middleware('web');
33 33
             } else {
34
-	            $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi');
35
-	            $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha');
34
+                $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi');
35
+                $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha');
36 36
             }
37 37
         }
38 38
 
39
-	    // Validator extensions
40
-	    $this->app['validator']->extend('captcha', function($attribute, $value, $parameters)
41
-	    {
42
-		    return captcha_check($value);
43
-	    });
39
+        // Validator extensions
40
+        $this->app['validator']->extend('captcha', function($attribute, $value, $parameters)
41
+        {
42
+            return captcha_check($value);
43
+        });
44 44
 
45
-	    // Validator extensions
46
-	    $this->app['validator']->extend('captcha_api', function($attribute, $value, $parameters)
47
-	    {
48
-		    return captcha_api_check($value, $parameters[0]);
49
-	    });
45
+        // Validator extensions
46
+        $this->app['validator']->extend('captcha_api', function($attribute, $value, $parameters)
47
+        {
48
+            return captcha_api_check($value, $parameters[0]);
49
+        });
50 50
     }
51 51
 
52 52
     /**
Please login to merge, or discard this patch.
src/CaptchaController.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -11,32 +11,32 @@
 block discarded – undo
11 11
 class CaptchaController extends Controller
12 12
 {
13 13
 
14
-	/**
15
-	 * get CAPTCHA
16
-	 *
17
-	 * @param \Mews\Captcha\Captcha $captcha
18
-	 * @param string $config
19
-	 * @return \Intervention\Image\ImageManager->response
20
-	 */
21
-	public function getCaptcha(Captcha $captcha, $config = 'default')
22
-	{
23
-		if (ob_get_contents())
24
-		{
25
-			ob_clean();
26
-		}
27
-		return $captcha->create($config);
28
-	}
14
+    /**
15
+     * get CAPTCHA
16
+     *
17
+     * @param \Mews\Captcha\Captcha $captcha
18
+     * @param string $config
19
+     * @return \Intervention\Image\ImageManager->response
20
+     */
21
+    public function getCaptcha(Captcha $captcha, $config = 'default')
22
+    {
23
+        if (ob_get_contents())
24
+        {
25
+            ob_clean();
26
+        }
27
+        return $captcha->create($config);
28
+    }
29 29
 
30
-	/**
31
-	 * get CAPTCHA api
32
-	 *
33
-	 * @param \Mews\Captcha\Captcha $captcha
34
-	 * @param string $config
35
-	 * @return \Intervention\Image\ImageManager->response
36
-	 */
37
-	public function getCaptchaApi(Captcha $captcha, $config = 'default')
38
-	{
39
-		return $captcha->create($config, true);
40
-	}
30
+    /**
31
+     * get CAPTCHA api
32
+     *
33
+     * @param \Mews\Captcha\Captcha $captcha
34
+     * @param string $config
35
+     * @return \Intervention\Image\ImageManager->response
36
+     */
37
+    public function getCaptchaApi(Captcha $captcha, $config = 'default')
38
+    {
39
+        return $captcha->create($config, true);
40
+    }
41 41
 
42 42
 }
Please login to merge, or discard this patch.