[5.4] Container: Extend() can not fire the rebinding callback (#19288)

* fix:Extend() can not fire the rebinding callback issue #19241 * StyleCI * StyleCI * StyleCI
laravel · May 24, 2017 · 38c6076 · 38c6076
1 parent 10e15da
commit 38c6076
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 0 deletions.
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -343,6 +343,10 @@ public function extend($abstract, Closure $closure)
             $this->rebound($abstract);
         } else {
             $this->extenders[$abstract][] = $closure;
+
+            if ($this->resolved($abstract)) {
+                $this->rebound($abstract);
+            }
         }
     }
 

diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php
@@ -236,6 +236,50 @@ public function testExtendCanBeCalledBeforeBind()
         $this->assertEquals('foobar', $container->make('foo'));
     }
 
+    public function testExtendInstanceRebindingCallback()
+    {
+        $_SERVER['_test_rebind'] = false;
+
+        $container = new Container;
+        $container->rebinding('foo', function () {
+            $_SERVER['_test_rebind'] = true;
+        });
+
+        $obj = new StdClass;
+        $container->instance('foo', $obj);
+
+        $container->extend('foo', function ($obj, $container) {
+            return $obj;
+        });
+
+        $this->assertTrue($_SERVER['_test_rebind']);
+    }
+
+    public function testExtendBindRebindingCallback()
+    {
+        $_SERVER['_test_rebind'] = false;
+
+        $container = new Container;
+        $container->rebinding('foo', function () {
+            $_SERVER['_test_rebind'] = true;
+        });
+        $container->bind('foo', function () {
+            $obj = new StdClass;
+
+            return $obj;
+        });
+
+        $this->assertFalse($_SERVER['_test_rebind']);
+
+        $container->make('foo');
+
+        $container->extend('foo', function ($obj, $container) {
+            return $obj;
+        });
+
+        $this->assertTrue($_SERVER['_test_rebind']);
+    }
+
     public function testUnsetExtend()
     {
         $container = new Container;