add "append" setting, to merge the output of the mapper into the previous step's output,

update phpstan

Author: clemzarch

.github/workflows/phpstan-5.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 5
 on: push
 jobs:
-  phpstan:
+  phpstan5:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/phpstan-6.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 6
 on: push
 jobs:
-  phpstan:
+  phpstan6:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/phpstan-7.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 7
 on: push
 jobs:
-  phpstan:
+  phpstan7:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/phpstan-8.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 8
 on: push
 jobs:
-  phpstan:
+  phpstan8:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

src/Builder/Transformer.php

@@ -97,6 +97,9 @@ class: new Node\Name\FullyQualified(
                                                             new Node\Arg(
                                                                 value: new Node\Expr\Variable('line')
                                                             ),
+                                                            new Node\Arg(
+                                                                value: new Node\Expr\Variable('line')
+                                                            ),
                                                         ]
                                                     ),
                                                 ),

src/Configuration.php

@@ -33,6 +33,7 @@ public function getConfigTreeBuilder(): TreeBuilder
             ->end()
             ->children()
                 ->scalarNode('class')->end()
+                ->booleanNode('append')->end()
                 ->scalarNode('expression')->end()
                 ->arrayNode('expression_language')
                     ->scalarPrototype()->end()
@@ -47,6 +48,9 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->ifTrue(fn ($value) => !\is_array($value))
                 ->thenInvalid('Your configuration should be an array.')
             ->end()
+            ->validate()
+                ->always(mutuallyExclusiveFields('append', 'list', 'collection', 'object'))
+            ->end()
             ->validate()
                 ->always(mutuallyExclusiveFields('copy', 'constant', 'map', 'object', 'list', 'collection'))
             ->end()

src/Factory/ArrayMapper.php

@@ -4,6 +4,7 @@
 
 namespace Kiboko\Plugin\FastMap\Factory;
 
+use Kiboko\Component\FastMapConfig\ArrayAppendBuilder;
 use Kiboko\Component\FastMapConfig\ArrayBuilder;
 use Kiboko\Contract\Configurator;
 use Kiboko\Plugin\FastMap;
@@ -17,7 +18,7 @@
     private Processor $processor;
     private ConfigurationInterface $configuration;
 
-    public function __construct(private ?ExpressionLanguage $interpreter, private array $additionalExpressionVariables = [])
+    public function __construct(private ?ExpressionLanguage $interpreter, private array $additionalExpressionVariables = [], private bool $append = false)
     {
         $this->processor = new Processor();
         $this->configuration = new FastMap\Configuration\MapMapper();
@@ -54,9 +55,15 @@ public function validate(array $config): bool
 
     public function compile(array $config): Repository\TransformerMapper
     {
-        $mapper = new ArrayBuilder(
-            interpreter: $this->interpreter,
-        );
+        if ($this->append) {
+            $mapper = new ArrayAppendBuilder(
+                interpreter: $this->interpreter,
+            );
+        } else {
+            $mapper = new ArrayBuilder(
+                interpreter: $this->interpreter,
+            );
+        }
 
         $builder = new FastMap\Builder\Transformer(
             new FastMap\Builder\ArrayMapper($mapper)

src/Service.php

@@ -91,7 +91,7 @@ public function compile(array $config): Factory\Repository\TransformerMapper
                 return $conditionalFactory->compile($config['conditional']);
             }
             if (\array_key_exists('map', $config)) {
-                $arrayFactory = new Factory\ArrayMapper($interpreter, $this->additionalExpressionVariables);
+                $arrayFactory = new Factory\ArrayMapper($interpreter, $this->additionalExpressionVariables, isset($config['append']) && $config['append']);
 
                 return $arrayFactory->compile($config['map']);
             }