Fixes for phpstan warnings

Author: suhock

composer.lock

@@ -28,10 +28,9 @@ abstract protected function getInjector(): InjectorInterface;
 
     /**
      * @template TClass of object
-     * @template TImplementation of TClass
      *
      * @param class-string<TClass> $className
-     * @param class-string<TImplementation>|Closure|null $source
+     * @param class-string<TClass>|Closure|null $source
      *
      * @return $this
      */

src/Suhock/DependencyInjection/ContainerTransientBuilderTrait.php

@@ -31,13 +31,13 @@ public function call(callable $function, array $params = []): mixed;
     /**
      * Creates a new instance of the specified class, injecting any constructor parameter values.
      *
-     * @template T of object
+     * @template TClass of object
      *
-     * @param class-string<T> $className The name of the class to instantiate
+     * @param class-string<TClass> $className The name of the class to instantiate
      * @param array<mixed> $params [optional] A list of parameter values to provide to the constructor. String keys will
      * be matched by name; integer keys will be matched by position.
      *
-     * @return T A new instance of the specified class
+     * @return TClass A new instance of the specified class
      * @throws InjectorException If there was an error resolving values for the constructor parameters or invoking the
      * constructor
      */

src/Suhock/DependencyInjection/InjectorInterface.php

@@ -14,6 +14,7 @@
 use DomainException;
 use ReflectionException;
 use ReflectionFunction;
+use ReflectionNamedType;
 use Suhock\DependencyInjection\DependencyInjectionException;
 use Suhock\DependencyInjection\InjectorInterface;
 
@@ -78,12 +79,12 @@ public static function isMutator(callable $function, string $className): bool
 
         $firstParamType = $closureReflection->getParameters()[0]->getType();
 
-        if ($firstParamType?->isBuiltin() ?? false) {
+        if (!$firstParamType instanceof ReflectionNamedType || $firstParamType->isBuiltin()) {
             return false;
         }
 
         /** @var class-string $firstParamTypeName */
-        $firstParamTypeName = $firstParamType?->getName();
+        $firstParamTypeName = $firstParamType->getName();
 
         return $firstParamTypeName === $className || is_subclass_of($className, $firstParamTypeName);
     }

src/Suhock/DependencyInjection/Provision/ClassInstanceProvider.php

@@ -18,14 +18,13 @@
  * the container.
  *
  * @template TClass of object
- * @template TImplementation of TClass
  * @template-implements InstanceProviderInterface<TClass>
  */
 class ImplementationInstanceProvider implements InstanceProviderInterface
 {
     /**
      * @param class-string<TClass> $className The name of the class or interface provided
-     * @param class-string<TImplementation> $implementationClassName The name of the class providing the implementation
+     * @param class-string<TClass> $implementationClassName The name of the class providing the implementation
      * instance
      *
      * @throws ImplementationException If {@see $implementationClassName} is not a subclass of {@see $className}
@@ -43,8 +42,6 @@ public function __construct(
     /**
      * @inheritDoc
      * @return TClass An instance of the class
-     * @psalm-return TClass An instance of the class
-     * @phpstan-return TImplementation
      * @throws ClassNotFoundException If the container could not resolve a value for the specified class
      */
     public function get(): object

src/Suhock/DependencyInjection/Provision/ImplementationInstanceProvider.php

@@ -20,14 +20,13 @@ final class InstanceProviderFactory
 {
     /**
      * @template TClass of object
-     * @template TImplementation of TClass
      *
      * @param InjectorInterface $injector
      * @param ContainerInterface $container
      * @param class-string<TClass> $className
-     * @param class-string<TImplementation>|TImplementation|null $source
+     * @param class-string<TClass>|TClass|Closure|null $source
      *
-     * @return InstanceProviderInterface<TClass>|InstanceProviderInterface<TImplementation>
+     * @return InstanceProviderInterface<TClass>
      */
     public static function createInstanceProvider(
         InjectorInterface $injector,
@@ -73,13 +72,12 @@ public static function createClassInstanceProvider(
 
     /**
      * @template TClass of object
-     * @template TImplementation of TClass
      *
      * @param ContainerInterface $container
      * @param class-string<TClass> $className
-     * @param class-string<TImplementation> $implementationClassName
+     * @param class-string<TClass> $implementationClassName
      *
-     * @return ImplementationInstanceProvider<TClass, TImplementation>
+     * @return ImplementationInstanceProvider<TClass>
      */
     public static function createImplementationInstanceProvider(
         ContainerInterface $container,
@@ -91,10 +89,9 @@ public static function createImplementationInstanceProvider(
 
     /**
      * @template TClass of object
-     * @template TInstance of TClass
      *
      * @param class-string<TClass> $className
-     * @param TInstance $object
+     * @param TClass $object
      *
      * @return ObjectInstanceProvider<TClass>
      */
@@ -119,6 +116,6 @@ public static function createClosureInstanceProvider(
         string $className,
         callable $closure
     ): ClosureInstanceProvider {
-        return new ClosureInstanceProvider($className, $closure, $injector);
+        return new ClosureInstanceProvider($className, $closure(...), $injector);
     }
 }

src/Suhock/DependencyInjection/Provision/InstanceProviderFactory.php

@@ -23,10 +23,10 @@
 class DependencyInjectionTestCase extends TestCase
 {
     /**
-     * @template T of Throwable
+     * @template TClass of Throwable
      *
-     * @param class-string<T> $expectedException
-     * @param callable(T):void $exceptionTest
+     * @param class-string<TClass> $expectedException
+     * @param callable(TClass):void $exceptionTest
      * @param callable $codeUnderTest
      *
      * @return void
@@ -43,7 +43,7 @@ private static function assertThrowsThrowable(
             throw $e;
         } catch (Throwable $exception) {
             self::assertInstanceOf($expectedException, $exception, $exception->getMessage());
-            /** @var T $exception */
+            /** @var TClass $exception */
             $exceptionTest($exception);
         }
     }