Merge pull request #40 from rekalogika:chore/cleanup

chore: Cleanup classes

Author: priyadi

src/Debug/MapperDataCollector.php

@@ -18,11 +18,12 @@
 use Symfony\Bundle\FrameworkBundle\DataCollector\AbstractDataCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @internal
  */
-final class MapperDataCollector extends AbstractDataCollector
+final class MapperDataCollector extends AbstractDataCollector implements ResetInterface
 {
     public function getName(): string
     {
@@ -135,4 +136,14 @@ public function getTotalTime(): float
             $this->getMappings()
         ));
     }
+
+    public function reset(): void
+    {
+        $this->data = [];
+        $this->totalMappings = null;
+        $this->totalMappingsIncludingSubMappings = null;
+        $this->totalTime = null;
+
+        parent::reset();
+    }
 }

src/Debug/TraceableMappingFactory.php

@@ -15,11 +15,12 @@
 
 use Rekalogika\Mapper\Mapping\Mapping;
 use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @internal
  */
-final class TraceableMappingFactory implements MappingFactoryInterface
+final class TraceableMappingFactory implements MappingFactoryInterface, ResetInterface
 {
     private bool $mappingCollected = false;
 
@@ -29,6 +30,11 @@ public function __construct(
     ) {
     }
 
+    public function reset(): void
+    {
+        $this->mappingCollected = false;
+    }
+
     public function getMapping(): Mapping
     {
         if ($this->mappingCollected) {

src/Debug/TraceableTransformer.php

@@ -33,8 +33,6 @@ final class TraceableTransformer extends AbstractTransformerDecorator implements
 {
     use MainTransformerAwareTrait;
 
-    private bool $withMainTransformerCalled = false;
-
     public function __construct(
         private TransformerInterface $decorated,
         private MapperDataCollector $dataCollector
@@ -48,17 +46,14 @@ public function getDecorated(): TransformerInterface
 
     public function withMainTransformer(MainTransformerInterface $mainTransformer): static
     {
-        if ($this->withMainTransformerCalled) {
+        if (!$this->decorated instanceof MainTransformerAwareInterface) {
             return $this;
         }
 
-        $this->withMainTransformerCalled = true;
-
-        if ($this->decorated instanceof MainTransformerAwareInterface) {
-            $this->decorated = $this->decorated->withMainTransformer($mainTransformer);
-        }
+        $clone = clone $this;
+        $clone->decorated = $this->decorated->withMainTransformer($mainTransformer);
 
-        return $this;
+        return $clone;
     }
 
     public function transform(

src/MainTransformer/Implementation/MainTransformer.php

@@ -34,11 +34,12 @@
 use Rekalogika\Mapper\Util\TypeCheck;
 use Rekalogika\Mapper\Util\TypeGuesser;
 use Symfony\Component\PropertyInfo\Type;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @internal
  */
-final class MainTransformer implements MainTransformerInterface
+final class MainTransformer implements MainTransformerInterface, ResetInterface
 {
     public static int $manualGcInterval = 500;
     private static int $runCounter = 1;
@@ -51,6 +52,11 @@ public function __construct(
     ) {
     }
 
+    public function reset(): void
+    {
+        self::$runCounter = 1;
+    }
+
     private function processTransformer(
         TransformerInterface $transformer
     ): TransformerInterface {

src/ObjectCache/Implementation/ObjectCacheFactory.php

@@ -17,7 +17,7 @@
 use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface;
 use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;
 
-final class ObjectCacheFactory implements ObjectCacheFactoryInterface
+final readonly class ObjectCacheFactory implements ObjectCacheFactoryInterface
 {
     public function __construct(
         private TypeResolverInterface $typeResolver

src/Proxy/ProxyNamer.php

@@ -16,8 +16,12 @@
 /**
  * @internal
  */
-class ProxyNamer
+final readonly class ProxyNamer
 {
+    public function __construct()
+    {
+    }
+
     /**
      * @param class-string $class
      */

src/Serializer/DenormalizerContext.php

@@ -17,6 +17,6 @@
  * @deprecated
  * @phpstan-ignore-next-line
  */
-class DenormalizerContext extends AbstractSerializerContext
+final class DenormalizerContext extends AbstractSerializerContext
 {
 }

src/Serializer/NormalizerContext.php

@@ -17,6 +17,6 @@
  * @deprecated
  * @phpstan-ignore-next-line
  */
-class NormalizerContext extends AbstractSerializerContext
+final class NormalizerContext extends AbstractSerializerContext
 {
 }

src/Transformer/Util/ReaderWriter.php

@@ -26,7 +26,7 @@
 /**
  * @internal
  */
-class ReaderWriter
+final readonly class ReaderWriter
 {
     /**
      * @throws UninitializedSourcePropertyException

src/Util/TypeCheck.php

@@ -17,7 +17,7 @@
 use Rekalogika\Mapper\Transformer\MixedType;
 use Symfony\Component\PropertyInfo\Type;
 
-final class TypeCheck
+final readonly class TypeCheck
 {
     private function __construct()
     {

src/Util/TypeGuesser.php

@@ -16,7 +16,7 @@
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
 use Symfony\Component\PropertyInfo\Type;
 
-final class TypeGuesser
+final readonly class TypeGuesser
 {
     private function __construct()
     {

src/Util/TypeUtil.php

@@ -24,7 +24,7 @@
 use Rekalogika\Mapper\TypeResolver\Implementation\TypeResolver;
 use Symfony\Component\PropertyInfo\Type;
 
-final class TypeUtil
+final readonly class TypeUtil
 {
     private function __construct()
     {