[9.x] Merge 8.x into 9.x (#1245)

* Add missing clear queue command to service provider (#1237)

* Add missing clear queue command to service porovider

* hotfix: change order of uses to respect ci

Co-authored-by: Dominic Plourde <[email protected]>

* Add missing Schedule:work command (#1243)

Co-authored-by: Dominic Plourde <[email protected]>

Co-authored-by: Dominic Plourde <[email protected]>

Author: plourded

src/Console/ConsoleServiceProvider.php

@@ -8,6 +8,7 @@
 use Illuminate\Cache\Console\ForgetCommand as CacheForgetCommand;
 use Illuminate\Console\Scheduling\ScheduleFinishCommand;
 use Illuminate\Console\Scheduling\ScheduleRunCommand;
+use Illuminate\Console\Scheduling\ScheduleWorkCommand;
 use Illuminate\Database\Console\DumpCommand;
 use Illuminate\Database\Console\Migrations\FreshCommand as MigrateFreshCommand;
 use Illuminate\Database\Console\Migrations\InstallCommand as MigrateInstallCommand;
@@ -21,6 +22,7 @@
 use Illuminate\Database\Console\Seeds\SeederMakeCommand;
 use Illuminate\Database\Console\WipeCommand;
 use Illuminate\Queue\Console\BatchesTableCommand;
+use Illuminate\Queue\Console\ClearCommand as ClearQueueCommand;
 use Illuminate\Queue\Console\FailedTableCommand;
 use Illuminate\Queue\Console\FlushFailedCommand as FlushFailedQueueCommand;
 use Illuminate\Queue\Console\ForgetFailedCommand as ForgetFailedQueueCommand;
@@ -50,6 +52,7 @@ class ConsoleServiceProvider extends ServiceProvider
         'MigrateReset' => 'command.migrate.reset',
         'MigrateRollback' => 'command.migrate.rollback',
         'MigrateStatus' => 'command.migrate.status',
+        'QueueClear' => 'command.queue.clear',
         'QueueFailed' => 'command.queue.failed',
         'QueueFlush' => 'command.queue.flush',
         'QueueForget' => 'command.queue.forget',
@@ -61,6 +64,7 @@ class ConsoleServiceProvider extends ServiceProvider
         'Wipe' => 'command.wipe',
         'ScheduleFinish' => 'command.schedule.finish',
         'ScheduleRun' => 'command.schedule.run',
+        'ScheduleWork' => 'command.schedule.work',
         'SchemaDump' => 'command.schema.dump',
     ];
 
@@ -256,6 +260,18 @@ protected function registerMigrateStatusCommand()
         });
     }
 
+    /**
+     * Register the command.
+     *
+     * @return void
+     */
+    protected function registerQueueClearCommand()
+    {
+        $this->app->singleton('command.queue.clear', function () {
+            return new ClearQueueCommand;
+        });
+    }
+
     /**
      * Register the command.
      *
@@ -436,6 +452,18 @@ protected function registerScheduleRunCommand()
         });
     }
 
+    /**
+     * Register the command.
+     *
+     * @return void
+     */
+    protected function registerScheduleWorkCommand()
+    {
+        $this->app->singleton('command.schedule.work', function () {
+            return new ScheduleWorkCommand;
+        });
+    }
+
     /**
      * Register the command.
      *