Fixed conditional mapper : elseif conditions were not correctly use

sebprt · sebprt · commit 0a93b8ebc790 · 2024-01-11T09:34:13.000+01:00
diff --git a/src/Builder/ArrayMapper.php b/src/Builder/ArrayMapper.php
@@ -25,7 +25,7 @@ public function getNode(): Node
                 name: null,
                 subNodes: [
                     'implements' => [
-                        new Node\Name\FullyQualified(\Kiboko\Contract\Mapping\CompiledMapperInterface::class),
+                        new Node\Name\FullyQualified('Kiboko\\Contract\\Mapping\\CompiledMapperInterface'),
                     ],
                     'stmts' => [
                         new Node\Stmt\ClassMethod(
diff --git a/src/Builder/ConditionalMapper.php b/src/Builder/ConditionalMapper.php
@@ -35,15 +35,13 @@ private function compileConditions(array $alternatives): Node
 
         /** @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_(
                 name: null,
                 subNodes: [
                     'implements' => [
-                        new Node\Name\FullyQualified(\Kiboko\Contract\Mapping\CompiledMapperInterface::class),
+                        new Node\Name\FullyQualified('Kiboko\\Contract\\Mapping\\CompiledMapperInterface'),
                     ],
                     'stmts' => [
                         new Node\Stmt\Property(
@@ -108,7 +106,7 @@ function ($alternative) {
                                 ],
                                 '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_(
@@ -132,11 +130,11 @@ function ($alternative) {
                                                 ),
                                             ],
                                             '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(
diff --git a/src/Builder/ObjectMapper.php b/src/Builder/ObjectMapper.php
@@ -25,7 +25,7 @@ public function getNode(): Node
                 name: null,
                 subNodes: [
                     'implements' => [
-                        new Node\Name\FullyQualified(\Kiboko\Contract\Mapping\CompiledMapperInterface::class),
+                        new Node\Name\FullyQualified('Kiboko\\Contract\\Mapping\\CompiledMapperInterface'),
                     ],
                     'stmts' => [
                         new Node\Stmt\ClassMethod(
diff --git a/src/Builder/Transformer.php b/src/Builder/Transformer.php
@@ -37,7 +37,7 @@ class: new Node\Stmt\Class_(
                 name: null,
                 subNodes: [
                     'implements' => [
-                        new Node\Name\FullyQualified(\Kiboko\Contract\Pipeline\TransformerInterface::class),
+                        new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\TransformerInterface'),
                     ],
                     'stmts' => [
                         new Node\Stmt\ClassMethod(
@@ -74,7 +74,7 @@ class: new Node\Stmt\Class_(
                                             expr: new Node\Expr\Yield_(
                                                 new Node\Expr\New_(
                                                     class: new Node\Name\FullyQualified(
-                                                        \Kiboko\Component\Bucket\AcceptanceResultBucket::class
+                                                        'Kiboko\\Component\\Bucket\\AcceptanceResultBucket'
                                                     ),
                                                     args: [
                                                         new Node\Arg(
@@ -110,7 +110,7 @@ class: new Node\Name\FullyQualified(
                                         new Node\Expr\Yield_(
                                             new Node\Expr\New_(
                                                 class: new Node\Name\FullyQualified(
-                                                    \Kiboko\Component\Bucket\AcceptanceResultBucket::class,
+                                                    'Kiboko\\Component\\Bucket\\AcceptanceResultBucket',
                                                 ),
                                                 args: [
                                                     new Node\Arg(
@@ -121,7 +121,7 @@ class: new Node\Name\FullyQualified(
                                         )
                                     ),
                                 ],
-                                'returnType' => new Node\Name\FullyQualified(\Generator::class),
+                                'returnType' => new Node\Name\FullyQualified('Generator'),
                             ],
                         ),
                     ],
diff --git a/src/Factory/ArrayMapper.php b/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);
         }
     }
diff --git a/src/Factory/ConditionalMapper.php b/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);
         }
     }
diff --git a/src/Factory/ObjectMapper.php b/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);
         }
     }
diff --git a/src/Factory/Repository/RepositoryTrait.php b/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);
 
diff --git a/src/Service.php b/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);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function normalize(array $config): array`
`36`	`36`	`{`
`37`	`37`	`try {`
`38`	`38`	`return $this->processor->processConfiguration($this->configuration, $config);`
`39`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`39`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`40`	`40`	`throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);`
`41`	`41`	`}`
`42`	`42`	`}`
`@@ -73,7 +73,7 @@ public function compile(array $config): Repository\TransformerMapper`
`73`	`73`
`74`	`74`	`try {`
`75`	`75`	`return new Repository\TransformerMapper($builder);`
`76`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`76`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`77`	`77`	`throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function normalize(array $config): array`
`39`	`39`	`{`
`40`	`40`	`try {`
`41`	`41`	`return $this->processor->processConfiguration($this->configuration, $config);`
`42`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`42`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`43`	`43`	`throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);`
`44`	`44`	`}`
`45`	`45`	`}`
`@@ -86,7 +86,7 @@ public function compile(array $config): Repository\TransformerMapper`
`86`	`86`	`$alternative['condition'],`
`87`	`87`	`$mapperBuilder`
`88`	`88`	`);`
`89`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`89`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`90`	`90`	`throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);`
`91`	`91`	`}`
`92`	`92`	`} elseif (\array_key_exists('object', $alternative)) {`
`@@ -113,13 +113,13 @@ className: $alternative['object']['class'],`
`113`	`113`	`$alternative['condition'],`
`114`	`114`	`$mapperBuilder`
`115`	`115`	`);`
`116`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`116`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`117`	`117`	`throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);`
`118`	`118`	`}`
`119`	`119`	`} else {`
`120`	`120`	`throw new InvalidConfigurationException('Could not determine if the factory should build an array or an object transformer.');`
`121`	`121`	`}`
`122`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`122`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`123`	`123`	`throw new InvalidConfigurationException($exception->getMessage(), 0, $exception);`
`124`	`124`	`}`
`125`	`125`	`}`
`@@ -128,7 +128,7 @@ className: $alternative['object']['class'],`
`128`	`128`	`return new Repository\TransformerMapper(`
`129`	`129`	`new FastMap\Builder\Transformer($builder),`
`130`	`130`	`);`
`131`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`131`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`132`	`132`	`throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);`
`133`	`133`	`}`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function normalize(array $config): array`
`35`	`35`	`{`
`36`	`36`	`try {`
`37`	`37`	`return $this->processor->processConfiguration($this->configuration, $config);`
`38`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`38`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`39`	`39`	`throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);`
`40`	`40`	`}`
`41`	`41`	`}`
`@@ -67,7 +67,7 @@ className: $config['class'],`
`67`	`67`
`68`	`68`	`try {`
`69`	`69`	`return new Repository\TransformerMapper($builder);`
`70`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`70`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`71`	`71`	`throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ trait RepositoryTrait`
`15`	`15`	`/** @var string[] */`
`16`	`16`	`private array $packages;`
`17`	`17`
`18`		`- public function addFiles(FileInterface\|DirectoryInterface ...$files): Configurator\RepositoryInterface`
	`18`	`+ public function addFiles(DirectoryInterface\|FileInterface ...$files): Configurator\RepositoryInterface`
`19`	`19`	`{`
`20`	`20`	`array_push($this->files, ...$files);`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#[Configurator\Pipeline(`
`15`	`15`	`name: 'fastmap',`
`16`	`16`	`dependencies: [`
`17`		`- 'php-etl/mapping-contracts:0.4.*'`
	`17`	`+ 'php-etl/mapping-contracts:0.4.*',`
`18`	`18`	`],`
`19`	`19`	`steps: [`
`20`	`20`	`new Configurator\Pipeline\StepTransformer(null),`
`@@ -50,7 +50,7 @@ public function normalize(array $config): array`
`50`	`50`	`{`
`51`	`51`	`try {`
`52`	`52`	`return $this->processor->processConfiguration($this->configuration, $config);`
`53`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`53`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`54`	`54`	`throw new InvalidConfigurationException($exception->getMessage(), 0, $exception);`
`55`	`55`	`}`
`56`	`56`	`}`
`@@ -61,7 +61,7 @@ public function validate(array $config): bool`
`61`	`61`	`$this->processor->processConfiguration($this->configuration, $config);`
`62`	`62`
`63`	`63`	`return true;`
`64`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException) {`
	`64`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException) {`
`65`	`65`	`return false;`
`66`	`66`	`}`
`67`	`67`	`}`
`@@ -99,7 +99,7 @@ public function compile(array $config): Factory\Repository\TransformerMapper`
`99`	`99`	`return $objectFactory->compile($config['object']);`
`100`	`100`	`}`
`101`	`101`	`throw new InvalidConfigurationException('Could not determine if the factory should build an array or an object transformer.');`
`102`		`- } catch (Symfony\InvalidTypeException\|Symfony\InvalidConfigurationException $exception) {`
	`102`	`+ } catch (Symfony\InvalidConfigurationException\|Symfony\InvalidTypeException $exception) {`
`103`	`103`	`throw new InvalidConfigurationException($exception->getMessage(), 0, $exception);`
`104`	`104`	`}`
`105`	`105`	`}`