more refined templates for any internal that has ContainerInterface

Slim/CallableResolver.php

@@ -26,12 +26,19 @@
 use function preg_match;
 use function sprintf;
 
+/**
+ * @template TContainerInterface of (ContainerInterface|null)
+ */
 final class CallableResolver implements AdvancedCallableResolverInterface
 {
     public static string $callablePattern = '!^([^\:]+)\:([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$!';
 
+    /** @var TContainerInterface $container */
     private ?ContainerInterface $container;
 
+    /**
+     * @param TContainerInterface $container
+     */
     public function __construct(?ContainerInterface $container = null)
     {
         $this->container = $container;

Slim/Factory/AppFactory.php

@@ -47,7 +47,7 @@ class AppFactory
     /**
      * @template TContainerInterface of (ContainerInterface|null)
      * @param TContainerInterface $container
-     * @return (App<TContainerInterface>|App<ContainerInterface|null>)
+     * @return (TContainerInterface is ContainerInterface ? App<TContainerInterface> : App<ContainerInterface|null>)
      */
     public static function create(
         ?ResponseFactoryInterface $responseFactory = null,

Slim/Interfaces/RouteGroupInterface.php

@@ -31,6 +31,7 @@ public function addMiddleware(MiddlewareInterface $middleware): RouteGroupInterf
 
     /**
      * Append the group's middleware to the MiddlewareDispatcher
+     * @param MiddlewareDispatcher<\Psr\Container\ContainerInterface|null> $dispatcher
      */
     public function appendMiddlewareToDispatcher(MiddlewareDispatcher $dispatcher): RouteGroupInterface;
 

Slim/MiddlewareDispatcher.php

@@ -28,6 +28,9 @@
 use function preg_match;
 use function sprintf;
 
+/**
+ * @template TContainerInterface of (ContainerInterface|null)
+ */
 class MiddlewareDispatcher implements MiddlewareDispatcherInterface
 {
     /**
@@ -37,8 +40,12 @@ class MiddlewareDispatcher implements MiddlewareDispatcherInterface
 
     protected ?CallableResolverInterface $callableResolver;
 
+    /** @var TContainerInterface $container */
     protected ?ContainerInterface $container;
 
+    /**
+     * @param TContainerInterface $container
+     */
     public function __construct(
         RequestHandlerInterface $kernel,
         ?CallableResolverInterface $callableResolver = null,
@@ -131,6 +138,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
      * Middleware are organized as a stack. That means middleware
      * that have been added before will be executed after the newly
      * added one (last in, first out).
+     * @return MiddlewareDispatcher<TContainerInterface>
      */
     public function addDeferred(string $middleware): self
     {
@@ -238,6 +246,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
      * Middleware are organized as a stack. That means middleware
      * that have been added before will be executed after the newly
      * added one (last in, first out).
+     * @return MiddlewareDispatcher<TContainerInterface>
      */
     public function addCallable(callable $middleware): self
     {

Slim/Routing/Route.php

@@ -33,6 +33,9 @@
 use function in_array;
 use function is_array;
 
+/**
+ * @template TContainerInterface of (ContainerInterface|null)
+ */
 class Route implements RouteInterface, RequestHandlerInterface
 {
     /**
@@ -77,9 +80,11 @@ class Route implements RouteInterface, RequestHandlerInterface
 
     /**
      * Container
+     * @var TContainerInterface $container
      */
     protected ?ContainerInterface $container = null;
 
+    /** @var MiddlewareDispatcher<TContainerInterface> $middlewareDispatcher */
     protected MiddlewareDispatcher $middlewareDispatcher;
 
     /**
@@ -106,7 +111,7 @@ class Route implements RouteInterface, RequestHandlerInterface
      * @param callable|string                  $callable   The route callable
      * @param ResponseFactoryInterface         $responseFactory
      * @param CallableResolverInterface        $callableResolver
-     * @param ContainerInterface|null          $container
+     * @param TContainerInterface              $container
      * @param InvocationStrategyInterface|null $invocationStrategy
      * @param RouteGroupInterface[]            $groups     The parent route groups
      * @param int                              $identifier The route identifier

Slim/Routing/RouteCollector.php

@@ -32,6 +32,7 @@
 /**
  * RouteCollector is used to collect routes and route groups
  * as well as generate paths and URLs relative to its environment
+ * @template TContainerInterface of (ContainerInterface|null)
  */
 class RouteCollector implements RouteCollectorInterface
 {
@@ -81,6 +82,9 @@ class RouteCollector implements RouteCollectorInterface
 
     protected ResponseFactoryInterface $responseFactory;
 
+    /**
+     * @param TContainerInterface $container
+     */
     public function __construct(
         ResponseFactoryInterface $responseFactory,
         CallableResolverInterface $callableResolver,
@@ -245,10 +249,11 @@ protected function createGroup(string $pattern, $callable): RouteGroupInterface
     }
 
     /**
-     * @return RouteCollectorProxyInterface<ContainerInterface|null>
+     * @return RouteCollectorProxyInterface<TContainerInterface>
      */
     protected function createProxy(string $pattern): RouteCollectorProxyInterface
     {
+        /** @var RouteCollectorProxyInterface<TContainerInterface> */
         return new RouteCollectorProxy(
             $this->responseFactory,
             $this->callableResolver,

Slim/Routing/RouteGroup.php

@@ -88,6 +88,7 @@ public function addMiddleware(MiddlewareInterface $middleware): RouteGroupInterf
 
     /**
      * {@inheritdoc}
+     * @param MiddlewareDispatcher<\Psr\Container\ContainerInterface|null> $dispatcher
      */
     public function appendMiddlewareToDispatcher(MiddlewareDispatcher $dispatcher): RouteGroupInterface
     {

Slim/Routing/RouteRunner.php

@@ -69,7 +69,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             );
         }
 
-        /** @var Route $route */
+        /** @var Route<\Psr\Container\ContainerInterface|null> $route */
         $route = $request->getAttribute(RouteContext::ROUTE);
         return $route->run($request);
     }