From 2a31f7cbac5336759c58433f5902a1544ef9f058 Mon Sep 17 00:00:00 2001 From: KIKOmanasijev Date: Sun, 26 May 2024 23:53:58 +0200 Subject: [PATCH 1/6] Add Laravel queue support --- src/Roots/Acorn/Console/Kernel.php | 6 ++++++ src/Roots/Acorn/DefaultProviders.php | 1 + 2 files changed, 7 insertions(+) diff --git a/src/Roots/Acorn/Console/Kernel.php b/src/Roots/Acorn/Console/Kernel.php index de27c3d7..f9f5dbad 100644 --- a/src/Roots/Acorn/Console/Kernel.php +++ b/src/Roots/Acorn/Console/Kernel.php @@ -5,6 +5,8 @@ use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Foundation\Application; use Illuminate\Foundation\Console\Kernel as FoundationConsoleKernel; +use Illuminate\Queue\Console\WorkCommand; +use Illuminate\Queue\Worker; class Kernel extends FoundationConsoleKernel { @@ -14,6 +16,7 @@ class Kernel extends FoundationConsoleKernel * @var array */ protected $commands = [ + \Illuminate\Queue\Console\WorkCommand::class, \Illuminate\Cache\Console\ClearCommand::class, \Illuminate\Cache\Console\ForgetCommand::class, \Illuminate\Database\Console\DbCommand::class, @@ -28,6 +31,7 @@ class Kernel extends FoundationConsoleKernel \Illuminate\Foundation\Console\ProviderMakeCommand::class, \Illuminate\Foundation\Console\RouteClearCommand::class, \Illuminate\Foundation\Console\RouteListCommand::class, + \Illuminate\Foundation\Console\JobMakeCommand::class, \Illuminate\Foundation\Console\ViewCacheCommand::class, \Illuminate\Foundation\Console\ViewClearCommand::class, \Illuminate\Routing\Console\ControllerMakeCommand::class, @@ -43,6 +47,8 @@ class Kernel extends FoundationConsoleKernel \Roots\Acorn\Console\Commands\RouteCacheCommand::class, \Roots\Acorn\Console\Commands\SummaryCommand::class, \Roots\Acorn\Console\Commands\VendorPublishCommand::class, + \Illuminate\Database\Console\TableCommand::class, + \Illuminate\Queue\Console\TableCommand::class, ]; /** diff --git a/src/Roots/Acorn/DefaultProviders.php b/src/Roots/Acorn/DefaultProviders.php index 947a3766..db842742 100644 --- a/src/Roots/Acorn/DefaultProviders.php +++ b/src/Roots/Acorn/DefaultProviders.php @@ -18,6 +18,7 @@ class DefaultProviders extends DefaultProvidersBase \Roots\Acorn\Filesystem\FilesystemServiceProvider::class, \Roots\Acorn\Providers\AcornServiceProvider::class, \Roots\Acorn\View\ViewServiceProvider::class, + \Illuminate\Queue\QueueServiceProvider::class, ]; /** From 86b4f85967947c9385caac5809615f251ada205d Mon Sep 17 00:00:00 2001 From: KIKOmanasijev Date: Mon, 27 May 2024 00:56:14 +0200 Subject: [PATCH 2/6] Remove unused imports --- src/Roots/Acorn/Console/Kernel.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Roots/Acorn/Console/Kernel.php b/src/Roots/Acorn/Console/Kernel.php index f9f5dbad..4a4f422f 100644 --- a/src/Roots/Acorn/Console/Kernel.php +++ b/src/Roots/Acorn/Console/Kernel.php @@ -5,8 +5,6 @@ use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Foundation\Application; use Illuminate\Foundation\Console\Kernel as FoundationConsoleKernel; -use Illuminate\Queue\Console\WorkCommand; -use Illuminate\Queue\Worker; class Kernel extends FoundationConsoleKernel { From 5cb7a3a8f2ead0aeb849849cf570057f1483b561 Mon Sep 17 00:00:00 2001 From: Brandon Date: Sun, 26 May 2024 18:02:23 -0500 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=8E=A8=20Sort=20the=20Kernel=20comman?= =?UTF-8?q?ds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Roots/Acorn/Console/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Roots/Acorn/Console/Kernel.php b/src/Roots/Acorn/Console/Kernel.php index 4a4f422f..aaf57140 100644 --- a/src/Roots/Acorn/Console/Kernel.php +++ b/src/Roots/Acorn/Console/Kernel.php @@ -14,24 +14,26 @@ class Kernel extends FoundationConsoleKernel * @var array */ protected $commands = [ - \Illuminate\Queue\Console\WorkCommand::class, \Illuminate\Cache\Console\ClearCommand::class, \Illuminate\Cache\Console\ForgetCommand::class, \Illuminate\Database\Console\DbCommand::class, \Illuminate\Database\Console\Seeds\SeedCommand::class, + \Illuminate\Database\Console\TableCommand::class, \Illuminate\Database\Console\WipeCommand::class, \Illuminate\Foundation\Console\ClearCompiledCommand::class, \Illuminate\Foundation\Console\ComponentMakeCommand::class, \Illuminate\Foundation\Console\ConfigClearCommand::class, \Illuminate\Foundation\Console\ConsoleMakeCommand::class, \Illuminate\Foundation\Console\EnvironmentCommand::class, + \Illuminate\Foundation\Console\JobMakeCommand::class, \Illuminate\Foundation\Console\PackageDiscoverCommand::class, \Illuminate\Foundation\Console\ProviderMakeCommand::class, \Illuminate\Foundation\Console\RouteClearCommand::class, \Illuminate\Foundation\Console\RouteListCommand::class, - \Illuminate\Foundation\Console\JobMakeCommand::class, \Illuminate\Foundation\Console\ViewCacheCommand::class, \Illuminate\Foundation\Console\ViewClearCommand::class, + \Illuminate\Queue\Console\TableCommand::class, + \Illuminate\Queue\Console\WorkCommand::class, \Illuminate\Routing\Console\ControllerMakeCommand::class, \Illuminate\Routing\Console\MiddlewareMakeCommand::class, \Roots\Acorn\Console\Commands\AboutCommand::class, @@ -45,8 +47,6 @@ class Kernel extends FoundationConsoleKernel \Roots\Acorn\Console\Commands\RouteCacheCommand::class, \Roots\Acorn\Console\Commands\SummaryCommand::class, \Roots\Acorn\Console\Commands\VendorPublishCommand::class, - \Illuminate\Database\Console\TableCommand::class, - \Illuminate\Queue\Console\TableCommand::class, ]; /** From 092b656fb0b48a97ae973fe785f7467223625165 Mon Sep 17 00:00:00 2001 From: KIKOmanasijev Date: Mon, 27 May 2024 13:44:20 +0200 Subject: [PATCH 4/6] Fix: service container not resolving Worker class --- src/Roots/Acorn/DefaultProviders.php | 3 +- .../Acorn/Providers/QueueServiceProvider.php | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/Roots/Acorn/Providers/QueueServiceProvider.php diff --git a/src/Roots/Acorn/DefaultProviders.php b/src/Roots/Acorn/DefaultProviders.php index db842742..e8268938 100644 --- a/src/Roots/Acorn/DefaultProviders.php +++ b/src/Roots/Acorn/DefaultProviders.php @@ -2,6 +2,7 @@ namespace Roots\Acorn; +use Illuminate\Queue\QueueServiceProvider; use Illuminate\Support\Collection; use Illuminate\Support\DefaultProviders as DefaultProvidersBase; @@ -17,8 +18,8 @@ class DefaultProviders extends DefaultProvidersBase \Roots\Acorn\Assets\AssetsServiceProvider::class, \Roots\Acorn\Filesystem\FilesystemServiceProvider::class, \Roots\Acorn\Providers\AcornServiceProvider::class, + \Roots\Acorn\Providers\QueueServiceProvider::class, \Roots\Acorn\View\ViewServiceProvider::class, - \Illuminate\Queue\QueueServiceProvider::class, ]; /** diff --git a/src/Roots/Acorn/Providers/QueueServiceProvider.php b/src/Roots/Acorn/Providers/QueueServiceProvider.php new file mode 100644 index 00000000..d8c4a4bc --- /dev/null +++ b/src/Roots/Acorn/Providers/QueueServiceProvider.php @@ -0,0 +1,29 @@ +app->alias('queue.worker', Worker::class); + } + + /** + * Bootstrap services. + * + * @return void + */ + public function boot() + { + // + } +} From 29a0b57caa8f7ecccfbeece6e34e77eb6416fadf Mon Sep 17 00:00:00 2001 From: KIKOmanasijev Date: Mon, 27 May 2024 13:45:48 +0200 Subject: [PATCH 5/6] Chore: remove unused imports --- src/Roots/Acorn/DefaultProviders.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Roots/Acorn/DefaultProviders.php b/src/Roots/Acorn/DefaultProviders.php index e8268938..901fe5ef 100644 --- a/src/Roots/Acorn/DefaultProviders.php +++ b/src/Roots/Acorn/DefaultProviders.php @@ -2,7 +2,6 @@ namespace Roots\Acorn; -use Illuminate\Queue\QueueServiceProvider; use Illuminate\Support\Collection; use Illuminate\Support\DefaultProviders as DefaultProvidersBase; From bcd86cd8fa71376066e4fa621b34248915b2877e Mon Sep 17 00:00:00 2001 From: KIKOmanasijev Date: Mon, 27 May 2024 13:50:40 +0200 Subject: [PATCH 6/6] Chores: code style issues --- src/Roots/Acorn/Providers/QueueServiceProvider.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Roots/Acorn/Providers/QueueServiceProvider.php b/src/Roots/Acorn/Providers/QueueServiceProvider.php index d8c4a4bc..4d5bc1db 100644 --- a/src/Roots/Acorn/Providers/QueueServiceProvider.php +++ b/src/Roots/Acorn/Providers/QueueServiceProvider.php @@ -4,9 +4,9 @@ use Illuminate\Queue\Worker; use Illuminate\Support\ServiceProvider; -use Roots\Acorn\Application; -class QueueServiceProvider extends ServiceProvider { +class QueueServiceProvider extends ServiceProvider +{ /** * Register services. * @@ -24,6 +24,6 @@ public function register() */ public function boot() { - // + // } }