[6.x] Adds support for Container::call($callableObject) (laravel#30156)

* Adds support for Container::call() * cs
i-bajrai · Oct 4, 2019 · fb9cecd · fb9cecd
1 parent cce3101
commit fb9cecd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/Illuminate/Container/BoundMethod.php b/src/Illuminate/Container/BoundMethod.php
@@ -136,6 +136,8 @@ protected static function getCallReflector($callback)
     {
         if (is_string($callback) && strpos($callback, '::') !== false) {
             $callback = explode('::', $callback);
+        } elseif (is_object($callback) && ! $callback instanceof Closure) {
+            $callback = [$callback, '__invoke'];
         }
 
         return is_array($callback)

diff --git a/tests/Container/ContainerCallTest.php b/tests/Container/ContainerCallTest.php
@@ -158,6 +158,15 @@ public function testCallWithDependencies()
         $this->assertInstanceOf(stdClass::class, $result[0]);
         $this->assertSame('taylor', $result[1]);
     }
+
+    public function testCallWithCallableObject()
+    {
+        $container = new Container;
+        $callable = new ContainerCallCallableStub;
+        $result = $container->call($callable);
+        $this->assertInstanceOf(ContainerCallConcreteStub::class, $result[0]);
+        $this->assertSame('jeffrey', $result[1]);
+    }
 }
 
 class ContainerTestCallStub
@@ -195,3 +204,11 @@ public static function inject(ContainerCallConcreteStub $stub, $default = 'taylo
         return func_get_args();
     }
 }
+
+class ContainerCallCallableStub
+{
+    public function __invoke(ContainerCallConcreteStub $stub, $default = 'jeffrey')
+    {
+        return func_get_args();
+    }
+}