Fixed conditional mapper : elseif conditions were not correctly use

.github/workflows/infection.yaml

@@ -23,8 +23,8 @@ jobs:
 
             -   name: Infection
                 run: |
-                    wget -q https://github.com/infection/infection/releases/download/0.26.18/infection.phar
-                    wget -q https://github.com/infection/infection/releases/download/0.26.18/infection.phar.asc
+                    wget -q https://github.com/infection/infection/releases/download/0.27.0/infection.phar
+                    wget -q https://github.com/infection/infection/releases/download/0.27.0/infection.phar.asc
                     chmod +x infection.phar
                     ./infection.phar
 

composer.json

@@ -24,11 +24,12 @@
     "require-dev": {
         "phpunit/phpunit": "^10.0",
         "phpunit/php-invoker": "*",
-        "php-etl/phpunit-extension": "0.7.*",
+        "php-etl/phpunit-extension": "*",
         "friendsofphp/php-cs-fixer": "^3.38",
         "phpstan/phpstan": "^1.10",
         "rector/rector": "^0.15",
-        "infection/infection": "^0.26"
+        "infection/infection": "^0.26",
+        "php-etl/bucket": "*"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
         backupGlobals="true"
         colors="false"
         processIsolation="false"
@@ -16,17 +16,18 @@
         cacheDirectory=".phpunit.cache"
         backupStaticProperties="false"
         requireCoverageMetadata="false">
-    <testsuites>
-        <testsuite name="Functional tests">
-            <directory>tests/functional/</directory>
-        </testsuite>
-    </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-    </coverage>
-    <php>
-        <ini name="allow_url_include" value="1" />
-    </php>
+  <testsuites>
+    <testsuite name="Functional tests">
+      <directory>tests/functional/</directory>
+    </testsuite>
+  </testsuites>
+  <coverage/>
+  <php>
+    <ini name="allow_url_include" value="1"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>

src/Builder/ConditionalMapper.php

@@ -11,7 +11,7 @@
 
 final class ConditionalMapper implements Builder
 {
     private iterable $alternatives = [];
 
     public function __construct(private readonly ExpressionLanguage $interpreter)
     {
@@ -19,24 +19,22 @@
 
     public function withAlternative(string $condition, Builder $builder): self
     {
         $this->alternatives[] = [$condition, $builder];
 
         return $this;
     }
 
     public function getNode(): Node
     {
         return $this->compileConditions($this->alternatives);
     }
 
     private function compileConditions(array $alternatives): Node
     {
         $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7, null);
 
         /** @var Builder $builder */
         [$condition, $builder] = array_shift($alternatives);
-        /** @var Node\Stmt\Expression $expression */
-        $expression = $parser->parse('<?php '.$this->interpreter->compile($condition, ['input', 'output']).';')[0];
 
         return new Node\Expr\New_(
             new Node\Stmt\Class_(
@@ -45,19 +43,19 @@
                     'implements' => [
                         new Node\Name\FullyQualified(\Kiboko\Contract\Mapping\CompiledMapperInterface::class),
                     ],
                     'stmts' => [
                         new Node\Stmt\Property(
                             flags: Node\Stmt\Class_::MODIFIER_PRIVATE,
                             props: [
                                 new Node\Stmt\PropertyProperty(
                                     name: new Node\Name('mappers'),
                                 ),
                             ],
                             type: new Node\Identifier('iterable')
                         ),
                         new Node\Stmt\ClassMethod(
                             name: '__construct',
                             subNodes: [
                                 'flags' => Node\Stmt\Class_::MODIFIER_PUBLIC,
                                 'stmts' => [
                                     new Node\Stmt\Expression(
@@ -69,20 +67,20 @@
                                             new Node\Expr\Array_(
                                                 items: [
                                                     new Node\Expr\ArrayItem(
                                                         $builder->getNode()
                                                     ),
                                                     ...array_map(
                                                         function ($alternative) {
                                                             [$condition, $builder] = $alternative;
 
                                                             return new Node\Expr\ArrayItem(
                                                                 $builder->getNode()
                                                             );
                                                         },
                                                         $alternatives
                                                     ),
                                                 ],
                                                 attributes: [
                                                     'kind' => Node\Expr\Array_::KIND_SHORT,
                                                 ],
                                             ),
@@ -93,7 +91,7 @@
                         ),
                         new Node\Stmt\ClassMethod(
                             name: '__invoke',
                             subNodes: [
                                 'flags' => Node\Stmt\Class_::MODIFIER_PUBLIC,
                                 'params' => [
                                     new Node\Param(
@@ -108,7 +106,7 @@
                                 ],
                                 'stmts' => [
                                     new Node\Stmt\If_(
-                                        cond: $expression->expr,
+                                        cond: $parser->parse('<?php '.$this->interpreter->compile($condition, ['input', 'output']).';')[0]->expr ?? throw new \UnexpectedValueException('Expected parsing result to be an instance of Node\Expr.'),
                                         subNodes: [
                                             'stmts' => [
                                                 new Node\Stmt\Return_(
@@ -131,13 +129,13 @@
                                                     ),
                                                 ),
                                             ],
                                             'elseifs' => array_map(
-                                                function ($alternative, $index) use ($expression) {
+                                                function ($alternative, $index) use ($parser) {
                                                     [$condition, $repository] = $alternative;
 
                                                     return new Node\Stmt\ElseIf_(
-                                                        cond: $expression->expr,
+                                                        cond: $parser->parse('<?php '.$this->interpreter->compile($condition, ['input', 'output']).';')[0]->expr ?? throw new \UnexpectedValueException('Expected parsing result to be an instance of Node\Expr.'),
                                                         stmts: [
                                                             new Node\Stmt\Return_(
                                                                 new Node\Expr\FuncCall(
                                                                     new Node\Expr\ArrayDimFetch(

src/Builder/Transformer.php

@@ -121,7 +121,7 @@
                                         )
                                     ),
                                 ],
-                                'returnType' => new Node\Name\FullyQualified(\Generator::class),
+                                'returnType' => new Node\Name\FullyQualified('Generator'),
                             ],
                         ),
                     ],
@@ -129,7 +129,7 @@
             ),
             args: [
                 new Node\Arg(
                     $this->mapper instanceof Builder ? $this->mapper->getNode() : $this->mapper,
                 ),
             ],
         );

src/Factory/ArrayMapper.php

@@ -36,7 +36,7 @@ public function normalize(array $config): array
     {
         try {
             return $this->processor->processConfiguration($this->configuration, $config);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
         }
     }
@@ -73,7 +73,7 @@ public function compile(array $config): Repository\TransformerMapper
 
         try {
             return new Repository\TransformerMapper($builder);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);
         }
     }

src/Factory/ConditionalMapper.php

@@ -39,7 +39,7 @@ public function normalize(array $config): array
     {
         try {
             return $this->processor->processConfiguration($this->configuration, $config);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
         }
     }
@@ -86,7 +86,7 @@ public function compile(array $config): Repository\TransformerMapper
                             $alternative['condition'],
                             $mapperBuilder
                         );
-                    } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+                    } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
                         throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);
                     }
                 } elseif (\array_key_exists('object', $alternative)) {
@@ -113,13 +113,13 @@ className: $alternative['object']['class'],
                             $alternative['condition'],
                             $mapperBuilder
                         );
-                    } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+                    } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
                         throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);
                     }
                 } else {
                     throw new InvalidConfigurationException('Could not determine if the factory should build an array or an object transformer.');
                 }
-            } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+            } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
                 throw new InvalidConfigurationException($exception->getMessage(), 0, $exception);
             }
         }
@@ -128,7 +128,7 @@ className: $alternative['object']['class'],
             return new Repository\TransformerMapper(
                 new FastMap\Builder\Transformer($builder),
             );
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);
         }
     }

src/Factory/ObjectMapper.php

@@ -35,7 +35,7 @@ public function normalize(array $config): array
     {
         try {
             return $this->processor->processConfiguration($this->configuration, $config);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
         }
     }
@@ -67,7 +67,7 @@ className: $config['class'],
 
         try {
             return new Repository\TransformerMapper($builder);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);
         }
     }

src/Factory/Repository/RepositoryTrait.php

@@ -15,7 +15,7 @@ trait RepositoryTrait
     /** @var string[] */
     private array $packages;
 
-    public function addFiles(FileInterface|DirectoryInterface ...$files): Configurator\RepositoryInterface
+    public function addFiles(DirectoryInterface|FileInterface ...$files): Configurator\RepositoryInterface
     {
         array_push($this->files, ...$files);
 

src/Service.php

@@ -14,7 +14,7 @@
 #[Configurator\Pipeline(
     name: 'fastmap',
     dependencies: [
-        'php-etl/mapping-contracts:0.4.*'
+        'php-etl/mapping-contracts:0.4.*',
     ],
     steps: [
         new Configurator\Pipeline\StepTransformer(null),
@@ -50,7 +50,7 @@ public function normalize(array $config): array
     {
         try {
             return $this->processor->processConfiguration($this->configuration, $config);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new InvalidConfigurationException($exception->getMessage(), 0, $exception);
         }
     }
@@ -61,7 +61,7 @@ public function validate(array $config): bool
             $this->processor->processConfiguration($this->configuration, $config);
 
             return true;
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException) {
             return false;
         }
     }
@@ -99,7 +99,7 @@ public function compile(array $config): Factory\Repository\TransformerMapper
                 return $objectFactory->compile($config['object']);
             }
             throw new InvalidConfigurationException('Could not determine if the factory should build an array or an object transformer.');
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new InvalidConfigurationException($exception->getMessage(), 0, $exception);
         }
     }