Generic types for DI classes (#20354)

Author: max-s-lab

framework/di/Container.php

@@ -158,12 +158,11 @@ class Container extends Component
      * @throws InvalidConfigException if the class cannot be recognized or correspond to an invalid definition
      * @throws NotInstantiableException If resolved to an abstract class or an interface (since 2.0.9)
      *
-     *
-     * @template T of class-string
-     * @psalm-param class-string<T>|array{class: class-string<T>} $class
-     * @phpstan-param class-string<T>|array{class: class-string<T>} $class
-     * @psalm-return T
-     * @phpstan-return T
+     * @template T of object
+     * @psalm-param string|class-string<T>|Instance $class
+     * @phpstan-param string|class-string<T>|Instance $class
+     * @psalm-return ($class is class-string<T> ? T : object)
+     * @phpstan-return ($class is class-string<T> ? T : object)
      */
     public function get($class, $params = [], $config = [])
     {

framework/di/Instance.php

@@ -114,6 +114,12 @@ public static function of($id, $optional = false)
      * @param ServiceLocator|Container|null $container the container. This will be passed to [[get()]].
      * @return object the object referenced by the Instance, or `$reference` itself if it is an object.
      * @throws InvalidConfigException if the reference is invalid
+     *
+     * @template T of object
+     * @psalm-param class-string<T>|null $type
+     * @phpstan-param class-string<T>|null $type
+     * @psalm-return ($type is null ? object : T)
+     * @phpstan-return ($type is null ? object : T)
      */
     public static function ensure($reference, $type = null, $container = null)
     {