Completed
Pull Request — master (#426)
by
unknown
115:38 queued 85:40
created
src/Console/MakeRoute.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         $tmpfile = $this->createTmpFileWithRoute();
100 100
         $path = $this->getPath($tmpfile);
101 101
         add_file_into_file($this->mountpoint(), $path, $dstFile = $this->destinationFile());
102
-        $this->info('Route ' . undot_path($link) . ' added to ' .  $dstFile . '.');
102
+        $this->info('Route '.undot_path($link).' added to '.$dstFile.'.');
103 103
         $this->postActions();
104 104
     }
105 105
 
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
         $link = $this->removeTrailingSlashIfExists($link);
170 170
         $link = $this->removeDuplicatedTrailingSlashes($link);
171 171
         foreach (Route::getRoutes() as $value) {
172
-            if (in_array(strtoupper($this->option('method')), array_merge($value->methods(), ['ANY'])) &&
172
+            if (in_array(strtoupper($this->option('method')), array_merge($value->methods(), [ 'ANY' ])) &&
173 173
                 $value->uri() === $link) {
174 174
                 return true;
175 175
             }
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
      */
211 211
     protected function apiRouteExists($link)
212 212
     {
213
-        return $this->webRouteExists('api/v1/' . $link);
213
+        return $this->webRouteExists('api/v1/'.$link);
214 214
     }
215 215
 
216 216
     /**
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
      */
234 234
     protected function getPath($tmpfile)
235 235
     {
236
-        return stream_get_meta_data($tmpfile)['uri'];
236
+        return stream_get_meta_data($tmpfile)[ 'uri' ];
237 237
     }
238 238
 
239 239
     /**
@@ -244,8 +244,8 @@  discard block
 block discarded – undo
244 244
     protected function getRouteCode()
245 245
     {
246 246
         $type = $this->option('type');
247
-        $class = isset(static::$lookup[$type])
248
-            ? static::$lookup[$type]
247
+        $class = isset(static::$lookup[ $type ])
248
+            ? static::$lookup[ $type ]
249 249
             : RegularRoute::class;
250 250
         /** @var GeneratesCode $route */
251 251
         $route = new $class($this->compiler, $this->filesystem);
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
             return $this->argument('action');
282 282
         }
283 283
         if (strtolower($this->option('type')) != 'regular') {
284
-            return $this->argument('link') . 'Controller';
284
+            return $this->argument('link').'Controller';
285 285
         }
286 286
         return $this->argument('link');
287 287
     }
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
      */
301 301
     protected function validateMethod()
302 302
     {
303
-        if (! in_array(strtoupper($this->option('method')), $methods = array_merge(Router::$verbs, ['ANY']))) {
303
+        if (!in_array(strtoupper($this->option('method')), $methods = array_merge(Router::$verbs, [ 'ANY' ]))) {
304 304
             throw new MethodNotAllowedException($methods);
305 305
         }
306 306
     }
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
      */
311 311
     protected function validateType()
312 312
     {
313
-        if (! in_array(strtolower($this->option('type')), ['regular','controller','resource'])) {
313
+        if (!in_array(strtolower($this->option('type')), [ 'regular', 'controller', 'resource' ])) {
314 314
             throw new RouteTypeNotValid();
315 315
         }
316 316
     }
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
             'link' => $link = undot_path($this->argument('link')),
348 348
             'name' => ucfirst($link),
349 349
         ]);
350
-        $this->info('Menu entry ' . $link .' added to config/menu.php file.');
350
+        $this->info('Menu entry '.$link.' added to config/menu.php file.');
351 351
     }
352 352
 
353 353
     /**
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
         Artisan::call('make:view', [
390 390
             'name' => $name
391 391
         ]);
392
-        $this->info('View ' . undot_path($name) .'.blade.php created.');
392
+        $this->info('View '.undot_path($name).'.blade.php created.');
393 393
     }
394 394
 
395 395
     /**
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
             'name' => $controller = $this->controllerWithoutMethod($this->action())
402 402
         ]);
403 403
         $this->addMethodToController($controller, $this->controllerMethod($this->action()));
404
-        $this->info('Controller ' . $controller .' created.');
404
+        $this->info('Controller '.$controller.' created.');
405 405
         $this->createView($this->argument('link'));
406 406
     }
407 407
 
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
             'name' => $controller = $this->controllerWithoutMethod($this->action()),
415 415
             '--resource' => true
416 416
         ]);
417
-        $this->info('Resource Controller ' . $controller .' created.');
417
+        $this->info('Resource Controller '.$controller.' created.');
418 418
         $this->createView($this->argument('link'));
419 419
     }
420 420
 
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
     {
429 429
         $tmpfile = $this->createTmpFileWithMethod($controllerMethod);
430 430
         $path = $this->getPath($tmpfile);
431
-        add_file_into_file('\/\/', $path, app_path('Http/Controllers/' . $controller . '.php'));
431
+        add_file_into_file('\/\/', $path, app_path('Http/Controllers/'.$controller.'.php'));
432 432
     }
433 433
 
434 434
     /**
@@ -468,6 +468,6 @@  discard block
 block discarded – undo
468 468
      */
469 469
     protected function getMethodStubPath()
470 470
     {
471
-        return __DIR__ . '/stubs/method.stub';
471
+        return __DIR__.'/stubs/method.stub';
472 472
     }
473 473
 }
Please login to merge, or discard this patch.
src/Console/MakeV.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
      */
38 38
     public function handle()
39 39
     {
40
-        $this->info('Running command ' . $command = $this->command());
40
+        $this->info('Running command '.$command = $this->command());
41 41
         passthru($command);
42 42
     }
43 43
 
@@ -48,11 +48,11 @@  discard block
 block discarded – undo
48 48
      */
49 49
     protected function command()
50 50
     {
51
-        $api = $this->option('api') ? ' --api '  : '';
52
-        $action = $this->argument('action') ? ' ' . $this->argument('action') . ' ' : '';
53
-        return 'php artisan make:route ' . $this->argument('link') . $action . ' --type=' . $this->option('type') .
54
-            ' --method=' . $this->option('method') .
55
-            $api .
51
+        $api = $this->option('api') ? ' --api ' : '';
52
+        $action = $this->argument('action') ? ' '.$this->argument('action').' ' : '';
53
+        return 'php artisan make:route '.$this->argument('link').$action.' --type='.$this->option('type').
54
+            ' --method='.$this->option('method').
55
+            $api.
56 56
             ' -a --menu';
57 57
     }
58 58
 }
Please login to merge, or discard this patch.
src/Http/routes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
  * but take into account we have to add 'web' middleware group here because Laravel by defaults add this middleware in
6 6
  * RouteServiceProvider
7 7
  */
8
-Route::group(['middleware' => 'web'], function () {
8
+Route::group([ 'middleware' => 'web' ], function() {
9 9
     Route::auth();
10 10
 
11 11
     Route::get('/home', 'HomeController@index');
Please login to merge, or discard this patch.
routes/web.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,11 +11,11 @@
 block discarded – undo
11 11
 |
12 12
 */
13 13
 
14
-Route::get('/', function () {
14
+Route::get('/', function() {
15 15
     return view('welcome');
16 16
 });
17 17
 
18
-Route::group(['middleware' => 'auth'], function () {
18
+Route::group([ 'middleware' => 'auth' ], function() {
19 19
     //    Route::get('/link1', function ()    {
20 20
 //        // Uses Auth Middleware
21 21
 //    });
Please login to merge, or discard this patch.
src/Console/MakeVC.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
      */
38 38
     public function handle()
39 39
     {
40
-        $this->info('Running command ' . $command = $this->command());
40
+        $this->info('Running command '.$command = $this->command());
41 41
         passthru($command);
42 42
     }
43 43
 
@@ -48,11 +48,11 @@  discard block
 block discarded – undo
48 48
      */
49 49
     protected function command()
50 50
     {
51
-        $api = $this->option('api') ? ' --api '  : '';
52
-        $action = $this->argument('action') ? ' ' . $this->argument('action') . ' ' : '';
53
-        return 'php artisan make:route ' . $this->argument('link') . $action . ' --type=' . $this->option('type') .
54
-            ' --method=' . $this->option('method') .
55
-            $api .
51
+        $api = $this->option('api') ? ' --api ' : '';
52
+        $action = $this->argument('action') ? ' '.$this->argument('action').' ' : '';
53
+        return 'php artisan make:route '.$this->argument('link').$action.' --type='.$this->option('type').
54
+            ' --method='.$this->option('method').
55
+            $api.
56 56
             ' -a --menu';
57 57
     }
58 58
 }
Please login to merge, or discard this patch.
routes/api.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@
 block discarded – undo
13 13
 |
14 14
 */
15 15
 
16
-Route::middleware('auth:api')->get('/user', function (Request $request) {
16
+Route::middleware('auth:api')->get('/user', function(Request $request) {
17 17
     return $request->user();
18 18
 });
19 19
 
20
-Route::group(['prefix' => 'v1','middleware' => 'auth:api'], function () {
20
+Route::group([ 'prefix' => 'v1', 'middleware' => 'auth:api' ], function() {
21 21
     //    Route::resource('task', 'TasksController');
22 22
 
23 23
     //Please do not remove this if you want adminlte:route and adminlte:link commands to works correctly.
Please login to merge, or discard this patch.
resources/lang/pl/message.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,8 +57,8 @@
 block discarded – undo
57 57
     'anotherlink'             => 'Kolejny link',
58 58
     'multilevel'              => 'Wielopoziomowy',
59 59
     'linklevel2'              => 'Link w poziomie 2',
60
-    'birthday'                => 'Langdon\'s Birthday',//it can't be translated to polish when it is split like that (I can but it won't be logical)
61
-    'birthdaydate'            => 'Will be 23 on April 24th',//it can't be translated to polish when it is split like that (I can but it won't be logical)
60
+    'birthday'                => 'Langdon\'s Birthday', //it can't be translated to polish when it is split like that (I can but it won't be logical)
61
+    'birthdaydate'            => 'Will be 23 on April 24th', //it can't be translated to polish when it is split like that (I can but it won't be logical)
62 62
     'progress'                => 'Postęp zadań',
63 63
     'customtemplate'          => 'Niestandardowy projekt szablonu',
64 64
     'statstab'                => 'Zawartość tablicy statystyk',
Please login to merge, or discard this patch.
migrations/username_login/2014_10_12_200000_add_username_to_users_table.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
      */
14 14
     public function up()
15 15
     {
16
-        Schema::table('users', function (Blueprint $table) {
16
+        Schema::table('users', function(Blueprint $table) {
17 17
             $table->string('username')->unique()->nullable()->after('name');
18 18
         });
19 19
     }
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
      */
26 26
     public function down()
27 27
     {
28
-        Schema::table('users', function (Blueprint $table) {
28
+        Schema::table('users', function(Blueprint $table) {
29 29
             $table->dropColumn('username');
30 30
         });
31 31
     }
Please login to merge, or discard this patch.
src/Console/MakeAdminUserSeeder.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
     {
65 65
         try {
66 66
             $this->filesystem->overwrite(
67
-                $path = database_path('seeds/' . config('AdminUserSeeder', 'AdminUserSeeder.php')),
67
+                $path = database_path('seeds/'.config('AdminUserSeeder', 'AdminUserSeeder.php')),
68 68
                 $this->compiler->compile(
69 69
                     $this->filesystem->get($this->getStubPath()),
70 70
                     [
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
                     ]
74 74
                 )
75 75
             );
76
-            $this->info('File ' . $path . ' created');
76
+            $this->info('File '.$path.' created');
77 77
         } catch (\Exception $e) {
78 78
             print_r($e->getMessage());
79 79
         }
@@ -86,6 +86,6 @@  discard block
 block discarded – undo
86 86
      */
87 87
     protected function getStubPath()
88 88
     {
89
-        return __DIR__ . '/stubs/AdminUserSeeder.php';
89
+        return __DIR__.'/stubs/AdminUserSeeder.php';
90 90
     }
91 91
 }
Please login to merge, or discard this patch.