add support for automatic package discovery (Laravel 5.5)

Author: bpocallaghan

composer.json

@@ -17,12 +17,19 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4"
+        "php": ">=7.0.0"
     },
     "autoload": {
         "psr-4": {
             "Bpocallaghan\\Generators\\": "src/"
         }
     },
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Bpocallaghan\\Generators\\GeneratorsServiceProvider"
+            ]
+        }
+    }
 }

readme.md

@@ -5,7 +5,13 @@ You can publish the stubs. You can add your own stubs to generate.
 
 Interested in a laravel admin starter project where the package is being used. [Admin Starter Project](https://github.com/bpocallaghan/laravel-admin-starter)
 
-Laravel 5.1, use tag 2.1.3, Laravel 5.2 or Laravel 5.3, use branch 3, Laravel 5.4 use latest
+```
+Laravel 5.1 - v2.1.3
+Laravel 5.2 - v3.0.3
+Laravel 5.3 - v3.0.3
+Laravel 5.4 - v4.1.9
+Laravel 5.5 - v5.0.0+ 
+```
 
 ## Commands
 ```bash
@@ -70,7 +76,7 @@ Update your project's `composer.json` file.
 composer require bpocallaghan/generators --dev
 ```
 
-App the Service Provider
+Add the Service Provider (Laravel 5.5 has automatic discovery of packages)
 You'll only want to use these generators for local development, add the provider in `app/Providers/AppServiceProvider.php`:
 
 ```php

src/Commands/EventGenerateCommand.php

@@ -34,7 +34,7 @@ class EventGenerateCommand extends GeneratorCommand
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         $provider = $this->laravel->getProvider(EventServiceProvider::class);
 

src/Commands/FileCommand.php

@@ -67,7 +67,7 @@ private function getFileName()
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         // setup
         $this->setSettings();

src/Commands/GeneratorCommand.php

@@ -50,7 +50,7 @@ function __construct(Filesystem $files, Composer $composer)
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         $args = [
             'name'    => $this->argumentName(),

src/Commands/ListenerCommand.php

@@ -36,7 +36,7 @@ class ListenerCommand extends GeneratorCommand
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         if (!$this->option('event')) {
             return $this->error('Missing required option: --event=*NameOfEvent*');

src/Commands/MigrationCommand.php

@@ -42,7 +42,7 @@ class MigrationCommand extends GeneratorCommand
      *
      * @return mixed
      */
-    public function fire()
+    public function handle()
     {
         $this->meta = (new NameParser)->parse($this->argumentName());
 

src/Commands/MigrationPivotCommand.php

@@ -32,7 +32,7 @@ class MigrationPivotCommand extends GeneratorCommand
      *
      * @return mixed
      */
-    public function fire()
+    public function handle()
     {
         $name = $this->parseName($this->getNameInput());
         $path = $this->getPath($name);

src/Commands/ModelCommand.php

@@ -32,9 +32,9 @@ class ModelCommand extends GeneratorCommand
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
-        parent::fire();
+        parent::handle();
 
         if ($this->option('migration')) {
             $name = $this->getMigrationName();

src/Commands/PublishCommand.php

@@ -25,7 +25,7 @@ class PublishCommand extends GeneratorCommand
     /**
      * Execute the command
      */
-    public function fire()
+    public function handle()
     {
         $this->copyConfigFile();
         $this->copyStubsDirectory();

src/Commands/ResourceCommand.php

@@ -35,7 +35,7 @@ class ResourceCommand extends GeneratorCommand
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         $this->resource = $this->getResourceOnly();
         $this->settings = config('generators.defaults');

src/GeneratorsServiceProvider.php

@@ -2,14 +2,31 @@
 
 namespace Bpocallaghan\Generators;
 
+use Bpocallaghan\Generators\Commands\JobCommand;
+use Bpocallaghan\Generators\Commands\FileCommand;
+use Bpocallaghan\Generators\Commands\SeedCommand;
+use Bpocallaghan\Generators\Commands\ViewCommand;
+use Bpocallaghan\Generators\Commands\EventCommand;
+use Bpocallaghan\Generators\Commands\ModelCommand;
+use Bpocallaghan\Generators\Commands\TraitCommand;
+use Bpocallaghan\Generators\Commands\ConsoleCommand;
+use Bpocallaghan\Generators\Commands\PublishCommand;
+use Bpocallaghan\Generators\Commands\ContractCommand;
+use Bpocallaghan\Generators\Commands\ListenerCommand;
+use Bpocallaghan\Generators\Commands\ResourceCommand;
+use Bpocallaghan\Generators\Commands\MigrationCommand;
+use Bpocallaghan\Generators\Commands\ControllerCommand;
+use Bpocallaghan\Generators\Commands\RepositoryCommand;
+use Bpocallaghan\Generators\Commands\MiddlewareCommand;
+use Bpocallaghan\Generators\Commands\NotificationCommand;
+use Bpocallaghan\Generators\Commands\MigrationPivotCommand;
+use Bpocallaghan\Generators\Commands\EventGenerateCommand;
 use Illuminate\Support\ServiceProvider;
 
 class GeneratorsServiceProvider extends ServiceProvider
 {
     private $commandPath = 'command.bpocallaghan.';
 
-    private $packagePath = 'Bpocallaghan\Generators\Commands\\';
-
     /**
      * Bootstrap the application events.
      *
@@ -32,33 +49,33 @@ public function register()
         $this->mergeConfigFrom($configPath, 'generators');
 
         // register all the artisan commands
-        $this->registerCommand('PublishCommand', 'publish');
+        $this->registerCommand(PublishCommand::class, 'publish');
 
-        $this->registerCommand('ModelCommand', 'model');
-        $this->registerCommand('ViewCommand', 'view');
-        $this->registerCommand('ControllerCommand', 'controller');
+        $this->registerCommand(ModelCommand::class, 'model');
+        $this->registerCommand(ViewCommand::class, 'view');
+        $this->registerCommand(ControllerCommand::class, 'controller');
 
-        $this->registerCommand('MigrationCommand', 'migration');
-        $this->registerCommand('MigrationPivotCommand', 'migrate.pivot');
-        $this->registerCommand('SeedCommand', 'seed');
+        $this->registerCommand(MigrationCommand::class, 'migration');
+        $this->registerCommand(MigrationPivotCommand::class, 'migrate.pivot');
+        $this->registerCommand(SeedCommand::class, 'seed');
 
-        $this->registerCommand('NotificationCommand', 'notification');
+        $this->registerCommand(NotificationCommand::class, 'notification');
 
-        $this->registerCommand('EventCommand', 'event');
-        $this->registerCommand('ListenerCommand', 'listener');
-        $this->registerCommand('EventGenerateCommand', 'event.generate');
+        $this->registerCommand(EventCommand::class, 'event');
+        $this->registerCommand(ListenerCommand::class, 'listener');
+        $this->registerCommand(EventGenerateCommand::class, 'event.generate');
 
-        $this->registerCommand('TraitCommand', 'trait');
-        $this->registerCommand('RepositoryCommand', 'repository');
-        $this->registerCommand('ContractCommand', 'contract');
+        $this->registerCommand(TraitCommand::class, 'trait');
+        $this->registerCommand(RepositoryCommand::class, 'repository');
+        $this->registerCommand(ContractCommand::class, 'contract');
 
-        $this->registerCommand('JobCommand', 'job');
-        $this->registerCommand('ConsoleCommand', 'console');
+        $this->registerCommand(JobCommand::class, 'job');
+        $this->registerCommand(ConsoleCommand::class, 'console');
 
-        $this->registerCommand('MiddlewareCommand', 'middleware');
+        $this->registerCommand(MiddlewareCommand::class, 'middleware');
 
-        $this->registerCommand('ResourceCommand', 'resource');
-        $this->registerCommand('FileCommand', 'file');
+        $this->registerCommand(ResourceCommand::class, 'resource');
+        $this->registerCommand(FileCommand::class, 'file');
     }
 
     /**
@@ -70,7 +87,7 @@ public function register()
     private function registerCommand($class, $command)
     {
         $this->app->singleton($this->commandPath . $command, function ($app) use ($class) {
-            return $app[$this->packagePath . $class];
+            return $app[$class];
         });
 
         $this->commands($this->commandPath . $command);