[1.x] Resolve components when needed (2) (#360)

* resolve components when needed * reindent doc Co-authored-by: foremtehan <foremtehan@gmailcom>
laravel · Aug 7, 2021 · f1dc360 · f1dc360
1 parent 908c117
commit f1dc360
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/src/Listeners/GiveNewApplicationInstanceToAuthorizationGate.php b/src/Listeners/GiveNewApplicationInstanceToAuthorizationGate.php
@@ -14,6 +14,10 @@ class GiveNewApplicationInstanceToAuthorizationGate
      */
     public function handle($event): void
     {
+        if (! $event->sandbox->resolved(Gate::class)) {
+            return;
+        }
+
         $event->sandbox->make(Gate::class)->setContainer($event->sandbox);
     }
 }
diff --git a/src/Listeners/GiveNewApplicationInstanceToDatabaseSessionHandler.php b/src/Listeners/GiveNewApplicationInstanceToDatabaseSessionHandler.php
@@ -14,6 +14,10 @@ class GiveNewApplicationInstanceToDatabaseSessionHandler
      */
     public function handle($event): void
     {
+        if (! $event->sandbox->resolved('session')) {
+            return;
+        }
+
         $handler = $event->sandbox->make('session')->driver()->getHandler();
 
         if (! $handler instanceof DatabaseSessionHandler ||

diff --git a/src/Listeners/GiveNewApplicationInstanceToRouter.php b/src/Listeners/GiveNewApplicationInstanceToRouter.php
@@ -12,6 +12,10 @@ class GiveNewApplicationInstanceToRouter
      */
     public function handle($event): void
     {
+        if (! $event->sandbox->resolved('router')) {
+            return;
+        }
+
         $event->sandbox->make('router')->setContainer($event->sandbox);
     }
 }
diff --git a/src/Listeners/GiveNewApplicationInstanceToViewFactory.php b/src/Listeners/GiveNewApplicationInstanceToViewFactory.php
@@ -12,6 +12,10 @@ class GiveNewApplicationInstanceToViewFactory
      */
     public function handle($event): void
     {
+        if (! $event->sandbox->resolved('view')) {
+            return;
+        }
+
         with($event->sandbox->make('view'), function ($view) use ($event) {
             $view->setContainer($event->sandbox);