fix phpstan and tests

Author: JoMessina

composer.lock

@@ -17,15 +17,6 @@
 use Symfony\Component\PropertyAccess\PropertyPath;
 use Symfony\Component\PropertyAccess\PropertyPathInterface;
 
-/**
- * @internal
- */
-#[\PHPUnit\Framework\Attributes\CoversNothing]
-/**
- * @internal
- *
- * @coversNothing
- */
 final class ObjectMapperTest extends TestCase
 {
     public static function mappingDataProvider()
@@ -64,10 +55,9 @@ public static function mappingDataProvider()
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('mappingDataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function dynamicResults(
-        mixed $expected,
-        mixed $input,
+    public function testDynamicResults(
+        $expected,
+        $input,
         ExpressionLanguage $interpreter,
         PropertyPathInterface $outputField,
         Expression ...$expression
@@ -84,10 +74,9 @@ public function dynamicResults(
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('mappingDataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function compilationResultsWithSpaghettiStrategy(
-        mixed $expected,
-        mixed $input,
+    public function testCompilationResultsWithSpaghettiStrategy(
+        $expected,
+        $input,
         ExpressionLanguage $interpreter,
         PropertyPathInterface $outputField,
         Expression ...$expression

functional/Mapping/Composite/ObjectMapperTest.php

@@ -12,15 +12,6 @@
 use Symfony\Component\PropertyAccess\PropertyPath;
 use Symfony\Component\PropertyAccess\PropertyPathInterface;
 
-/**
- * @internal
- */
-#[\PHPUnit\Framework\Attributes\CoversNothing]
-/**
- * @internal
- *
- * @coversNothing
- */
 final class ConcatCopyValuesMapperTest extends TestCase
 {
     public static function mappingDataProvider()
@@ -108,10 +99,9 @@ public static function mappingDataProvider()
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('mappingDataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function dynamicResults(
-        mixed $expected,
-        mixed $input,
+    public function testDynamicResults(
+        $expected,
+        $input,
         PropertyPathInterface $outputField,
         string $glue,
         PropertyPathInterface ...$inputFields
@@ -123,10 +113,9 @@ public function dynamicResults(
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('mappingDataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function compilationResultsWithSpaghettiStrategy(
-        mixed $expected,
-        mixed $input,
+    public function testCompilationResultsWithSpaghettiStrategy(
+        $expected,
+        $input,
         PropertyPathInterface $outputField,
         string $glue,
         PropertyPathInterface ...$inputFields

functional/Mapping/Field/ConcatCopyValuesMapperTest.php

@@ -12,15 +12,6 @@
 use Symfony\Component\PropertyAccess\PropertyPath;
 use Symfony\Component\PropertyAccess\PropertyPathInterface;
 
-/**
- * @internal
- */
-#[\PHPUnit\Framework\Attributes\CoversNothing]
-/**
- * @internal
- *
- * @coversNothing
- */
 final class ConstantValueMapperTest extends TestCase
 {
     public static function mappingDataProvider()
@@ -100,10 +91,9 @@ public static function mappingDataProvider()
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('mappingDataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function dynamicResults(
-        mixed $expected,
-        mixed $input,
+    public function testDynamicResults(
+        $expected,
+        $input,
         PropertyPathInterface $outputField,
         string $constantValue
     ): void {
@@ -114,10 +104,9 @@ public function dynamicResults(
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('mappingDataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function compilationResultsWithSpaghettiStrategy(
-        mixed $expected,
-        mixed $input,
+    public function testCompilationResultsWithSpaghettiStrategy(
+        $expected,
+        $input,
         PropertyPathInterface $outputField,
         string $constantValue
     ): void {

functional/Mapping/Field/ConstantValueMapperTest.php

@@ -12,15 +12,6 @@
 use Symfony\Component\PropertyAccess\PropertyPath;
 use Symfony\Component\PropertyAccess\PropertyPathInterface;
 
-/**
- * @internal
- */
-#[\PHPUnit\Framework\Attributes\CoversNothing]
-/**
- * @internal
- *
- * @coversNothing
- */
 final class CopyValueMapperTest extends TestCase
 {
     public static function mappingDataProvider()
@@ -100,10 +91,9 @@ public static function mappingDataProvider()
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('mappingDataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function dynamicResults(
-        mixed $expected,
-        mixed $input,
+    public function testDynamicResults(
+        $expected,
+        $input,
         PropertyPathInterface $outputField,
         PropertyPathInterface $inputField
     ): void {
@@ -114,10 +104,9 @@ public function dynamicResults(
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('mappingDataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function compilationResultsWithSpaghettiStrategy(
-        mixed $expected,
-        mixed $input,
+    public function testCompilationResultsWithSpaghettiStrategy(
+        $expected,
+        $input,
         PropertyPathInterface $outputField,
         PropertyPathInterface $inputField
     ): void {

functional/Mapping/Field/CopyValueMapperTest.php

@@ -14,15 +14,6 @@
 use Symfony\Component\PropertyAccess\PropertyPath;
 use Symfony\Component\PropertyAccess\PropertyPathInterface;
 
-/**
- * @internal
- */
-#[\PHPUnit\Framework\Attributes\CoversNothing]
-/**
- * @internal
- *
- * @coversNothing
- */
 final class ExpressionLanguageValueMapperTest extends TestCase
 {
     public static function mappingDataProvider()
@@ -140,10 +131,9 @@ public static function mappingDataProvider()
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('mappingDataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function dynamicResults(
-        mixed $expected,
-        mixed $input,
+    public function testDynamicResults(
+        $expected,
+        $input,
         PropertyPathInterface $outputField,
         Expression $expression,
         ExpressionLanguage $interpreter
@@ -155,10 +145,9 @@ public function dynamicResults(
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('mappingDataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function compilationResultsWithSpaghettiStrategy(
-        mixed $expected,
-        mixed $input,
+    public function testCompilationResultsWithSpaghettiStrategy(
+        $expected,
+        $input,
         PropertyPathInterface $outputField,
         Expression $expression,
         ExpressionLanguage $interpreter

functional/Mapping/Field/ExpressionLanguageValueMapperTest.php

@@ -30,15 +30,6 @@
 use PhpParser\ParserFactory;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- */
-#[\PHPUnit\Framework\Attributes\CoversNothing]
-/**
- * @internal
- *
- * @coversNothing
- */
 final class MappingTest extends TestCase
 {
     public static function dataProvider()
@@ -196,8 +187,7 @@ public static function dataProvider()
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
-    #[\PHPUnit\Framework\Attributes\Test]
-    public function mapping(ClassTypeMetadata $expected): void
+    public function testMapping(ClassTypeMetadata $expected)
     {
         $typeGuesser = new CompositeTypeGuesser(
             new NativeTypeGuesser(),

functional/MappingTest.php

@@ -29,8 +29,8 @@ public function getNode(): Node\Expr
         ;
 
         /** @var Node\Expr $inputNodes */
-        $inputNodes = $inputNodes[0];
+        $inputNode = $inputNodes[0];
 
-        return $inputNodes[0]->expr;
+        return $inputNode->expr;
     }
 }

src/Compiler/Builder/ExpressionLanguageToPhpParserBuilder.php

@@ -64,7 +64,7 @@ public function compile(Node\Expr $outputNode): array
                             ),
                         ),
                     ],
-                    array_merge(
+                    (array) array_merge(
                         ...$this->compileMappers(new Node\Expr\Variable('output'))
                     ),
                     [

src/Mapping/Composite/ArrayMapper.php

@@ -23,7 +23,7 @@ public function __construct(
         private PropertyPathInterface $outputPath,
         private readonly ExpressionLanguage $interpreter,
         private readonly Expression $inputExpression,
-        private readonly Mapping\ObjectMapperInterface $child
+        private readonly Mapping\CompilableMapperInterface $child
     ) {
         $this->accessor = PropertyAccess::createPropertyAccessor();
     }