Return the bound instance when using Container::instance (#19442)

laravel · Jun 1, 2017 · 1ca7c23 · 1ca7c23
1 parent fd39889
commit 1ca7c23
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -355,7 +355,7 @@ public function extend($abstract, Closure $closure)
      *
      * @param  string  $abstract
      * @param  mixed   $instance
-     * @return void
+     * @return mixed
      */
     public function instance($abstract, $instance)
     {
@@ -373,6 +373,8 @@ public function instance($abstract, $instance)
         if ($isBound) {
             $this->rebound($abstract);
         }
+
+        return $instance;
     }
 
     /**

diff --git a/src/Illuminate/Contracts/Container/Container.php b/src/Illuminate/Contracts/Container/Container.php
@@ -85,7 +85,7 @@ public function extend($abstract, Closure $closure);
      *
      * @param  string  $abstract
      * @param  mixed   $instance
-     * @return void
+     * @return mixed
      */
     public function instance($abstract, $instance);
 

diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php
@@ -181,6 +181,16 @@ public function testMultipleExtends()
         $this->assertEquals('foobarbaz', $container->make('foo'));
     }
 
+    public function testBindingAnInstanceReturnsTheInstance()
+    {
+        $container = new Container;
+
+        $bound = new StdClass;
+        $resolved = $container->instance('foo', $bound);
+
+        $this->assertSame($bound, $resolved);
+    }
+
     public function testExtendInstancesArePreserved()
     {
         $container = new Container;