Improve types on routes

Slim/CallableResolver.php

@@ -79,7 +79,7 @@ public function resolveMiddleware($toResolve): callable
     }
 
     /**
-     * @param string|callable $toResolve
+     * @param callable|array{class-string, string}|string $toResolve
      *
      * @throws RuntimeException
      */
@@ -180,8 +180,8 @@ private function bindToContainer(callable $callable): callable
     }
 
     /**
-     * @param string|callable $toResolve
-     * @return string|callable
+     * @param  callable|array{string, string}|string $toResolve
+     * @return callable|array<string>|string
      */
     private function prepareToResolve($toResolve)
     {

Slim/Interfaces/AdvancedCallableResolverInterface.php

@@ -15,14 +15,14 @@ interface AdvancedCallableResolverInterface extends CallableResolverInterface
     /**
      * Resolve $toResolve into a callable
      *
-     * @param string|callable $toResolve
+     * @param callable|array{class-string, string}|string $toResolve
      */
     public function resolveRoute($toResolve): callable;
 
     /**
      * Resolve $toResolve into a callable
      *
-     * @param string|callable $toResolve
+     * @param callable|array{class-string, string}|string $toResolve
      */
     public function resolveMiddleware($toResolve): callable;
 }

Slim/Interfaces/CallableResolverInterface.php

@@ -15,7 +15,7 @@ interface CallableResolverInterface
     /**
      * Resolve $toResolve into a callable
      *
-     * @param string|callable $toResolve
+     * @param callable|array{class-string, string}|string $toResolve
      */
     public function resolve($toResolve): callable;
 }

Slim/Interfaces/RouteCollectorInterface.php

@@ -95,9 +95,9 @@ public function group(string $pattern, $callable): RouteGroupInterface;
     /**
      * Add route
      *
-     * @param string[]        $methods Array of HTTP methods
-     * @param string          $pattern The route pattern
-     * @param callable|string $handler The route callable
+     * @param string[]                                    $methods Array of HTTP methods
+     * @param string                                      $pattern The route pattern
+     * @param callable|array{class-string, string}|string $handler The route callable
      */
     public function map(array $methods, string $pattern, $handler): RouteInterface;
 }

Slim/Interfaces/RouteCollectorProxyInterface.php

@@ -45,65 +45,65 @@ public function setBasePath(string $basePath): RouteCollectorProxyInterface;
     /**
      * Add GET route
      *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
+     * @param string                                      $pattern  The route URI pattern
+     * @param callable|array{class-string, string}|string $callable The route callback routine
      */
     public function get(string $pattern, $callable): RouteInterface;
 
     /**
      * Add POST route
      *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
+     * @param string                                      $pattern  The route URI pattern
+     * @param callable|array{class-string, string}|string $callable The route callback routine
      */
     public function post(string $pattern, $callable): RouteInterface;
 
     /**
      * Add PUT route
      *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
+     * @param string                                      $pattern  The route URI pattern
+     * @param callable|array{class-string, string}|string $callable The route callback routine
      */
     public function put(string $pattern, $callable): RouteInterface;
 
     /**
      * Add PATCH route
      *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
+     * @param string                                      $pattern  The route URI pattern
+     * @param callable|array{class-string, string}|string $callable The route callback routine
      */
     public function patch(string $pattern, $callable): RouteInterface;
 
     /**
      * Add DELETE route
      *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
+     * @param string                                      $pattern  The route URI pattern
+     * @param callable|array{class-string, string}|string $callable The route callback routine
      */
     public function delete(string $pattern, $callable): RouteInterface;
 
     /**
      * Add OPTIONS route
      *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
+     * @param string                                      $pattern  The route URI pattern
+     * @param callable|array{class-string, string}|string $callable The route callback routine
      */
     public function options(string $pattern, $callable): RouteInterface;
 
     /**
      * Add route for any HTTP method
      *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
+     * @param string                                      $pattern  The route URI pattern
+     * @param callable|array{class-string, string}|string $callable The route callback routine
      */
     public function any(string $pattern, $callable): RouteInterface;
 
     /**
      * Add route with multiple methods
      *
-     * @param  string[]        $methods  Numeric array of HTTP method names
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
+     * @param string[]                                    $methods  Numeric array of HTTP method names
+     * @param string                                      $pattern  The route URI pattern
+     * @param callable|array{class-string, string}|string $callable The route callback routine
      */
     public function map(array $methods, string $pattern, $callable): RouteInterface;
 

Slim/Interfaces/RouteInterface.php

@@ -47,14 +47,14 @@ public function setPattern(string $pattern): RouteInterface;
     /**
      * Get route callable
      *
-     * @return callable|string
+     * @return callable|array{class-string, string}|string
      */
     public function getCallable();
 
     /**
      * Set route callable
      *
-     * @param callable|string $callable
+     * @param callable|array{class-string, string}|string $callable
      */
     public function setCallable($callable): RouteInterface;
 

Slim/Routing/Route.php

@@ -91,7 +91,7 @@ class Route implements RouteInterface, RequestHandlerInterface
     /**
      * Route callable
      *
-     * @var callable|string
+     * @var callable|array{class-string, string}|string
      */
     protected $callable;
 
@@ -107,15 +107,15 @@ class Route implements RouteInterface, RequestHandlerInterface
     protected bool $groupMiddlewareAppended = false;
 
     /**
-     * @param string[]                         $methods    The route HTTP methods
-     * @param string                           $pattern    The route pattern
-     * @param callable|string                  $callable   The route callable
-     * @param ResponseFactoryInterface         $responseFactory
-     * @param CallableResolverInterface        $callableResolver
-     * @param TContainerInterface              $container
-     * @param InvocationStrategyInterface|null $invocationStrategy
-     * @param RouteGroupInterface[]            $groups     The parent route groups
-     * @param int                              $identifier The route identifier
+     * @param string[]                                    $methods    The route HTTP methods
+     * @param string                                      $pattern    The route pattern
+     * @param callable|array{class-string, string}|string $callable   The route callable
+     * @param ResponseFactoryInterface                    $responseFactory
+     * @param CallableResolverInterface                   $callableResolver
+     * @param TContainerInterface                         $container
+     * @param InvocationStrategyInterface|null            $invocationStrategy
+     * @param RouteGroupInterface[]                       $groups     The parent route groups
+     * @param int                                         $identifier The route identifier
      */
     public function __construct(
         array $methods,

Slim/Routing/RouteCollector.php

@@ -282,8 +282,8 @@ public function map(array $methods, string $pattern, $handler): RouteInterface
     }
 
     /**
-     * @param string[]        $methods
-     * @param callable|string $callable
+     * @param string[]                                    $methods
+     * @param callable|array{class-string, string}|string $callable
      */
     protected function createRoute(array $methods, string $pattern, $callable): RouteInterface
     {