chore(test): remove most of deprecations in test (#55)

jolicode · Mar 14, 2024 · 0359930 · 0359930
1 parent d409a62
commit 0359930
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 42 deletions.
diff --git a/src/AutoMapper.php b/src/AutoMapper.php
@@ -167,6 +167,9 @@ public function bindCustomTransformer(CustomTransformerInterface $customTransfor
         $this->customTransformersRegistry->addCustomTransformer($customTransformer, $id);
     }
 
+    /**
+     * @param list<TransformerFactoryInterface> $transformerFactories
+     */
     public static function create(
         bool $mapPrivateProperties = false,
         ClassLoaderInterface $loader = null,
@@ -176,6 +179,7 @@ public static function create(
         bool $autoRegister = true,
         string $dateTimeFormat = \DateTimeInterface::RFC3339,
         bool $allowReadOnlyTargetToPopulate = false,
+        array $transformerFactories = [],
     ): self {
         if (class_exists(AttributeLoader::class)) {
             $loaderClass = new AttributeLoader();
@@ -224,6 +228,10 @@ public static function create(
             $factories[] = new SymfonyUidTransformerFactory();
         }
 
+        foreach ($transformerFactories as $factory) {
+            $factories[] = $factory;
+        }
+
         $transformerFactory = new ChainTransformerFactory($factories);
 
         $sourceTargetMappingExtractor = new SourceTargetMappingExtractor(

diff --git a/tests/AutoMapperBaseTest.php b/tests/AutoMapperBaseTest.php
@@ -31,7 +31,7 @@ protected function setUp(): void
         $this->buildAutoMapper();
     }
 
-    protected function buildAutoMapper(bool $allowReadOnlyTargetToPopulate = false, bool $mapPrivatePropertiesAndMethod = false, string $classPrefix = 'Mapper_'): AutoMapper
+    protected function buildAutoMapper(bool $allowReadOnlyTargetToPopulate = false, bool $mapPrivatePropertiesAndMethod = false, string $classPrefix = 'Mapper_', array $transformerFactories = []): AutoMapper
     {
         $fs = new Filesystem();
         $fs->remove(__DIR__ . '/cache/');
@@ -48,6 +48,6 @@ protected function buildAutoMapper(bool $allowReadOnlyTargetToPopulate = false,
             $allowReadOnlyTargetToPopulate
         ), __DIR__ . '/cache');
 
-        return $this->autoMapper = AutoMapper::create($mapPrivatePropertiesAndMethod, $this->loader, classPrefix: $classPrefix);
+        return $this->autoMapper = AutoMapper::create($mapPrivatePropertiesAndMethod, $this->loader, classPrefix: $classPrefix, transformerFactories: $transformerFactories);
     }
 }
diff --git a/tests/AutoMapperTest.php b/tests/AutoMapperTest.php
@@ -769,9 +769,7 @@ public function testWithMixedArray(): void
 
     public function testCustomTransformerFromArrayToObject(): void
     {
-        $this->buildAutoMapper(mapPrivatePropertiesAndMethod: true);
-
-        $this->autoMapper->bindTransformerFactory(new MoneyTransformerFactory());
+        $this->buildAutoMapper(mapPrivatePropertiesAndMethod: true, transformerFactories: [new MoneyTransformerFactory()]);
 
         $data = [
             'id' => 4582,
@@ -790,7 +788,7 @@ public function testCustomTransformerFromArrayToObject(): void
 
     public function testCustomTransformerFromObjectToArray(): void
     {
-        $this->autoMapper->bindTransformerFactory(new MoneyTransformerFactory());
+        $this->buildAutoMapper(transformerFactories: [new MoneyTransformerFactory()]);
 
         $order = new Order();
         $order->id = 4582;
@@ -806,7 +804,7 @@ public function testCustomTransformerFromObjectToArray(): void
 
     public function testCustomTransformerFromObjectToObject(): void
     {
-        $this->autoMapper->bindTransformerFactory(new MoneyTransformerFactory());
+        $this->buildAutoMapper(transformerFactories: [new MoneyTransformerFactory()]);
 
         $order = new Order();
         $order->id = 4582;

diff --git a/tests/Transformer/ChainTransformerFactoryTest.php b/tests/Transformer/ChainTransformerFactoryTest.php
@@ -14,7 +14,6 @@ class ChainTransformerFactoryTest extends TestCase
 {
     public function testGetTransformer(): void
     {
-        $chainTransformerFactory = new ChainTransformerFactory();
         $transformer = new CopyTransformer();
         $mapperMetadata = $this->getMockBuilder(MapperMetadata::class)->disableOriginalConstructor()->getMock();
         $subTransformer = $this
@@ -23,7 +22,8 @@ public function testGetTransformer(): void
         ;
 
         $subTransformer->expects($this->any())->method('getTransformer')->willReturn($transformer);
-        $chainTransformerFactory->addTransformerFactory($subTransformer);
+
+        $chainTransformerFactory = new ChainTransformerFactory([$subTransformer]);
 
         $transformerReturned = $chainTransformerFactory->getTransformer([], [], $mapperMetadata);
 
@@ -32,15 +32,14 @@ public function testGetTransformer(): void
 
     public function testNoTransformer(): void
     {
-        $chainTransformerFactory = new ChainTransformerFactory();
         $mapperMetadata = $this->getMockBuilder(MapperMetadata::class)->disableOriginalConstructor()->getMock();
         $subTransformer = $this
             ->getMockBuilder(TransformerFactoryInterface::class)
             ->getMock()
         ;
 
         $subTransformer->expects($this->any())->method('getTransformer')->willReturn(null);
-        $chainTransformerFactory->addTransformerFactory($subTransformer);
+        $chainTransformerFactory = new ChainTransformerFactory([$subTransformer]);
 
         $transformerReturned = $chainTransformerFactory->getTransformer([], [], $mapperMetadata);
 

diff --git a/tests/Transformer/EvalTransformerTrait.php b/tests/Transformer/EvalTransformerTrait.php
@@ -32,9 +32,10 @@ private function createTransformerFunction(TransformerInterface $transformer, Pr
         $variableScope = new UniqueVariableScope();
         $inputName = $variableScope->getUniqueName('input');
         $inputExpr = new Expr\Variable($inputName);
+        $sourceExpr = new Expr\Variable('source');
 
         // we give $inputExpr as $targetExpr since we don't use it there and this is needed by TransformerInterface
-        [$outputExpr, $stmts] = $transformer->transform($inputExpr, $inputExpr, $propertyMapping, $variableScope);
+        [$outputExpr, $stmts] = $transformer->transform($inputExpr, $inputExpr, $propertyMapping, $variableScope, $sourceExpr);
 
         $stmts[] = new Stmt\Return_($outputExpr);
 

diff --git a/tests/Transformer/MultipleTransformerFactoryTest.php b/tests/Transformer/MultipleTransformerFactoryTest.php
@@ -17,13 +17,10 @@ class MultipleTransformerFactoryTest extends TestCase
 {
     public function testGetTransformer(): void
     {
-        $chainFactory = new ChainTransformerFactory();
+        $chainFactory = new ChainTransformerFactory([new BuiltinTransformerFactory()]);
         $factory = new MultipleTransformerFactory();
         $factory->setChainTransformerFactory($chainFactory);
 
-        $chainFactory->addTransformerFactory($factory);
-        $chainFactory->addTransformerFactory(new BuiltinTransformerFactory());
-
         $mapperMetadata = $this->getMockBuilder(MapperMetadata::class)->disableOriginalConstructor()->getMock();
 
         $transformer = $factory->getTransformer([new Type('string'), new Type('int')], [], $mapperMetadata);
@@ -52,13 +49,10 @@ public function testNoTransformerIfNoSubTransformer(): void
 
     public function testNoTransformer(): void
     {
-        $chainFactory = new ChainTransformerFactory();
+        $chainFactory = new ChainTransformerFactory([new BuiltinTransformerFactory()]);
         $factory = new MultipleTransformerFactory();
         $factory->setChainTransformerFactory($chainFactory);
 
-        $chainFactory->addTransformerFactory($factory);
-        $chainFactory->addTransformerFactory(new BuiltinTransformerFactory());
-
         $mapperMetadata = $this->getMockBuilder(MapperMetadata::class)->disableOriginalConstructor()->getMock();
 
         $transformer = $factory->getTransformer(null, null, $mapperMetadata);

diff --git a/tests/Transformer/NullableTransformerFactoryTest.php b/tests/Transformer/NullableTransformerFactoryTest.php
@@ -24,11 +24,10 @@ protected function setUp(): void
 
     public function testGetTransformer(): void
     {
-        $chainFactory = new ChainTransformerFactory();
-        $factory = new NullableTransformerFactory($chainFactory);
+        $chainFactory = new ChainTransformerFactory([new BuiltinTransformerFactory()]);
+        $factory = new NullableTransformerFactory();
+        $factory->setChainTransformerFactory($chainFactory);
 
-        $chainFactory->addTransformerFactory($factory);
-        $chainFactory->addTransformerFactory(new BuiltinTransformerFactory());
         $mapperMetadata = $this->getMockBuilder(MapperMetadata::class)->disableOriginalConstructor()->getMock();
 
         $transformer = $factory->getTransformer([new Type('string', true)], [new Type('string')], $mapperMetadata);
@@ -58,11 +57,10 @@ public function testGetTransformer(): void
 
     public function testNullTransformerIfSourceTypeNotNullable(): void
     {
-        $chainFactory = new ChainTransformerFactory();
-        $factory = new NullableTransformerFactory($chainFactory);
+        $chainFactory = new ChainTransformerFactory([new BuiltinTransformerFactory()]);
+        $factory = new NullableTransformerFactory();
+        $factory->setChainTransformerFactory($chainFactory);
 
-        $chainFactory->addTransformerFactory($factory);
-        $chainFactory->addTransformerFactory(new BuiltinTransformerFactory());
         $mapperMetadata = $this->getMockBuilder(MapperMetadata::class)->disableOriginalConstructor()->getMock();
 
         $transformer = $factory->getTransformer([new Type('string')], [new Type('string')], $mapperMetadata);
@@ -72,11 +70,10 @@ public function testNullTransformerIfSourceTypeNotNullable(): void
 
     public function testNullTransformerIfMultipleSource(): void
     {
-        $chainFactory = new ChainTransformerFactory();
-        $factory = new NullableTransformerFactory($chainFactory);
+        $chainFactory = new ChainTransformerFactory([new BuiltinTransformerFactory()]);
+        $factory = new NullableTransformerFactory();
+        $factory->setChainTransformerFactory($chainFactory);
 
-        $chainFactory->addTransformerFactory($factory);
-        $chainFactory->addTransformerFactory(new BuiltinTransformerFactory());
         $mapperMetadata = $this->getMockBuilder(MapperMetadata::class)->disableOriginalConstructor()->getMock();
 
         $transformer = $factory->getTransformer([new Type('string', true), new Type('string')], [new Type('string')], $mapperMetadata);

diff --git a/tests/Transformer/UniqueTypeTransformerFactoryTest.php b/tests/Transformer/UniqueTypeTransformerFactoryTest.php
@@ -16,11 +16,9 @@ class UniqueTypeTransformerFactoryTest extends TestCase
 {
     public function testGetTransformer(): void
     {
-        $chainFactory = new ChainTransformerFactory();
-        $factory = new UniqueTypeTransformerFactory($chainFactory);
-
-        $chainFactory->addTransformerFactory($factory);
-        $chainFactory->addTransformerFactory(new BuiltinTransformerFactory());
+        $chainFactory = new ChainTransformerFactory([new BuiltinTransformerFactory()]);
+        $factory = new UniqueTypeTransformerFactory();
+        $factory->setChainTransformerFactory($chainFactory);
 
         $mapperMetadata = $this->getMockBuilder(MapperMetadata::class)->disableOriginalConstructor()->getMock();
 
@@ -32,11 +30,9 @@ public function testGetTransformer(): void
 
     public function testNullTransformer(): void
     {
-        $chainFactory = new ChainTransformerFactory();
-        $factory = new UniqueTypeTransformerFactory($chainFactory);
-
-        $chainFactory->addTransformerFactory($factory);
-        $chainFactory->addTransformerFactory(new BuiltinTransformerFactory());
+        $chainFactory = new ChainTransformerFactory([new BuiltinTransformerFactory()]);
+        $factory = new UniqueTypeTransformerFactory();
+        $factory->setChainTransformerFactory($chainFactory);
 
         $mapperMetadata = $this->getMockBuilder(MapperMetadata::class)->disableOriginalConstructor()->getMock();