@@ -31,7 +31,6 @@ |
||
31 | 31 | |
32 | 32 | /** |
33 | 33 | * @param string $id |
34 | - * @param LaravelPlus\Extension\Specs\InputSpec $path |
|
35 | 34 | */ |
36 | 35 | public function __construct($id, InputSpec $spec) |
37 | 36 | { |
@@ -32,8 +32,7 @@ |
||
32 | 32 | { |
33 | 33 | if (is_string($pathOrSpec)) { |
34 | 34 | $spec = new InputSpec(app('specs'), app('translator'), $pathOrSpec); |
35 | - } |
|
36 | - else { |
|
35 | + } else { |
|
37 | 36 | $spec = $pathOrSpec; |
38 | 37 | } |
39 | 38 |
@@ -72,7 +72,7 @@ |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
75 | - * Get the addon namespace. |
|
75 | + * Get the addon namespace. |
|
76 | 76 | * |
77 | 77 | * @return $string |
78 | 78 | */ |
@@ -101,7 +101,7 @@ |
||
101 | 101 | if ($this->addon) { |
102 | 102 | $directories = $this->addon->config('addon.directories'); |
103 | 103 | |
104 | - if (! $directories) { |
|
104 | + if (!$directories) { |
|
105 | 105 | $directories = ['classes']; |
106 | 106 | } |
107 | 107 |
@@ -32,8 +32,7 @@ |
||
32 | 32 | { |
33 | 33 | if (is_string($pathOrSpec)) { |
34 | 34 | $spec = new InputSpec(app('specs'), app('translator'), $pathOrSpec); |
35 | - } |
|
36 | - else { |
|
35 | + } else { |
|
37 | 36 | $spec = $pathOrSpec; |
38 | 37 | } |
39 | 38 |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | */ |
12 | 12 | public static function comment() |
13 | 13 | { |
14 | - return function ($value) { |
|
14 | + return function($value) { |
|
15 | 15 | $pattern = sprintf('/%s((.|\s)*?)%s/', '{#', '#}'); |
16 | 16 | |
17 | 17 | return preg_replace($pattern, '<?php /*$1*/ ?>', $value); |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | */ |
26 | 26 | public static function script() |
27 | 27 | { |
28 | - return function ($value) { |
|
28 | + return function($value) { |
|
29 | 29 | $pattern = sprintf('/%s((.|\s)*?)%s/', '{@', '@}'); |
30 | 30 | |
31 | 31 | return preg_replace($pattern, '<?php $1; ?>', $value); |
@@ -32,8 +32,7 @@ |
||
32 | 32 | { |
33 | 33 | if (is_string($pathOrSpec)) { |
34 | 34 | $spec = new InputSpec(app('specs'), app('translator'), $pathOrSpec); |
35 | - } |
|
36 | - else { |
|
35 | + } else { |
|
37 | 36 | $spec = $pathOrSpec; |
38 | 37 | } |
39 | 38 |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace LaravelPlus\Extension\Providers; |
4 | 4 | |
5 | 5 | use Illuminate\Foundation\Providers\ArtisanServiceProvider as ServiceProvider; |
6 | -use Illuminate\Console\Scheduling\Schedule; |
|
7 | 6 | use Illuminate\Console\Scheduling\ScheduleRunCommand; |
8 | 7 | use Illuminate\Console\Scheduling\ScheduleFinishCommand; |
9 | 8 | use LaravelPlus\Extension\Console; |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | */ |
186 | 186 | protected function registerRouteCommand($command) |
187 | 187 | { |
188 | - $this->app->singleton($command, function ($app) { |
|
188 | + $this->app->singleton($command, function($app) { |
|
189 | 189 | return new Console\RouteListCommand($app); |
190 | 190 | }); |
191 | 191 | } |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | */ |
199 | 199 | protected function registerTailCommand($command) |
200 | 200 | { |
201 | - $this->app->singleton($command, function ($app) { |
|
201 | + $this->app->singleton($command, function($app) { |
|
202 | 202 | return new Console\TailCommand($app); |
203 | 203 | }); |
204 | 204 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | */ |
212 | 212 | protected function registerAppContainerCommand($command) |
213 | 213 | { |
214 | - $this->app->singleton($command, function ($app) { |
|
214 | + $this->app->singleton($command, function($app) { |
|
215 | 215 | return new Console\AppContainerCommand($app); |
216 | 216 | }); |
217 | 217 | } |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | */ |
225 | 225 | protected function registerAddonListCommand($command) |
226 | 226 | { |
227 | - $this->app->singleton($command, function ($app) { |
|
227 | + $this->app->singleton($command, function($app) { |
|
228 | 228 | return new Addons\Console\AddonListCommand($app); |
229 | 229 | }); |
230 | 230 | } |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | */ |
238 | 238 | protected function registerAddonStatusCommand($command) |
239 | 239 | { |
240 | - $this->app->singleton($command, function ($app) { |
|
240 | + $this->app->singleton($command, function($app) { |
|
241 | 241 | return new Addons\Console\AddonStatusCommand($app); |
242 | 242 | }); |
243 | 243 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | */ |
251 | 251 | protected function registerAddonNameCommand($command) |
252 | 252 | { |
253 | - $this->app->singleton($command, function ($app) { |
|
253 | + $this->app->singleton($command, function($app) { |
|
254 | 254 | return new Addons\Console\AddonNameCommand($app); |
255 | 255 | }); |
256 | 256 | } |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | */ |
264 | 264 | protected function registerAddonRemoveCommand($command) |
265 | 265 | { |
266 | - $this->app->singleton($command, function ($app) { |
|
266 | + $this->app->singleton($command, function($app) { |
|
267 | 267 | return new Addons\Console\AddonRemoveCommand($app); |
268 | 268 | }); |
269 | 269 | } |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | */ |
277 | 277 | protected function registerDatabaseStatusCommand($command) |
278 | 278 | { |
279 | - $this->app->singleton($command, function ($app) { |
|
279 | + $this->app->singleton($command, function($app) { |
|
280 | 280 | return new Database\Console\DatabaseStatusCommand($app); |
281 | 281 | }); |
282 | 282 | } |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | */ |
290 | 290 | protected function registerDatabaseUpgradeCommand($command) |
291 | 291 | { |
292 | - $this->app->singleton($command, function ($app) { |
|
292 | + $this->app->singleton($command, function($app) { |
|
293 | 293 | return new Database\Console\DatabaseUpgradeCommand($app); |
294 | 294 | }); |
295 | 295 | } |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | */ |
303 | 303 | protected function registerDatabaseCleanCommand($command) |
304 | 304 | { |
305 | - $this->app->singleton($command, function ($app) { |
|
305 | + $this->app->singleton($command, function($app) { |
|
306 | 306 | return new Database\Console\DatabaseCleanCommand($app); |
307 | 307 | }); |
308 | 308 | } |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | */ |
316 | 316 | protected function registerDatabaseRefreshCommand($command) |
317 | 317 | { |
318 | - $this->app->singleton($command, function ($app) { |
|
318 | + $this->app->singleton($command, function($app) { |
|
319 | 319 | return new Database\Console\DatabaseRefreshCommand($app); |
320 | 320 | }); |
321 | 321 | } |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | */ |
329 | 329 | protected function registerDatabaseRollbackCommand($command) |
330 | 330 | { |
331 | - $this->app->singleton($command, function ($app) { |
|
331 | + $this->app->singleton($command, function($app) { |
|
332 | 332 | return new Database\Console\DatabaseRollbackCommand($app); |
333 | 333 | }); |
334 | 334 | } |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | */ |
342 | 342 | protected function registerDatabaseAgainCommand($command) |
343 | 343 | { |
344 | - $this->app->singleton($command, function ($app) { |
|
344 | + $this->app->singleton($command, function($app) { |
|
345 | 345 | return new Database\Console\DatabaseAgainCommand($app); |
346 | 346 | }); |
347 | 347 | } |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | */ |
355 | 355 | protected function registerDatabaseSeedCommand($command) |
356 | 356 | { |
357 | - $this->app->singleton($command, function ($app) { |
|
357 | + $this->app->singleton($command, function($app) { |
|
358 | 358 | return new Database\Console\DatabaseSeedCommand($app); |
359 | 359 | }); |
360 | 360 | } |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | */ |
368 | 368 | protected function registerHashMakeCommand($command) |
369 | 369 | { |
370 | - $this->app->singleton($command, function ($app) { |
|
370 | + $this->app->singleton($command, function($app) { |
|
371 | 371 | return new Console\HashMakeCommand($app); |
372 | 372 | }); |
373 | 373 | } |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | */ |
381 | 381 | protected function registerHashCheckCommand($command) |
382 | 382 | { |
383 | - $this->app->singleton($command, function ($app) { |
|
383 | + $this->app->singleton($command, function($app) { |
|
384 | 384 | return new Console\HashCheckCommand($app); |
385 | 385 | }); |
386 | 386 | } |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | */ |
394 | 394 | protected function registerMakeAddonCommand($command) |
395 | 395 | { |
396 | - $this->app->singleton($command, function ($app) { |
|
396 | + $this->app->singleton($command, function($app) { |
|
397 | 397 | return new Addons\Console\AddonMakeCommand($app); |
398 | 398 | }); |
399 | 399 | } |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | */ |
407 | 407 | protected function registerMakeCommandCommand($command) |
408 | 408 | { |
409 | - $this->app->singleton($command, function ($app) { |
|
409 | + $this->app->singleton($command, function($app) { |
|
410 | 410 | return new Generators\Console\CommandMakeCommand($app); |
411 | 411 | }); |
412 | 412 | } |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | */ |
420 | 420 | protected function registerMakeControllerCommand($command) |
421 | 421 | { |
422 | - $this->app->singleton($command, function ($app) { |
|
422 | + $this->app->singleton($command, function($app) { |
|
423 | 423 | return new Generators\Console\ControllerMakeCommand($app); |
424 | 424 | }); |
425 | 425 | } |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | */ |
433 | 433 | protected function registerMakeEventCommand($command) |
434 | 434 | { |
435 | - $this->app->singleton($command, function ($app) { |
|
435 | + $this->app->singleton($command, function($app) { |
|
436 | 436 | return new Generators\Console\EventMakeCommand($app); |
437 | 437 | }); |
438 | 438 | } |
@@ -445,7 +445,7 @@ discard block |
||
445 | 445 | */ |
446 | 446 | protected function registerMakeJobCommand($command) |
447 | 447 | { |
448 | - $this->app->singleton($command, function ($app) { |
|
448 | + $this->app->singleton($command, function($app) { |
|
449 | 449 | return new Generators\Console\JobMakeCommand($app); |
450 | 450 | }); |
451 | 451 | } |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | */ |
459 | 459 | protected function registerMakeListenerCommand($command) |
460 | 460 | { |
461 | - $this->app->singleton($command, function ($app) { |
|
461 | + $this->app->singleton($command, function($app) { |
|
462 | 462 | return new Generators\Console\ListenerMakeCommand($app); |
463 | 463 | }); |
464 | 464 | } |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | */ |
472 | 472 | protected function registerMakeMailCommand($command) |
473 | 473 | { |
474 | - $this->app->singleton($command, function ($app) { |
|
474 | + $this->app->singleton($command, function($app) { |
|
475 | 475 | return new Generators\Console\MailMakeCommand($app); |
476 | 476 | }); |
477 | 477 | } |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | */ |
486 | 486 | protected function registerMakeMiddlewareCommand($command) |
487 | 487 | { |
488 | - $this->app->singleton($command, function ($app) { |
|
488 | + $this->app->singleton($command, function($app) { |
|
489 | 489 | return new Generators\Console\MiddlewareMakeCommand($app); |
490 | 490 | }); |
491 | 491 | } |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | */ |
499 | 499 | protected function registerMakeMigrationCommand($command) |
500 | 500 | { |
501 | - $this->app->singleton($command, function ($app) { |
|
501 | + $this->app->singleton($command, function($app) { |
|
502 | 502 | return new Database\Console\MigrationMakeCommand($app); |
503 | 503 | }); |
504 | 504 | } |
@@ -511,7 +511,7 @@ discard block |
||
511 | 511 | */ |
512 | 512 | protected function registerMakeModelCommand($command) |
513 | 513 | { |
514 | - $this->app->singleton($command, function ($app) { |
|
514 | + $this->app->singleton($command, function($app) { |
|
515 | 515 | return new Generators\Console\ModelMakeCommand($app); |
516 | 516 | }); |
517 | 517 | } |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | */ |
525 | 525 | protected function registerMakeNotificationCommand($command) |
526 | 526 | { |
527 | - $this->app->singleton($command, function ($app) { |
|
527 | + $this->app->singleton($command, function($app) { |
|
528 | 528 | return new Generators\Console\NotificationMakeCommand($app); |
529 | 529 | }); |
530 | 530 | } |
@@ -537,7 +537,7 @@ discard block |
||
537 | 537 | */ |
538 | 538 | protected function registerMakePolicyCommand($command) |
539 | 539 | { |
540 | - $this->app->singleton($command, function ($app) { |
|
540 | + $this->app->singleton($command, function($app) { |
|
541 | 541 | return new Generators\Console\PolicyMakeCommand($app); |
542 | 542 | }); |
543 | 543 | } |
@@ -550,7 +550,7 @@ discard block |
||
550 | 550 | */ |
551 | 551 | protected function registerMakeProviderCommand($command) |
552 | 552 | { |
553 | - $this->app->singleton($command, function ($app) { |
|
553 | + $this->app->singleton($command, function($app) { |
|
554 | 554 | return new Generators\Console\ProviderMakeCommand($app); |
555 | 555 | }); |
556 | 556 | } |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | */ |
564 | 564 | protected function registerMakeRequestCommand($command) |
565 | 565 | { |
566 | - $this->app->singleton($command, function ($app) { |
|
566 | + $this->app->singleton($command, function($app) { |
|
567 | 567 | return new Generators\Console\RequestMakeCommand($app); |
568 | 568 | }); |
569 | 569 | } |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | */ |
577 | 577 | protected function registerMakeSeederCommand($command) |
578 | 578 | { |
579 | - $this->app->singleton($command, function ($app) { |
|
579 | + $this->app->singleton($command, function($app) { |
|
580 | 580 | return new Database\Console\SeederMakeCommand($app); |
581 | 581 | }); |
582 | 582 | } |
@@ -589,7 +589,7 @@ discard block |
||
589 | 589 | */ |
590 | 590 | protected function registerMakeTestCommand($command) |
591 | 591 | { |
592 | - $this->app->singleton($command, function ($app) { |
|
592 | + $this->app->singleton($command, function($app) { |
|
593 | 593 | return new Generators\Console\TestMakeCommand($app); |
594 | 594 | }); |
595 | 595 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $app['path.specs'] = $app->basePath().'/resources/specs'; |
42 | 42 | |
43 | 43 | // register spec repository |
44 | - $app->singleton('specs', function ($app) { |
|
44 | + $app->singleton('specs', function($app) { |
|
45 | 45 | $loader = new Repository\FileLoader($app['files'], $app['path.specs']); |
46 | 46 | |
47 | 47 | return new Repository\NamespacedRepository($loader); |
@@ -52,13 +52,13 @@ discard block |
||
52 | 52 | $app->alias('addon', AddonEnvironment::class); |
53 | 53 | |
54 | 54 | // register addon generator |
55 | - $app->singleton('addon.generator', function ($app) { |
|
55 | + $app->singleton('addon.generator', function($app) { |
|
56 | 56 | return new AddonGenerator(); |
57 | 57 | }); |
58 | 58 | $app->alias('addon.generator', AddonGenerator::class); |
59 | 59 | |
60 | 60 | // register database migrator |
61 | - $app->singleton('database.migrator', function ($app) { |
|
61 | + $app->singleton('database.migrator', function($app) { |
|
62 | 62 | return new Migrator($app['db'], $app['config']); |
63 | 63 | }); |
64 | 64 | $app->alias('database.migrator', Migrator::class); |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace LaravelPlus\Extension\Console; |
4 | 4 | |
5 | 5 | use Illuminate\Console\Command; |
6 | -use Illuminate\Foundation\Application; |
|
7 | 6 | use LaravelPlus\Extension\Hooks\ApplicationHook; |
8 | 7 | |
9 | 8 | /** |
@@ -50,12 +50,10 @@ |
||
50 | 50 | if (is_array($instance)) { |
51 | 51 | if ($instance['shared']) { |
52 | 52 | $this->output(array_get($instances, $name)); |
53 | - } |
|
54 | - else { |
|
53 | + } else { |
|
55 | 54 | $this->output($instance['concrete']); |
56 | 55 | } |
57 | - } |
|
58 | - else { |
|
56 | + } else { |
|
59 | 57 | $this->output($instance); |
60 | 58 | } |
61 | 59 |
@@ -94,7 +94,7 @@ |
||
94 | 94 | * @param string $path |
95 | 95 | * @param string $fqcn |
96 | 96 | * |
97 | - * @return bool |
|
97 | + * @return boolean|null |
|
98 | 98 | */ |
99 | 99 | protected function generateFile(FileGenerator $generator, $path, $fqcn) |
100 | 100 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Jumilla\Generators\Laravel\OneFileGeneratorCommand as BaseCommand; |
6 | 6 | use Jumilla\Generators\FileGenerator; |
7 | -use LaravelPlus\Extension\Addons\Addon; |
|
8 | 7 | use LaravelPlus\Extension\Generators\GeneratorCommandTrait; |
9 | 8 | use Illuminate\Support\Str; |
10 | 9 |
@@ -81,7 +81,7 @@ |
||
81 | 81 | |
82 | 82 | return $generator->file($path)->template($this->getStub(), [ |
83 | 83 | 'namespace' => $namespace, |
84 | - 'root_namespace' => $this->getAppNamespace(), // use App\Http\Controllers\Controller |
|
84 | + 'root_namespace' => $this->getAppNamespace(), // use App\Http\Controllers\Controller |
|
85 | 85 | 'class' => $class, |
86 | 86 | ]); |
87 | 87 | } |