ReadOnlyClassRector

rector.php

@@ -15,6 +15,7 @@
 use Rector\Php80\Rector\FuncCall\ClassOnObjectRector;
 use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
 use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
+use Rector\Php82\Rector\Class_\ReadOnlyClassRector;
 use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector;
 use Rector\Strict\Rector\Ternary\DisallowedShortTernaryRuleFixerRector;
 
@@ -35,9 +36,10 @@
         // doctrineCodeQuality: true,
     )
     // uncomment to reach your current PHP version
-    // ->withPhpSets(php82: true)
+    ->withPhpSets(php82: true)
     ->withRules([
         MixedTypeRector::class,
+        ReadOnlyClassRector::class,
         ReadOnlyPropertyRector::class,
         RemoveUnusedVariableInCatchRector::class,
         ClassOnObjectRector::class,

src/CustomMapper/Implementation/ObjectMapperTableFactory.php

@@ -20,9 +20,9 @@
 /**
  * @internal
  */
-final class ObjectMapperTableFactory implements ObjectMapperTableFactoryInterface
+final readonly class ObjectMapperTableFactory implements ObjectMapperTableFactoryInterface
 {
-    private readonly ObjectMapperTable $objectMapperTable;
+    private ObjectMapperTable $objectMapperTable;
 
     public function __construct()
     {

src/MapperFactory.php

@@ -134,8 +134,6 @@ class MapperFactory
     private ?SymfonyUidTransformer $symfonyUidTransformer = null;
     private ?RamseyUuidTransformer $ramseyUuidTransformer = null;
     private ?PresetTransformer $presetTransformer = null;
-
-    private readonly CacheItemPoolInterface $propertyInfoExtractorCache;
     private null|(PropertyInfoExtractorInterface&PropertyInitializableExtractorInterface) $propertyInfoExtractor = null;
     private ?TypeResolverInterface $typeResolver = null;
     private ?ObjectToObjectMetadataFactoryInterface $objectToObjectMetadataFactory = null;
@@ -167,15 +165,8 @@ class MapperFactory
     /**
      * @param array<string,TransformerInterface> $additionalTransformers
      */
-    public function __construct(
-        private readonly array $additionalTransformers = [],
-        private ?ReflectionExtractor $reflectionExtractor = null,
-        private ?PhpStanExtractor $phpStanExtractor = null,
-        private readonly ?NormalizerInterface $normalizer = null,
-        private readonly ?DenormalizerInterface $denormalizer = null,
-        ?CacheItemPoolInterface $propertyInfoExtractorCache = null,
-    ) {
-        $this->propertyInfoExtractorCache = $propertyInfoExtractorCache ?? new ArrayAdapter();
+    public function __construct(private readonly array $additionalTransformers = [], private ?ReflectionExtractor $reflectionExtractor = null, private ?PhpStanExtractor $phpStanExtractor = null, private readonly ?NormalizerInterface $normalizer = null, private readonly ?DenormalizerInterface $denormalizer = null, private readonly CacheItemPoolInterface $propertyInfoExtractorCache = new ArrayAdapter())
+    {
     }
 
     /**

src/Transformer/Implementation/ObjectToObjectTransformer.php

@@ -408,9 +408,7 @@ private function readSourcePropertyAndWriteTargetProperty(
                 target: $target,
                 context: $context
             );
-        } catch (UninitializedSourcePropertyException) {
-            return;
-        } catch (UnsupportedPropertyMappingException) {
+        } catch (UninitializedSourcePropertyException|UnsupportedPropertyMappingException) {
             return;
         }
 

src/Transformer/Implementation/ScalarToScalarTransformer.php

@@ -34,19 +34,13 @@ public function transform(
         }
 
         $targetTypeBuiltIn = $targetType?->getBuiltinType();
-
-        switch ($targetTypeBuiltIn) {
-            case Type::BUILTIN_TYPE_INT:
-                return (int) $source;
-            case Type::BUILTIN_TYPE_FLOAT:
-                return (float) $source;
-            case Type::BUILTIN_TYPE_STRING:
-                return (string) $source;
-            case Type::BUILTIN_TYPE_BOOL:
-                return (bool) $source;
-        }
-
-        throw new InvalidArgumentException(sprintf('Target must be scalar, "%s" given.', get_debug_type($targetType)), context: $context);
+        return match ($targetTypeBuiltIn) {
+            Type::BUILTIN_TYPE_INT => (int) $source,
+            Type::BUILTIN_TYPE_FLOAT => (float) $source,
+            Type::BUILTIN_TYPE_STRING => (string) $source,
+            Type::BUILTIN_TYPE_BOOL => (bool) $source,
+            default => throw new InvalidArgumentException(sprintf('Target must be scalar, "%s" given.', get_debug_type($targetType)), context: $context),
+        };
     }
 
     public function getSupportedTransformation(): iterable

src/Transformer/Util/ReaderWriter.php

@@ -61,11 +61,7 @@ public function readSourceProperty(
                 /** @psalm-suppress MixedMethodCall */
                 return $source->{$accessorName}();
             } elseif ($mode === ReadMode::DynamicProperty) {
-                if (isset($source->{$accessorName})) {
-                    return $source->{$accessorName};
-                }
-
-                return null;
+                return $source->{$accessorName} ?? null;
             }
 
             return null;
@@ -129,11 +125,7 @@ public function readTargetProperty(
                 /** @psalm-suppress MixedMethodCall */
                 return $target->{$accessorName}();
             } elseif ($readMode === ReadMode::DynamicProperty) {
-                if (isset($target->{$accessorName})) {
-                    return $target->{$accessorName};
-                }
-
-                return null;
+                return $target->{$accessorName} ?? null;
             }
 
             return null;

src/TransformerRegistry/Implementation/CachingTransformerRegistry.php

@@ -41,11 +41,7 @@ public function __construct(
 
     public function get(string $id): TransformerInterface
     {
-        if (isset($this->transformers[$id])) {
-            return $this->transformers[$id];
-        }
-
-        return $this->transformers[$id] = $this->decorated->get($id);
+        return $this->transformers[$id] ?? ($this->transformers[$id] = $this->decorated->get($id));
     }
 
     public function findBySourceAndTargetTypes(

src/TransformerRegistry/Implementation/TransformerRegistry.php

@@ -148,12 +148,7 @@ public function findBySourceAndTargetTypes(
             }
         }
 
-        usort($searchResultEntries, function (
-            SearchResultEntry $a,
-            SearchResultEntry $b
-        ) {
-            return $a->getMappingOrder() <=> $b->getMappingOrder();
-        });
+        usort($searchResultEntries, fn (SearchResultEntry $a, SearchResultEntry $b) => $a->getMappingOrder() <=> $b->getMappingOrder());
 
         return new SearchResult($searchResultEntries);
     }

tests/Common/IterableMapperDecorator.php

@@ -16,11 +16,11 @@
 use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\IterableMapperInterface;
 
-final class IterableMapperDecorator implements IterableMapperInterface
+final readonly class IterableMapperDecorator implements IterableMapperInterface
 {
     public function __construct(
-        private readonly IterableMapperInterface $decorated,
-        private readonly Context $defaultContext
+        private IterableMapperInterface $decorated,
+        private Context $defaultContext
     ) {
     }
 

tests/Common/MapperDecorator.php

@@ -16,11 +16,11 @@
 use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\MapperInterface;
 
-final class MapperDecorator implements MapperInterface
+final readonly class MapperDecorator implements MapperInterface
 {
     public function __construct(
-        private readonly MapperInterface $decorated,
-        private readonly Context $defaultContext
+        private MapperInterface $decorated,
+        private Context $defaultContext
     ) {
     }
 

tests/Fixtures/Doctrine/EntityWithMultipleIdentifier.php

@@ -18,22 +18,13 @@
 #[ORM\Entity]
 class EntityWithMultipleIdentifier
 {
-    #[ORM\Id]
-    #[ORM\Column(name: 'id1', type: 'string', length: 255)]
-    private string $id1;
-
-    #[ORM\Id]
-    #[ORM\Column(name: 'id2', type: 'string', length: 255)]
-    private string $id2;
-
-    #[ORM\Column]
-    private string $name;
-
-    public function __construct(string $id1, string $id2, string $name)
+    public function __construct(#[ORM\Id]
+        #[ORM\Column(name: 'id1', type: 'string', length: 255)]
+        private string $id1, #[ORM\Id]
+        #[ORM\Column(name: 'id2', type: 'string', length: 255)]
+        private string $id2, #[ORM\Column]
+        private string $name)
     {
-        $this->id1 = $id1;
-        $this->id2 = $id2;
-        $this->name = $name;
     }
 
     public function getId1(): string

tests/Fixtures/Doctrine/EntityWithSingleIdentifier.php

@@ -20,13 +20,6 @@
 #[ORM\Entity]
 class EntityWithSingleIdentifier
 {
-    #[ORM\Id]
-    #[ORM\Column(name: 'my_identifier', type: 'string', length: 255)]
-    private string $myIdentifier;
-
-    #[ORM\Column]
-    private string $name;
-
     #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
     #[ORM\JoinColumn(name: 'parent_id', referencedColumnName: 'my_identifier')]
     private ?self $parent = null;
@@ -37,10 +30,11 @@ class EntityWithSingleIdentifier
     #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')]
     private Collection $children;
 
-    public function __construct(string $myIdentifier, string $name)
+    public function __construct(#[ORM\Id]
+        #[ORM\Column(name: 'my_identifier', type: 'string', length: 255)]
+        private string $myIdentifier, #[ORM\Column]
+        private string $name)
     {
-        $this->myIdentifier = $myIdentifier;
-        $this->name = $name;
         $this->children = new ArrayCollection();
     }
 

tests/Fixtures/MethodMapper/MoneyDto.php

@@ -23,11 +23,11 @@
  * @deprecated
  * @psalm-suppress DeprecatedInterface
  */
-final class MoneyDto implements MapToObjectInterface, MapFromObjectInterface
+final readonly class MoneyDto implements MapToObjectInterface, MapFromObjectInterface
 {
     public function __construct(
-        private readonly string $amount,
-        private readonly string $currency,
+        private string $amount,
+        private string $currency,
     ) {
     }
 

tests/Fixtures/ObjectMapper/MoneyDto.php

@@ -13,11 +13,11 @@
 
 namespace Rekalogika\Mapper\Tests\Fixtures\ObjectMapper;
 
-final class MoneyDto
+final readonly class MoneyDto
 {
     public function __construct(
-        private readonly string $amount,
-        private readonly string $currency,
+        private string $amount,
+        private string $currency,
     ) {
     }