Add phpstan and resolve for level 5

.github/workflows/ci.yml

@@ -17,6 +17,22 @@ jobs:
           composer-options: '--working-dir=tools/php-cs-fixer'
       - name: 'php-cs-fixer check'
         run: 'tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff'
+  phpstan:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@master
+      - name: setup
+        uses: shivammathur/[email protected]
+        with:
+          php-version: 8.2
+          coverage: none
+      - name: install phpstan
+        uses: ramsey/composer-install@v2
+        with:
+          composer-options: '--working-dir=tools/phpstan'
+      - name: 'php-cs-fixer check'
+        run: 'tools/phpstan/vendor/bin/phpstan analyse --configuration=tools/phpstan/phpstan.neon'
   tests:
     runs-on: ubuntu-latest
     name: tests

src/AutoMapper.php

@@ -106,10 +106,6 @@ public function map(null|array|object $source, string|array|object $target, arra
             $sourceType = 'array';
         }
 
-        if (null === $sourceType) {
-            throw new NoMappingFoundException('Cannot map this value, source is neither an object or an array.');
-        }
-
         if (\is_object($target)) {
             $targetType = \get_class($target);
             $context[MapperContext::TARGET_TO_POPULATE] = $target;
@@ -120,10 +116,6 @@ public function map(null|array|object $source, string|array|object $target, arra
             $targetType = $target;
         }
 
-        if (null === $targetType) {
-            throw new NoMappingFoundException('Cannot map this value, target is neither an object or an array.');
-        }
-
         if ('array' === $sourceType && 'array' === $targetType) {
             throw new NoMappingFoundException('Cannot map this value, both source and target are array.');
         }

src/Extractor/FromSourceMappingExtractor.php

@@ -87,7 +87,7 @@ public function getPropertiesMapping(MapperMetadataInterface $mapperMetadata): a
                 $this->getMaxDepth($mapperMetadata->getSource(), $property),
                 $this->isIgnoredProperty($mapperMetadata->getSource(), $property),
                 $this->isIgnoredProperty($mapperMetadata->getTarget(), $property),
-                PropertyReadInfo::VISIBILITY_PUBLIC === $this->readInfoExtractor->getReadInfo($mapperMetadata->getSource(), $property)?->getVisibility() ?? true,
+                PropertyReadInfo::VISIBILITY_PUBLIC === ($this->readInfoExtractor->getReadInfo($mapperMetadata->getSource(), $property)?->getVisibility() ?? true)
             );
         }
 

src/Extractor/FromTargetMappingExtractor.php

@@ -33,7 +33,7 @@ public function __construct(
         PropertyWriteInfoExtractorInterface $writeInfoExtractor,
         TransformerFactoryInterface $transformerFactory,
         ClassMetadataFactoryInterface $classMetadataFactory = null,
-        private ?AdvancedNameConverterInterface $nameConverter = null,
+        private readonly ?AdvancedNameConverterInterface $nameConverter = null,
     ) {
         parent::__construct($propertyInfoExtractor, $readInfoExtractor, $writeInfoExtractor, $transformerFactory, $classMetadataFactory);
     }
@@ -86,7 +86,7 @@ public function getPropertiesMapping(MapperMetadataInterface $mapperMetadata): a
                 $this->getMaxDepth($mapperMetadata->getTarget(), $property),
                 $this->isIgnoredProperty($mapperMetadata->getSource(), $property),
                 $this->isIgnoredProperty($mapperMetadata->getTarget(), $property),
-                PropertyReadInfo::VISIBILITY_PUBLIC === $this->readInfoExtractor->getReadInfo($mapperMetadata->getSource(), $property)?->getVisibility() ?? true,
+                PropertyReadInfo::VISIBILITY_PUBLIC === ($this->readInfoExtractor->getReadInfo($mapperMetadata->getSource(), $property)?->getVisibility() ?? true),
             );
         }
 

src/Extractor/MappingExtractor.php

@@ -112,10 +112,6 @@ protected function getMaxDepth($class, $property): ?int
             return null;
         }
 
-        if (!$this->classMetadataFactory->getMetadataFor($class)) {
-            return null;
-        }
-
         $serializerClassMetadata = $this->classMetadataFactory->getMetadataFor($class);
         $maxDepth = null;
 
@@ -134,7 +130,7 @@ protected function getGroups($class, $property): ?array
             return null;
         }
 
-        if (null === $this->classMetadataFactory || !$this->classMetadataFactory->getMetadataFor($class)) {
+        if (null === $this->classMetadataFactory) {
             return null;
         }
 
@@ -167,7 +163,7 @@ protected function isIgnoredProperty($class, $property): bool
             return false;
         }
 
-        if (null === $this->classMetadataFactory || !$this->classMetadataFactory->getMetadataFor($class)) {
+        if (null === $this->classMetadataFactory) {
             return false;
         }
 

src/Extractor/SourceTargetMappingExtractor.php

@@ -79,7 +79,7 @@ public function getPropertiesMapping(MapperMetadataInterface $mapperMetadata): a
                     $maxDepth,
                     $this->isIgnoredProperty($mapperMetadata->getSource(), $property),
                     $this->isIgnoredProperty($mapperMetadata->getTarget(), $property),
-                    PropertyReadInfo::VISIBILITY_PUBLIC === $this->readInfoExtractor->getReadInfo($mapperMetadata->getSource(), $property)?->getVisibility() ?? true,
+                    PropertyReadInfo::VISIBILITY_PUBLIC === ($this->readInfoExtractor->getReadInfo($mapperMetadata->getSource(), $property)?->getVisibility() ?? true),
                 );
             }
         }

src/Generator/Generator.php

@@ -70,7 +70,7 @@ public function generate(MapperGeneratorMetadataInterface $mapperGeneratorMetada
             ]),
                 new Scalar\String_($mapperGeneratorMetadata->getTarget())
             )));
-            $statements[] = new Stmt\If_(new Expr\StaticCall(new Name\FullyQualified(MapperContext::class), new Name('shouldHandleCircularReference'), [
+            $statements[] = new Stmt\If_(new Expr\StaticCall(new Name\FullyQualified(MapperContext::class), 'shouldHandleCircularReference', [
                 new Arg($contextVariable),
                 new Arg($hashVariable),
                 new Arg(new Expr\PropertyFetch(new Expr\Variable('this'), 'circularReferenceLimit')),
@@ -339,7 +339,7 @@ public function generate(MapperGeneratorMetadataInterface $mapperGeneratorMetada
             ]);
         }
 
-        return new Stmt\Class_(new Name($mapperGeneratorMetadata->getMapperClassName()), [
+        return new Stmt\Class_($mapperGeneratorMetadata->getMapperClassName(), [
             'flags' => Stmt\Class_::MODIFIER_FINAL,
             'extends' => new Name\FullyQualified(GeneratedMapper::class),
             'stmts' => $classStmts,

src/Normalizer/AutoMapperNormalizer.php

@@ -5,6 +5,7 @@
 namespace AutoMapper\Normalizer;
 
 use AutoMapper\AutoMapperInterface;
+use AutoMapper\AutoMapperRegistryInterface;
 use AutoMapper\MapperContext;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
@@ -30,7 +31,7 @@
     ];
 
     public function __construct(
-        private AutoMapperInterface $autoMapper,
+        private AutoMapperInterface&AutoMapperRegistryInterface $autoMapper,
     ) {
     }
 

src/Transformer/BuiltinTransformer.php

@@ -17,7 +17,7 @@
  *
  * @author Joel Wurtz <[email protected]>
  */
-final class BuiltinTransformer implements TransformerInterface
+final readonly class BuiltinTransformer implements TransformerInterface
 {
     private const CAST_MAPPING = [
         Type::BUILTIN_TYPE_BOOL => [

src/Transformer/ChainTransformerFactory.php

@@ -11,7 +11,7 @@
  */
 final class ChainTransformerFactory implements TransformerFactoryInterface
 {
-    /** @var TransformerFactoryInterface[] */
+    /** @var array<TransformerFactoryInterface[]> */
     private array $factories = [];
 
     /** @var TransformerFactoryInterface[]|null */

src/Transformer/DateTimeTransformerFactory.php

@@ -59,8 +59,8 @@ protected function createTransformerForSource(Type $targetType, MapperMetadataIn
 
     protected function createTransformerForTarget(Type $sourceType, Type $targetType, MapperMetadataInterface $mapperMetadata): ?TransformerInterface
     {
-        if (Type::BUILTIN_TYPE_STRING === $sourceType->getBuiltinType()) {
-            return new StringToDateTimeTransformer($this->getClassName($targetType), $mapperMetadata->getDateTimeFormat());
+        if (Type::BUILTIN_TYPE_STRING === $sourceType->getBuiltinType() && null !== ($targetClassName = $this->getClassName($targetType))) {
+            return new StringToDateTimeTransformer($targetClassName, $mapperMetadata->getDateTimeFormat());
         }
 
         return null;
@@ -79,7 +79,7 @@ private function isDateTimeType(Type $type): bool
         return true;
     }
 
-    private function getClassName(Type $type): ?string
+    private function getClassName(Type $type): string
     {
         if (\DateTimeInterface::class !== $type->getClassName()) {
             return \DateTimeImmutable::class;

src/Transformer/EnumTransformerFactory.php

@@ -20,7 +20,7 @@ protected function createTransformer(Type $sourceType, Type $targetType, MapperM
         }
 
         // target is enum, source isn't
-        if (!$this->isEnumType($sourceType) && $this->isEnumType($targetType, true)) {
+        if (!$this->isEnumType($sourceType) && $this->isEnumType($targetType, true) && null !== $targetType->getClassName()) {
             return new TargetEnumTransformer($targetType->getClassName());
         }
 
@@ -38,12 +38,14 @@ private function isEnumType(Type $type, bool $backed = false): bool
             return false;
         }
 
-        if (!is_subclass_of($type->getClassName(), \UnitEnum::class)) {
-            return false;
-        }
+        if (null !== $type->getClassName()) {
+            if (!is_subclass_of($type->getClassName(), \UnitEnum::class)) {
+                return false;
+            }
 
-        if ($backed && !is_subclass_of($type->getClassName(), \BackedEnum::class)) {
-            return false;
+            if ($backed && !is_subclass_of($type->getClassName(), \BackedEnum::class)) {
+                return false;
+            }
         }
 
         return true;

src/Transformer/MultipleTransformer.php

@@ -35,6 +35,9 @@ final class MultipleTransformer implements TransformerInterface, DependentTransf
         Type::BUILTIN_TYPE_ITERABLE => 'is_iterable',
     ];
 
+    /**
+     * @param array<array{transformer: TransformerInterface, type: Type}> $transformers
+     */
     public function __construct(
         private readonly array $transformers,
     ) {

src/Transformer/MultipleTransformerFactory.php

@@ -16,9 +16,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getTransformer(?array $sourceTypes, ?array $targetTypes, MapperMetadataInterface $mapperMetadata): ?TransformerInterface
     {
         if (null === $sourceTypes || \count($sourceTypes) <= 1) {

src/Transformer/NullableTransformerFactory.php

@@ -33,7 +33,7 @@ public function getTransformer(?array $sourceTypes, ?array $targetTypes, MapperM
 
         $isTargetNullable = false;
 
-        foreach ($targetTypes as $targetType) {
+        foreach ($targetTypes ?? [] as $targetType) {
             if ($targetType->isNullable()) {
                 $isTargetNullable = true;
 

src/Transformer/ObjectTransformer.php

@@ -18,7 +18,7 @@
  *
  * @author Joel Wurtz <[email protected]>
  */
-final class ObjectTransformer implements TransformerInterface, DependentTransformerInterface, AssignedByReferenceTransformerInterface
+final readonly class ObjectTransformer implements TransformerInterface, DependentTransformerInterface, AssignedByReferenceTransformerInterface
 {
     public function __construct(
         private Type $sourceType,
@@ -62,6 +62,11 @@ private function getSource(): string
         $sourceTypeName = 'array';
 
         if (Type::BUILTIN_TYPE_OBJECT === $this->sourceType->getBuiltinType()) {
+            /**
+             * Cannot be null since we check the source type is an Object.
+             *
+             * @var string $sourceTypeName
+             */
             $sourceTypeName = $this->sourceType->getClassName();
         }
 
@@ -73,6 +78,11 @@ private function getTarget(): string
         $targetTypeName = 'array';
 
         if (Type::BUILTIN_TYPE_OBJECT === $this->targetType->getBuiltinType()) {
+            /**
+             * Cannot be null since we check the target type is an Object.
+             *
+             * @var string $targetTypeName
+             */
             $targetTypeName = $this->targetType->getClassName();
         }
 

src/Transformer/ObjectTransformerFactory.php

@@ -53,7 +53,7 @@ private function isObjectType(Type $type): bool
             return false;
         }
 
-        if (is_subclass_of($type->getClassName(), \UnitEnum::class)) {
+        if (null !== $type->getClassName() && is_subclass_of($type->getClassName(), \UnitEnum::class)) {
             return false;
         }
 

src/Transformer/SymfonyUidTransformerFactory.php

@@ -14,6 +14,7 @@
  */
 final class SymfonyUidTransformerFactory extends AbstractUniqueTypeTransformerFactory implements PrioritizedTransformerFactoryInterface
 {
+    /** @var array<string, array{0: bool, 1: bool}> */
     private array $reflectionCache = [];
 
     protected function createTransformer(Type $sourceType, Type $targetType, MapperMetadataInterface $mapperMetadata): ?TransformerInterface
@@ -29,7 +30,7 @@ protected function createTransformer(Type $sourceType, Type $targetType, MapperM
             return new SymfonyUidToStringTransformer($this->reflectionCache[$sourceType->getClassName()][1]);
         }
 
-        if ($isTargetUid) {
+        if ($isTargetUid && null !== $targetType->getClassName()) {
             return new StringToSymfonyUidTransformer($targetType->getClassName());
         }
 
@@ -42,16 +43,19 @@ private function isUid(Type $type): bool
             return false;
         }
 
-        if (null === $type->getClassName()) {
+        /** @var class-string|null $typeClassName */
+        $typeClassName = $type->getClassName();
+
+        if (null === $typeClassName) {
             return false;
         }
 
-        if (!\array_key_exists($type->getClassName(), $this->reflectionCache)) {
-            $reflClass = new \ReflectionClass($type->getClassName());
-            $this->reflectionCache[$type->getClassName()] = [$reflClass->isSubclassOf(AbstractUid::class), $type->getClassName() === Ulid::class];
+        if (!\array_key_exists($typeClassName, $this->reflectionCache)) {
+            $reflClass = new \ReflectionClass($typeClassName);
+            $this->reflectionCache[$typeClassName] = [$reflClass->isSubclassOf(AbstractUid::class), $typeClassName === Ulid::class];
         }
 
-        return $this->reflectionCache[$type->getClassName()][0];
+        return $this->reflectionCache[$typeClassName][0];
     }
 
     public function getPriority(): int

src/Transformer/TransformerFactoryInterface.php

@@ -17,8 +17,8 @@ interface TransformerFactoryInterface
     /**
      * Get transformer to use when mapping from an array of type to another array of type.
      *
-     * @param Type[] $sourceTypes
-     * @param Type[] $targetTypes
+     * @param Type[]|null $sourceTypes
+     * @param Type[]|null $targetTypes
      */
     public function getTransformer(?array $sourceTypes, ?array $targetTypes, MapperMetadataInterface $mapperMetadata): ?TransformerInterface;
 }

src/Transformer/UniqueTypeTransformerFactory.php

@@ -32,10 +32,6 @@ public function getTransformer(?array $sourceTypes, ?array $targetTypes, MapperM
         }
 
         foreach ($targetTypes as $targetType) {
-            if (null === $targetType) {
-                continue;
-            }
-
             $transformer = $this->chainTransformerFactory->getTransformer($sourceTypes, [$targetType], $mapperMetadata);
 
             if (null !== $transformer) {

tests/AutoMapperBaseTest.php

@@ -21,11 +21,8 @@
  */
 abstract class AutoMapperBaseTest extends TestCase
 {
-    /** @var AutoMapper */
-    protected $autoMapper;
-
-    /** @var ClassLoaderInterface */
-    protected $loader;
+    protected AutoMapper $autoMapper;
+    protected ClassLoaderInterface $loader;
 
     protected function setUp(): void
     {

tests/AutoMapperTest.php

@@ -938,7 +938,7 @@ public function testSkipNullValues(): void
         self::assertEquals('foobar', $entity->getName());
     }
 
-    public function testAdderAndRemoverWithClass()
+    public function testAdderAndRemoverWithClass(): void
     {
         $this->buildAutoMapper(mapPrivatePropertiesAndMethod: true);
 
@@ -959,7 +959,7 @@ public function testAdderAndRemoverWithClass()
         self::assertSame('dog', $petOwnerData->getPets()[1]->type);
     }
 
-    public function testAdderAndRemoverWithInstance()
+    public function testAdderAndRemoverWithInstance(): void
     {
         $this->buildAutoMapper(mapPrivatePropertiesAndMethod: true);
 
@@ -989,7 +989,7 @@ public function testAdderAndRemoverWithInstance()
         self::assertSame('dog', $petOwner->getPets()[2]->type);
     }
 
-    public function testAdderAndRemoverWithNull()
+    public function testAdderAndRemoverWithNull(): void
     {
         $petOwner = [
             'pets' => [
@@ -1004,7 +1004,7 @@ public function testAdderAndRemoverWithNull()
         self::assertCount(0, $petOwnerData->getPets());
     }
 
-    public function testIssueTargetToPopulate()
+    public function testIssueTargetToPopulate(): void
     {
         $source = new Fixtures\IssueTargetToPopulate\VatModel();
         $source->setCountryCode('fr');