fix(deprec): fix php 8.5 deprecations

joelwurtz · joelwurtz · commit 8433eb44107c · 2025-11-30T10:39:06.000+01:00
diff --git a/phpstan.neon b/phpstan.neon
@@ -9,9 +9,6 @@ parameters:
 	tmpDir: cache
 
 	ignoreErrors:
-		- "#Instantiated class fromIteratorToArray not found#"
-		- "#Instantiated class toArray not found#"
-
 		-
 			message: "#^Method Symfony\\\\Component\\\\Serializer\\\\NameConverter\\\\NameConverterInterface\\:\\:normalize\\(\\) invoked with 2 parameters, 1 required\\.$#"
 			count: 2
diff --git a/src/GeneratedMapper.php b/src/GeneratedMapper.php
@@ -41,14 +41,14 @@ public function getTargetIdentifiers(mixed $value): mixed
         return null;
     }
 
-    public function getSourceHash(mixed $value): ?string
+    public function getSourceHash(mixed $value): string
     {
-        return null;
+        return '';
     }
 
-    public function getTargetHash(mixed $value): ?string
+    public function getTargetHash(mixed $value): string
     {
-        return null;
+        return '';
     }
 
     /** @var array<string, MapperInterface<object, object>|MapperInterface<object, array<mixed>>|MapperInterface<array<mixed>, object>> */
diff --git a/src/Generator/IdentifierHashGenerator.php b/src/Generator/IdentifierHashGenerator.php
@@ -65,7 +65,7 @@ private function getStatements(GeneratorMetadata $metadata, bool $fromSource): a
                 if ($property->source->checkExists) {
                     $statements[] = new Stmt\If_($property->source->accessor->getIsUndefinedExpression($valueVariable), [
                         'stmts' => [
-                            new Stmt\Return_(new Expr\ConstFetch(new Name('null'))),
+                            new Stmt\Return_(new Expr\ConstFetch(new Name("''"))),
                         ],
                     ]);
                 }
@@ -78,7 +78,7 @@ private function getStatements(GeneratorMetadata $metadata, bool $fromSource): a
             } else {
                 $statements[] = new Stmt\If_($property->target->readAccessor->getIsUndefinedExpression($valueVariable, true), [
                     'stmts' => [
-                        new Stmt\Return_(new Expr\ConstFetch(new Name('null'))),
+                        new Stmt\Return_(new Expr\ConstFetch(new Name("''"))),
                     ],
                 ]);
 
@@ -121,7 +121,7 @@ public function getSourceHashMethod(GeneratorMetadata $metadata): ?Stmt\ClassMet
 
         return (new Builder\Method('getSourceHash'))
             ->makePublic()
-            ->setReturnType('?string')
+            ->setReturnType('string')
             ->addParam(new Param(
                 var: new Expr\Variable('value'),
                 type: new Name('mixed'))
@@ -149,7 +149,7 @@ public function getTargetHashMethod(GeneratorMetadata $metadata): ?Stmt\ClassMet
 
         return (new Builder\Method('getTargetHash'))
             ->makePublic()
-            ->setReturnType('?string')
+            ->setReturnType('string')
             ->addParam(new Param(
                 var: new Expr\Variable('value'),
                 type: new Name('mixed'))
diff --git a/src/Transformer/AbstractArrayTransformer.php b/src/Transformer/AbstractArrayTransformer.php
@@ -75,7 +75,7 @@ public function transform(Expr $input, Expr $target, PropertyMetadata $propertyM
                     $loopExistingStatements[] = new Stmt\If_($isDeepPopulateExpr, [
                         'stmts' => [
                             new Stmt\Expression(new Expr\Assign($targetHashVar, $this->itemTransformer->getTargetHashExpression($loopRemoveValueVar))),
-                            new Stmt\If_(new Expr\BinaryOp\NotIdentical(new Expr\ConstFetch(new Name('null')), $targetHashVar), [
+                            new Stmt\If_(new Expr\BinaryOp\NotIdentical(new Expr\ConstFetch(new Name("''")), $targetHashVar), [
                                 'stmts' => [new Stmt\Expression(new Expr\Assign(new Expr\ArrayDimFetch($exisingValuesIndexed, $targetHashVar), $loopRemoveValueVar))],
                             ]),
                         ],
@@ -124,7 +124,7 @@ public function transform(Expr $input, Expr $target, PropertyMetadata $propertyM
                         new Stmt\Foreach_($propertyMapping->target->readAccessor->getExpression($target), $loopExistingValueVar, [
                             'stmts' => [
                                 new Stmt\Expression(new Expr\Assign($hashValueVariable, $this->itemTransformer->getTargetHashExpression($loopExistingValueVar))),
-                                new Stmt\If_(new Expr\BinaryOp\NotIdentical(new Expr\ConstFetch(new Name('null')), $hashValueVariable), [
+                                new Stmt\If_(new Expr\BinaryOp\NotIdentical(new Expr\ConstFetch(new Name("''")), $hashValueVariable), [
                                     'stmts' => [
                                         new Stmt\Expression(new Expr\Assign(new Expr\ArrayDimFetch($exisingValuesIndexed, $hashValueVariable), $loopExistingValueVar)),
                                     ],
diff --git a/src/Transformer/ArrayToDoctrineCollectionTransformer.php b/src/Transformer/ArrayToDoctrineCollectionTransformer.php
@@ -56,7 +56,7 @@ public function transform(Expr $input, Expr $target, PropertyMetadata $propertyM
                     new Stmt\Foreach_($propertyMapping->target->readAccessor->getExpression($target), $loopExistingValueVar, [
                         'stmts' => [
                             new Stmt\Expression(new Expr\Assign($hashValueVariable, $this->itemTransformer->getTargetHashExpression($loopExistingValueVar))),
-                            new Stmt\If_(new Expr\BinaryOp\NotIdentical(new Expr\ConstFetch(new Name('null')), $hashValueVariable), [
+                            new Stmt\If_(new Expr\BinaryOp\NotIdentical(new Expr\ConstFetch(new Name("''")), $hashValueVariable), [
                                 'stmts' => [
                                     new Stmt\Expression(new Expr\Assign(new Expr\ArrayDimFetch($exisingValuesIndexed, $hashValueVariable), $loopExistingValueVar)),
                                 ],
diff --git a/src/Transformer/BuiltinTransformer.php b/src/Transformer/BuiltinTransformer.php
@@ -28,14 +28,14 @@
         TypeIdentifier::BOOL->value => [
             TypeIdentifier::INT->value => Cast\Int_::class,
             TypeIdentifier::STRING->value => Cast\String_::class,
-            TypeIdentifier::FLOAT->value => Cast\Double::class,
+            TypeIdentifier::FLOAT->value => 'toFloat',
             TypeIdentifier::ARRAY->value => 'toArray',
             TypeIdentifier::ITERABLE->value => 'toArray',
         ],
         TypeIdentifier::MIXED->value => [
             TypeIdentifier::INT->value => Cast\Int_::class,
             TypeIdentifier::STRING->value => Cast\String_::class,
-            TypeIdentifier::FLOAT->value => Cast\Double::class,
+            TypeIdentifier::FLOAT->value => 'toFloat',
             TypeIdentifier::ARRAY->value => 'toArray',
             TypeIdentifier::ITERABLE->value => 'toArray',
         ],
@@ -47,7 +47,7 @@
             TypeIdentifier::ITERABLE->value => 'toArray',
         ],
         TypeIdentifier::INT->value => [
-            TypeIdentifier::FLOAT->value => Cast\Double::class,
+            TypeIdentifier::FLOAT->value => 'toFloat',
             TypeIdentifier::STRING->value => Cast\String_::class,
             TypeIdentifier::BOOL->value => Cast\Bool_::class,
             TypeIdentifier::ARRAY->value => 'toArray',
@@ -60,7 +60,7 @@
         TypeIdentifier::STRING->value => [
             TypeIdentifier::ARRAY->value => 'toArray',
             TypeIdentifier::ITERABLE->value => 'toArray',
-            TypeIdentifier::FLOAT->value => Cast\Double::class,
+            TypeIdentifier::FLOAT->value => 'toFloat',
             TypeIdentifier::INT->value => Cast\Int_::class,
             TypeIdentifier::BOOL->value => Cast\Bool_::class,
         ],
@@ -120,6 +120,10 @@ public function transform(Expr $input, Expr $target, PropertyMetadata $propertyM
                     return [$this->$castMethod($input), []];
                 }
 
+                if (!class_exists($castMethod)) {
+                    continue;
+                }
+
                 /*
                  * Use the cast expression find in the cast matrix
                  *
@@ -156,6 +160,11 @@ private function toArray(Expr $input): Expr
         return new Expr\Array_([create_expr_array_item($input)]);
     }
 
+    private function toFloat(Expr $input): Expr
+    {
+        return new Cast\Double($input, ['kind' => Cast\Double::KIND_FLOAT]);
+    }
+
     private function fromIteratorToArray(Expr $input): Expr
     {
         return new Expr\FuncCall(new Name('iterator_to_array'), [
diff --git a/tests/AutoMapperMapToTest.php b/tests/AutoMapperMapToTest.php
@@ -149,7 +149,7 @@ public function testDateTimeFormat(): void
         self::assertArrayHasKey('immutable', $result);
         self::assertSame($immutable->format(\DateTimeInterface::RFC822), $result['immutable']);
         self::assertArrayHasKey('interface', $result);
-        self::assertSame($normal->format(\DateTimeInterface::RFC7231), $result['interface']);
+        self::assertSame($normal->format(\DateTimeInterface::RFC3339_EXTENDED), $result['interface']);
 
         $bar = new MapperDateTimeFormatMapTo($normal, $immutable, $normal);
         $result = $this->autoMapper->map($bar, 'array');
@@ -159,7 +159,7 @@ public function testDateTimeFormat(): void
         self::assertArrayHasKey('immutable', $result);
         self::assertSame($immutable->format(\DateTimeInterface::ATOM), $result['immutable']);
         self::assertArrayHasKey('interface', $result);
-        self::assertSame($normal->format(\DateTimeInterface::RFC7231), $result['interface']);
+        self::assertSame($normal->format(\DateTimeInterface::RFC3339_EXTENDED), $result['interface']);
 
         $baz = new MapperDateTimeFormatMapTo($normal, $immutable, $normal);
         $result = $this->autoMapper->map($baz, 'array', [MapperContext::DATETIME_FORMAT => \DateTimeInterface::RFC822]);
diff --git a/tests/AutoMapperTest.php b/tests/AutoMapperTest.php
@@ -216,7 +216,6 @@ public function testNotReadable(): void
         self::assertInstanceOf(Address::class, $addressMapped);
 
         $property = (new \ReflectionClass($addressMapped))->getProperty('city');
-        $property->setAccessible(true);
 
         $city = $property->getValue($addressMapped);
 
diff --git a/tests/Fixtures/MapTo/DateTimeFormatMapTo.php b/tests/Fixtures/MapTo/DateTimeFormatMapTo.php
@@ -13,7 +13,7 @@ public function __construct(
         public \DateTime $normal,
         #[MapTo('array', dateTimeFormat: \DateTimeInterface::RFC822)]
         public \DateTimeImmutable $immutable,
-        #[MapTo('array', dateTimeFormat: \DateTimeInterface::RFC7231)]
+        #[MapTo('array', dateTimeFormat: \DateTimeInterface::RFC3339_EXTENDED)]
         public \DateTimeInterface $interface,
     ) {
     }
diff --git a/tests/Fixtures/MapTo/MapperDateTimeFormatMapTo.php b/tests/Fixtures/MapTo/MapperDateTimeFormatMapTo.php
@@ -13,7 +13,7 @@ class MapperDateTimeFormatMapTo
     public function __construct(
         public \DateTime $normal,
         public \DateTimeImmutable $immutable,
-        #[MapTo('array', dateTimeFormat: \DateTimeInterface::RFC7231)]
+        #[MapTo('array', dateTimeFormat: \DateTimeInterface::RFC3339_EXTENDED)]
         public \DateTimeInterface $interface,
     ) {
     }
diff --git a/tests/Transformer/NullableTransformerFactoryTest.php b/tests/Transformer/NullableTransformerFactoryTest.php
@@ -21,7 +21,6 @@ class NullableTransformerFactoryTest extends TestCase
     protected function setUp(): void
     {
         $this->isTargetNullableProperty = (new \ReflectionClass(NullableTransformer::class))->getProperty('isTargetNullable');
-        $this->isTargetNullableProperty->setAccessible(true);
     }
 
     public function testGetTransformer(): void

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,6 @@ parameters:`
`9`	`9`	`tmpDir: cache`
`10`	`10`
`11`	`11`	`ignoreErrors:`
`12`		`- - "#Instantiated class fromIteratorToArray not found#"`
`13`		`- - "#Instantiated class toArray not found#"`
`14`		`-`
`15`	`12`	`-`
`16`	`13`	`message: "#^Method Symfony\\\\Component\\\\Serializer\\\\NameConverter\\\\NameConverterInterface\\:\\:normalize\\(\\) invoked with 2 parameters, 1 required\\.$#"`
`17`	`14`	`count: 2`
Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,14 @@ public function getTargetIdentifiers(mixed $value): mixed`
`41`	`41`	`return null;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public function getSourceHash(mixed $value): ?string`
	`44`	`+ public function getSourceHash(mixed $value): string`
`45`	`45`	`{`
`46`		`- return null;`
	`46`	`+ return '';`
`47`	`47`	`}`
`48`	`48`
`49`		`- public function getTargetHash(mixed $value): ?string`
	`49`	`+ public function getTargetHash(mixed $value): string`
`50`	`50`	`{`
`51`		`- return null;`
	`51`	`+ return '';`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/** @var array<string, MapperInterface<object, object>\|MapperInterface<object, array<mixed>>\|MapperInterface<array<mixed>, object>> */`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public function __construct(`
`13`	`13`	`public \DateTime $normal,`
`14`	`14`	`#[MapTo('array', dateTimeFormat: \DateTimeInterface::RFC822)]`
`15`	`15`	`public \DateTimeImmutable $immutable,`
`16`		`- #[MapTo('array', dateTimeFormat: \DateTimeInterface::RFC7231)]`
	`16`	`+ #[MapTo('array', dateTimeFormat: \DateTimeInterface::RFC3339_EXTENDED)]`
`17`	`17`	`public \DateTimeInterface $interface,`
`18`	`18`	`) {`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class MapperDateTimeFormatMapTo`
`13`	`13`	`public function __construct(`
`14`	`14`	`public \DateTime $normal,`
`15`	`15`	`public \DateTimeImmutable $immutable,`
`16`		`- #[MapTo('array', dateTimeFormat: \DateTimeInterface::RFC7231)]`
	`16`	`+ #[MapTo('array', dateTimeFormat: \DateTimeInterface::RFC3339_EXTENDED)]`
`17`	`17`	`public \DateTimeInterface $interface,`
`18`	`18`	`) {`
`19`	`19`	`}`