Merge branch 'pr2461' into 8.x

Author: taylorotwell

src/Illuminate/Container/Container.php

@@ -51,6 +51,13 @@ class Container implements ArrayAccess, ContainerContract
      */
     protected $instances = [];
 
+    /**
+     * The container's scoped instances.
+     *
+     * @var array
+     */
+    protected $scopedInstances = [];
+
     /**
      * The registered type aliases.
      *
@@ -393,6 +400,36 @@ public function singletonIf($abstract, $concrete = null)
         }
     }
 
+    /**
+     * Register a scoped binding in the container.
+     *
+     * @param  string  $abstract
+     * @param  \Closure|string|null  $concrete
+     * @return void
+     */
+    public function scoped($abstract, $concrete = null)
+    {
+        $this->scopedInstances[] = $abstract;
+
+        $this->singleton($abstract, $concrete);
+    }
+
+    /**
+     * Register a scoped binding if it hasn't already been registered.
+     *
+     * @param  string  $abstract
+     * @param  \Closure|string|null  $concrete
+     * @return void
+     */
+    public function scopedIf($abstract, $concrete = null)
+    {
+        if (! $this->bound($abstract)) {
+            $this->scopedInstances[] = $abstract;
+
+            $this->singleton($abstract, $concrete);
+        }
+    }
+
     /**
      * "Extend" an abstract type in the container.
      *
@@ -1307,6 +1344,18 @@ public function forgetInstances()
         $this->instances = [];
     }
 
+    /**
+     * Clear all of the scoped instances from the container.
+     *
+     * @return void
+     */
+    public function forgetScopedInstances()
+    {
+        foreach ($this->scopedInstances as $scoped) {
+            unset($this->instances[$scoped]);
+        }
+    }
+
     /**
      * Flush the container of all bindings and resolved instances.
      *
@@ -1319,6 +1368,7 @@ public function flush()
         $this->bindings = [];
         $this->instances = [];
         $this->abstractAliases = [];
+        $this->scopedInstances = [];
     }
 
     /**

src/Illuminate/Queue/QueueServiceProvider.php

@@ -166,11 +166,16 @@ protected function registerWorker()
                 return $this->app->isDownForMaintenance();
             };
 
+            $resetScope = function () use ($app) {
+                return $app->forgetScopedInstances();
+            };
+
             return new Worker(
                 $app['queue'],
                 $app['events'],
                 $app[ExceptionHandler::class],
-                $isDownForMaintenance
+                $isDownForMaintenance,
+                $resetScope
             );
         });
     }

src/Illuminate/Queue/Worker.php

@@ -65,6 +65,13 @@ class Worker
      */
     protected $isDownForMaintenance;
 
+    /**
+     * The callback used to reset the application's scope.
+     *
+     * @var callable
+     */
+    protected $resetScope;
+
     /**
      * Indicates if the worker should exit.
      *
@@ -93,17 +100,20 @@ class Worker
      * @param  \Illuminate\Contracts\Events\Dispatcher  $events
      * @param  \Illuminate\Contracts\Debug\ExceptionHandler  $exceptions
      * @param  callable  $isDownForMaintenance
+     * @param  callable|null  $resetScope
      * @return void
      */
     public function __construct(QueueManager $manager,
                                 Dispatcher $events,
                                 ExceptionHandler $exceptions,
-                                callable $isDownForMaintenance)
+                                callable $isDownForMaintenance,
+                                callable $resetScope = null)
     {
         $this->events = $events;
         $this->manager = $manager;
         $this->exceptions = $exceptions;
         $this->isDownForMaintenance = $isDownForMaintenance;
+        $this->resetScope = $resetScope;
     }
 
     /**
@@ -138,6 +148,10 @@ public function daemon($connectionName, $queue, WorkerOptions $options)
                 continue;
             }
 
+            if (isset($this->resetScope)) {
+                ($this->resetScope)();
+            }
+
             // First, we will attempt to get the next job off of the queue. We will also
             // register the timeout handler and reset the alarm for this job so it is
             // not stuck in a frozen state forever. Then, we can fire off this job.

tests/Container/ContainerTest.php

@@ -106,6 +106,31 @@ public function testSharedClosureResolution()
         $this->assertSame($firstInstantiation, $secondInstantiation);
     }
 
+    public function testScopedClosureResolution()
+    {
+        $container = new Container;
+        $container->scoped('class', function () {
+            return new stdClass;
+        });
+        $firstInstantiation = $container->make('class');
+        $secondInstantiation = $container->make('class');
+        $this->assertSame($firstInstantiation, $secondInstantiation);
+    }
+
+    public function testScopedClosureResets()
+    {
+        $container = new Container;
+        $container->scoped('class', function () {
+            return new stdClass;
+        });
+        $firstInstantiation = $container->make('class');
+
+        $container->forgetScopedInstances();
+
+        $secondInstantiation = $container->make('class');
+        $this->assertNotSame($firstInstantiation, $secondInstantiation);
+    }
+
     public function testAutoConcreteResolution()
     {
         $container = new Container;
@@ -122,6 +147,20 @@ public function testSharedConcreteResolution()
         $this->assertSame($var1, $var2);
     }
 
+    public function testScopedConcreteResolutionResets()
+    {
+        $container = new Container;
+        $container->scoped(ContainerConcreteStub::class);
+
+        $var1 = $container->make(ContainerConcreteStub::class);
+
+        $container->forgetScopedInstances();
+
+        $var2 = $container->make(ContainerConcreteStub::class);
+
+        $this->assertNotSame($var1, $var2);
+    }
+
     public function testBindFailsLoudlyWithInvalidArgument()
     {
         $this->expectException(TypeError::class);