Fix type check for array based callables

thephpleague · Nov 20, 2024 · 1926646 · 1926646
1 parent 0ff7fcf
commit 1926646
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/src/Route.php b/src/Route.php
@@ -28,7 +28,7 @@ class Route implements
     public function __construct(
         protected array|string $method,
         protected string $path,
-        callable|string|RequestHandlerInterface $handler,
+        callable|array|string|RequestHandlerInterface $handler,
         protected ?RouteGroup $group = null,
         protected array $vars = []
     ) {

diff --git a/tests/RouteTest.php b/tests/RouteTest.php
@@ -20,13 +20,43 @@ public function testRouteSetsAndResolvesInvokableClassCallable(): void
         $this->assertIsCallable($route->getCallable());
     }
 
-    public function testRouteSetsAndResolvesClassMethodCallable(): void
+    public function testRouteSetsAndResolvesClassMethodArrayCallable(): void
     {
         $callable = [new Controller(), 'action'];
         $route = new Route('GET', '/', $callable);
         $this->assertIsCallable($route->getCallable());
     }
 
+    public function testRouteSetsAndResolvesLazilyLoadedClassMethodArrayCallableWithoutContainer(): void
+    {
+        $callable = [new Controller(), 'action'];
+        $route = new Route('GET', '/', $callable);
+        $this->assertIsCallable($route->getCallable());
+    }
+
+    public function testRouteSetsAndResolvesLazilyLoadedClassMethodArrayCallableWithContainer(): void
+    {
+        $container = $this->createMock(ContainerInterface::class);
+
+        $container
+            ->expects($this->once())
+            ->method('has')
+            ->with($this->equalTo(Controller::class))
+            ->willReturn(true)
+        ;
+
+        $container
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->equalTo(Controller::class))
+            ->willReturn(new Controller())
+        ;
+
+        $callable = [Controller::class, 'action'];
+        $route = new Route('GET', '/', $callable);
+        $this->assertIsCallable($route->getCallable($container));
+    }
+
     public function testRouteSetsAndResolvesNamedFunctionCallable(): void
     {
         $callable = 'League\Route\Fixture\namedFunctionCallable';
@@ -53,7 +83,7 @@ public function testRouteSetsAndResolvesClassMethodCallableAsStringViaContainer(
         ;
 
         $callable = 'League\Route\Fixture\Controller::action';
-        $route    = new Route('GET', '/', $callable);
+        $route = new Route('GET', '/', $callable);
 
         $newCallable = $route->getCallable($container);
         $this->assertIsArray($newCallable);