Fix Octane Event using handle instead of asListener (lorisleiva#235)

* Fix lorisleiva#136 Octane Event use handle instead of asListener * Create the ActionManager as a scoped singleton instance
jaulz · Jul 27, 2023 · 25423c5 · 25423c5
1 parent 96ea7e8
commit 25423c5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/src/ActionManager.php b/src/ActionManager.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Application as Artisan;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Foundation\Application;
 use Illuminate\Routing\Router;
 use Lorisleiva\Actions\Concerns\AsCommand;
 use Lorisleiva\Actions\Concerns\AsController;
@@ -78,7 +79,7 @@ public function getDesignPatternsMatching(array $usedTraits): array
         return array_filter($this->getDesignPatterns(), $filter);
     }
 
-    public function extend(string $abstract): void
+    public function extend(Application $app, string $abstract): void
     {
         if ($this->isExtending($abstract)) {
             return;
@@ -88,7 +89,7 @@ public function extend(string $abstract): void
             return;
         }
 
-        app()->extend($abstract, function ($instance) {
+        $app->extend($abstract, function ($instance) {
             return $this->identifyAndDecorate($instance);
         });
 

diff --git a/src/ActionServiceProvider.php b/src/ActionServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Lorisleiva\Actions;
 
+use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 use Lorisleiva\Actions\Console\MakeActionCommand;
 use Lorisleiva\Actions\DesignPatterns\CommandDesignPattern;
@@ -12,14 +13,15 @@ class ActionServiceProvider extends ServiceProvider
 {
     public function register()
     {
-        $manager = new ActionManager([
-            new ControllerDesignPattern(),
-            new ListenerDesignPattern(),
-            new CommandDesignPattern(),
-        ]);
-
-        $this->app->instance(ActionManager::class, $manager);
-        $this->extendActions($manager);
+        $this->app->scoped(ActionManager::class, function () {
+            return new ActionManager([
+                new ControllerDesignPattern(),
+                new ListenerDesignPattern(),
+                new CommandDesignPattern(),
+            ]);
+        });
+
+        $this->extendActions();
     }
 
     public function boot()
@@ -37,9 +39,13 @@ public function boot()
         }
     }
 
-    protected function extendActions(ActionManager $manager)
+    protected function extendActions()
     {
-        $this->app->beforeResolving(function ($abstract) use ($manager) {
+        $this->app->beforeResolving(function ($abstract, $parameters, Application $app) {
+            if ($abstract === ActionManager::class) {
+                return;
+            }
+
             try {
                 // Fix conflict with package: barryvdh/laravel-ide-helper.
                 // @see https://github.com/lorisleiva/laravel-actions/issues/142
@@ -48,11 +54,11 @@ protected function extendActions(ActionManager $manager)
                 return;
             }
 
-            if (! $classExists || app()->resolved($abstract)) {
+            if (! $classExists || $app->resolved($abstract)) {
                 return;
             }
 
-            $manager->extend($abstract);
+            $app->make(ActionManager::class)->extend($app, $abstract);
         });
     }
 }