Completed
Pull Request — master (#146)
by
unknown
02:50
created
src/Captcha.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
         $this->session = $session;
193 193
         $this->hasher = $hasher;
194 194
         $this->str = $str;
195
-        $this->characters = config('captcha.characters',[]);
195
+        $this->characters = config('captcha.characters', []);
196 196
     }
197 197
 
198 198
     /**
@@ -201,9 +201,9 @@  discard block
 block discarded – undo
201 201
      */
202 202
     protected function configure($config)
203 203
     {
204
-        if ($this->config->has('captcha.' . $config))
204
+        if ($this->config->has('captcha.'.$config))
205 205
         {
206
-            foreach($this->config->get('captcha.' . $config) as $key => $val)
206
+            foreach ($this->config->get('captcha.'.$config) as $key => $val)
207 207
             {
208 208
                 $this->{$key} = $val;
209 209
             }
@@ -219,10 +219,10 @@  discard block
 block discarded – undo
219 219
      */
220 220
     public function create($config = 'default', $api = false)
221 221
     {
222
-        $this->backgrounds = $this->files->files(__DIR__ . '/../assets/backgrounds');
223
-        $this->fonts = $this->files->files(__DIR__ . '/../assets/fonts');
222
+        $this->backgrounds = $this->files->files(__DIR__.'/../assets/backgrounds');
223
+        $this->fonts = $this->files->files(__DIR__.'/../assets/fonts');
224 224
         
225
-        if (app()->version() >= 5.5){
225
+        if (app()->version() >= 5.5) {
226 226
             $this->fonts = array_map(function($file) {
227 227
                 return $file->getPathName();
228 228
             }, $this->fonts);
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
     protected function generate()
302 302
     {
303 303
 	    $bag = [];
304
-	    for($i = 0; $i < $this->length; $i++)
304
+	    for ($i = 0; $i < $this->length; $i++)
305 305
 	    {
306 306
 		    $char = $this->characters[rand(0, count($this->characters) - 1)];
307 307
 		    $bag[] = $this->sensitive ? $char : $this->str->lower($char);
@@ -328,9 +328,9 @@  discard block
 block discarded – undo
328 328
 	    $marginTop = $this->image->height() / $this->length;
329 329
 
330 330
 	    $i = 0;
331
-	    foreach($this->text as $char)
331
+	    foreach ($this->text as $char)
332 332
 	    {
333
-		    $marginLeft = $this->textLeftPadding +  ($i * ($this->image->width() - $this->textLeftPadding) / $this->length);
333
+		    $marginLeft = $this->textLeftPadding + ($i * ($this->image->width() - $this->textLeftPadding) / $this->length);
334 334
 
335 335
 		    $this->image->text($char, $marginLeft, $marginTop, function($font) {
336 336
 			    $font->file($this->font());
@@ -401,14 +401,14 @@  discard block
 block discarded – undo
401 401
      */
402 402
     protected function lines()
403 403
     {
404
-        for($i = 0; $i <= $this->lines; $i++)
404
+        for ($i = 0; $i <= $this->lines; $i++)
405 405
         {
406 406
             $this->image->line(
407 407
                 rand(0, $this->image->width()) + $i * rand(0, $this->image->height()),
408 408
                 rand(0, $this->image->height()),
409 409
                 rand(0, $this->image->width()),
410 410
                 rand(0, $this->image->height()),
411
-                function ($draw) {
411
+                function($draw) {
412 412
                     $draw->color($this->fontColor());
413 413
                 }
414 414
             );
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
      */
462 462
     public function src($config = null)
463 463
     {
464
-        return url('captcha' . ($config ? '/' . $config : '/default')) . '?' . $this->str->random(8);
464
+        return url('captcha'.($config ? '/'.$config : '/default')).'?'.$this->str->random(8);
465 465
     }
466 466
 
467 467
     /**
@@ -475,14 +475,14 @@  discard block
 block discarded – undo
475 475
     public function img($config = null, $attrs = [])
476 476
     {
477 477
         $attrs_str = '';
478
-        foreach($attrs as $attr => $value){
479
-            if ($attr == 'src'){
478
+        foreach ($attrs as $attr => $value) {
479
+            if ($attr == 'src') {
480 480
                 //Neglect src attribute
481 481
                 continue;
482 482
             }
483 483
             $attrs_str .= $attr.'="'.$value.'" ';
484 484
         }
485
-        return '<img src="' . $this->src($config) . '" '. trim($attrs_str).'>';
485
+        return '<img src="'.$this->src($config).'" '.trim($attrs_str).'>';
486 486
     }
487 487
 
488 488
 }
Please login to merge, or discard this patch.
config/captcha.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 return [
4 4
 
5
-    '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'],
5
+    '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'],
6 6
 
7 7
     'default'   => [
8 8
         'length'    => 5,
Please login to merge, or discard this patch.