Merge branch '4.0'

santigarcor · Jul 26, 2017 · bfc5d45 · bfc5d45
2 parents b68e9ea + 5a029a4
commit bfc5d45
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 36 deletions.
diff --git a/src/commands/AddLaratrustUserTraitUseCommand.php b/src/commands/AddLaratrustUserTraitUseCommand.php
@@ -38,7 +38,7 @@ class AddLaratrustUserTraitUseCommand extends Command
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         $models = $this->getUserModels() ;
 

diff --git a/src/commands/MakePermissionCommand.php b/src/commands/MakePermissionCommand.php
@@ -36,16 +36,6 @@ class MakePermissionCommand extends GeneratorCommand
      */
     protected $type = 'Permission model';
 
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function fire()
-    {
-        parent::fire();
-    }
-
     /**
      * Get the stub file for the generator.
      *

diff --git a/src/commands/MakeRoleCommand.php b/src/commands/MakeRoleCommand.php
@@ -36,16 +36,6 @@ class MakeRoleCommand extends GeneratorCommand
      */
     protected $type = 'Role model';
 
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function fire()
-    {
-        parent::fire();
-    }
-
     /**
      * Get the stub file for the generator.
      *

diff --git a/src/commands/MakeSeederCommand.php b/src/commands/MakeSeederCommand.php
@@ -35,7 +35,7 @@ class MakeSeederCommand extends Command
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         $this->laravel->view->addNamespace('laratrust', substr(__DIR__, 0, -8).'views');
 

diff --git a/src/commands/MakeTeamCommand.php b/src/commands/MakeTeamCommand.php
@@ -36,16 +36,6 @@ class MakeTeamCommand extends GeneratorCommand
      */
     protected $type = 'Team model';
 
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function fire()
-    {
-        parent::fire();
-    }
-
     /**
      * Get the stub file for the generator.
      *

diff --git a/src/commands/MigrationCommand.php b/src/commands/MigrationCommand.php
@@ -42,7 +42,7 @@ class MigrationCommand extends Command
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         $this->laravel->view->addNamespace('laratrust', substr(__DIR__, 0, -8).'views');
         $this->line('');

diff --git a/src/commands/SetupCommand.php b/src/commands/SetupCommand.php
@@ -60,7 +60,7 @@ public function __construct()
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         foreach ($this->calls as $command => $info) {
             $this->line(PHP_EOL . $info);

diff --git a/src/commands/SetupTeamsCommand.php b/src/commands/SetupTeamsCommand.php
@@ -41,7 +41,7 @@ class SetupTeamsCommand extends Command
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         if (!Config::get('laratrust.use_teams')) {
             $this->error('Not using teams in your Laratrust configuration file.');

diff --git a/src/commands/UpgradeCommand.php b/src/commands/UpgradeCommand.php
@@ -41,7 +41,7 @@ class UpgradeCommand extends Command
      *
      * @return void
      */
-    public function fire()
+    public function handle()
     {
         $this->laravel->view->addNamespace('laratrust', substr(__DIR__, 0, -8).'views');