Fixed the connection options config + updated tests + updated dependencies from php-etl

sebprt · sebprt · commit e2a6cdbd30e1 · 2022-05-13T12:23:30.000+02:00
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "nikic/php-parser": "^4.10",
         "symfony/config": "^5.2",
         "symfony/expression-language": "^5.2",
-        "php-etl/configurator-contracts": "^0.4.0",
+        "php-etl/configurator-contracts": "0.4.x-dev",
         "php-etl/satellite-toolbox": "^0.2.0",
         "php-etl/fast-map-plugin": "^0.6.0"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -3,6 +3,7 @@
 namespace Kiboko\Plugin\SQL;
 
 use Kiboko\Contract\Configurator\PluginConfigurationInterface;
+use Kiboko\Plugin\SQL;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use function Kiboko\Component\SatelliteToolbox\Configuration\asExpression;
 use function Kiboko\Component\SatelliteToolbox\Configuration\isExpression;
@@ -58,19 +59,7 @@ public function getConfigTreeBuilder()
                                 ->then(asExpression())
                             ->end()
                         ->end()
-                        ->arrayNode('options')
-                            ->arrayPrototype()
-                                ->children()
-                                    ->booleanNode('persistent')
-                                        ->defaultFalse()
-                                        ->validate()
-                                            ->ifTrue(isExpression())
-                                            ->then(asExpression())
-                                        ->end()
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
+                        ->append((new SQL\Configuration\Connection\Options())->getConfigTreeBuilder()->getRootNode())
                     ->end()
                 ->end()
                 ->arrayNode('before')
diff --git a/src/Configuration/Connection/Options.php b/src/Configuration/Connection/Options.php
@@ -0,0 +1,67 @@
+<?php declare(strict_types=1);
+
+namespace Kiboko\Plugin\SQL\Configuration\Connection;
+
+use Kiboko\Plugin\FastMap;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+use function Kiboko\Component\SatelliteToolbox\Configuration\asExpression;
+use function Kiboko\Component\SatelliteToolbox\Configuration\isExpression;
+
+final class Options implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder()
+    {
+        $builder = new TreeBuilder('options');
+
+        /** @phpstan-ignore-next-line */
+        $builder->getRootNode()
+            ->validate()
+                ->ifTrue(function (array $data) {
+                    return count($data) <= 0;
+                })
+                ->thenUnset()
+            ->end()
+            ->children()
+                ->booleanNode('persistent')
+                    ->validate()
+                        ->ifTrue(isExpression())
+                        ->then(asExpression())
+                    ->end()
+                ->end()
+            ->end()
+        ;
+
+        return $builder;
+    }
+
+    private function getConditionalTreeBuilder(): TreeBuilder
+    {
+        $builder = new TreeBuilder('conditional');
+
+        /** @phpstan-ignore-next-line */
+        $builder->getRootNode()
+            ->cannotBeEmpty()
+            ->requiresAtLeastOneElement()
+            ->validate()
+                ->ifTrue(fn ($data) => count($data) <= 0)
+                ->thenUnset()
+            ->end()
+            ->arrayPrototype()
+                ->children()
+                    ->variableNode('condition')
+                        ->validate()
+                            ->ifTrue(isExpression())
+                            ->then(asExpression())
+                        ->end()
+                    ->end()
+                    ->append((new Query())->getConfigTreeBuilder()->getRootNode())
+                    ->append((new Parameters())->getConfigTreeBuilder()->getRootNode())
+                    ->append((new FastMap\Configuration('merge'))->getConfigTreeBuilder()->getRootNode())
+                ->end()
+            ->end()
+        ->end();
+
+        return $builder;
+    }
+}
diff --git a/src/Configuration/Parameters.php b/src/Configuration/Parameters.php
@@ -23,13 +23,23 @@ public function getConfigTreeBuilder()
                 })
                 ->thenUnset()
             ->end()
-            ->useAttributeAsKey('key')
-            ->variablePrototype()
-                ->isRequired()
-                ->cannotBeEmpty()
-                ->validate()
-                    ->ifTrue(isExpression())
-                    ->then(asExpression())
+            ->arrayPrototype()
+                ->children()
+                    ->scalarNode('key')
+                        ->isRequired()
+                        ->validate()
+                            ->ifTrue(isExpression())
+                            ->then(asExpression())
+                        ->end()
+                    ->end()
+                    ->scalarNode('value')
+                        ->isRequired()
+                        ->validate()
+                            ->ifTrue(isExpression())
+                            ->then(asExpression())
+                        ->end()
+                    ->end()
+                    ->scalarNode('type')->end()
                 ->end()
             ->end();
 
diff --git a/src/Configuration/Query.php b/src/Configuration/Query.php
@@ -11,8 +11,6 @@ class Query implements ConfigurationInterface
 {
     public function getConfigTreeBuilder()
     {
-        $builder = new TreeBuilder('query', 'scalar');
-
-        return $builder;
+        return new TreeBuilder('query', 'scalar');
     }
 }
diff --git a/src/Factory/Extractor.php b/src/Factory/Extractor.php
@@ -9,7 +9,6 @@
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Config\Definition\Exception as Symfony;
-use function Kiboko\Component\SatelliteToolbox\Configuration\compileValue;
 use function Kiboko\Component\SatelliteToolbox\Configuration\compileValueWhenExpression;
 
 final class Extractor implements FactoryInterface
@@ -54,9 +53,9 @@ public function compile(array $config): SQL\Factory\Repository\Extractor
             compileValueWhenExpression($this->interpreter, $config['query']),
         );
 
-        if ($config['parameters'] != null) {
-            foreach ($config["parameters"] as $key => $value) {
-                $extractor->addParameter($key, compileValue($this->interpreter, $value));
+        if ($config['parameters'] !== null) {
+            foreach ($config["parameters"] as $key => $parameter) {
+                $extractor->addParameter($key, compileValueWhenExpression($this->interpreter, $parameter));
             }
         }
 
diff --git a/src/Factory/Loader.php b/src/Factory/Loader.php
@@ -55,9 +55,9 @@ public function compile(array $config): SQL\Factory\Repository\Loader
                 compileValueWhenExpression($this->interpreter, $config["query"]),
             );
 
-            if ($config['parameters'] != null) {
-                foreach ($config["parameters"] as $parameter) {
-                    $loader->addParameter($parameter['key'], compileValue($this->interpreter, $parameter['value']));
+            if ($config['parameters'] !== null) {
+                foreach ($config["parameters"] as $key => $parameter) {
+                    $loader->addParameter($key, compileValue($this->interpreter, $parameter));
                 }
             }
         } else {
@@ -69,8 +69,8 @@ public function compile(array $config): SQL\Factory\Repository\Loader
                 );
 
                 if (array_key_exists('parameters', $alternative)) {
-                    foreach ($alternative["parameters"] as $param) {
-                        $alternativeLoaderBuilder->addParam($param["key"], compileValueWhenExpression($this->interpreter, $param["value"]));
+                    foreach ($alternative["parameters"] as $key => $parameter) {
+                        $alternativeLoaderBuilder->addParam($key, compileValueWhenExpression($this->interpreter, $parameter));
                     }
                 }
 
diff --git a/src/Factory/Lookup.php b/src/Factory/Lookup.php
@@ -7,12 +7,10 @@
 use Kiboko\Contract\Configurator\InvalidConfigurationException;
 use Kiboko\Plugin\SQL;
 use Kiboko\Contract\Configurator\FactoryInterface;
-use Kiboko\Contract\Configurator\RepositoryInterface;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Config\Definition\Exception as Symfony;
-use function Kiboko\Component\SatelliteToolbox\Configuration\compileValue;
 use function Kiboko\Component\SatelliteToolbox\Configuration\compileValueWhenExpression;
 
 final class Lookup implements FactoryInterface
@@ -82,8 +80,8 @@ public function compile(array $config): SQL\Factory\Repository\Lookup
             $lookup = new SQL\Builder\Lookup($alternativeBuilder);
 
             if (array_key_exists('parameters', $config)) {
-                foreach ($config["parameters"] as $parameter) {
-                    $alternativeBuilder->addParam($parameter["key"], compileValueWhenExpression($this->interpreter, $parameter["value"]));
+                foreach ($config["parameters"] as $key => $parameter) {
+                    $alternativeBuilder->addParam($key, compileValueWhenExpression($this->interpreter, $parameter));
                 }
             }
 
@@ -97,8 +95,8 @@ public function compile(array $config): SQL\Factory\Repository\Lookup
                 );
 
                 if (array_key_exists('parameters', $alternative)) {
-                    foreach ($alternative["parameters"] as $param) {
-                        $alternativeBuilder->addParam($param["key"], compileValueWhenExpression($this->interpreter, $param["value"]));
+                    foreach ($alternative["parameters"] as $key => $parameter) {
+                        $alternativeBuilder->addParam($key, compileValueWhenExpression($this->interpreter, $parameter));
                     }
                 }
 
diff --git a/tests/functional/Builder/ExtractorTest.php b/tests/functional/Builder/ExtractorTest.php
@@ -3,6 +3,7 @@
 namespace functional\Kiboko\Plugin\SQL;
 
 use Kiboko\Component\PHPUnitExtension\Assert;
+use Kiboko\Contract\Pipeline\PipelineRunnerInterface;
 use Kiboko\Plugin\SQL\Factory\Extractor;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\ExpressionLanguage\Expression;
@@ -50,4 +51,9 @@ public function testNormalizingConfiguration(): void
             ]),
         );
     }
+
+    public function pipelineRunner(): PipelineRunnerInterface
+    {
+        return new PipelineRunner();
+    }
 }
diff --git a/tests/functional/Builder/LoaderTest.php b/tests/functional/Builder/LoaderTest.php
@@ -3,6 +3,7 @@
 namespace functional\Kiboko\Plugin\SQL;
 
 use Kiboko\Component\PHPUnitExtension\Assert;
+use Kiboko\Contract\Pipeline\PipelineRunnerInterface;
 use Kiboko\Plugin\SQL\Factory\Loader;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\ExpressionLanguage\Expression;
@@ -53,4 +54,9 @@ public function testNormalizingConfiguration(): void
             ]),
         );
     }
+
+    public function pipelineRunner(): PipelineRunnerInterface
+    {
+        return new PipelineRunner();
+    }
 }
diff --git a/tests/functional/PipelineRunner.php b/tests/functional/PipelineRunner.php
@@ -0,0 +1,45 @@
+<?php declare(strict_types=1);
+
+namespace functional\Kiboko\Plugin\SQL;
+
+use Kiboko\Contract\Bucket\AcceptanceResultBucketInterface;
+use Kiboko\Contract\Bucket\RejectionResultBucketInterface;
+use Kiboko\Contract\Pipeline\PipelineRunnerInterface;
+use Kiboko\Contract\Pipeline\RejectionInterface;
+use Kiboko\Contract\Pipeline\StateInterface;
+
+final class PipelineRunner implements PipelineRunnerInterface
+{
+    public function run(
+        \Iterator $source,
+        \Generator $async,
+        RejectionInterface $rejection,
+        StateInterface $state,
+    ): \Iterator {
+        $state->initialize();
+        $rejection->initialize();
+
+        $source->rewind();
+        $async->rewind();
+
+        while ($source->valid() && $async->valid()) {
+            $bucket = $async->send($source->current());
+
+            if ($bucket instanceof RejectionResultBucketInterface) {
+                foreach ($bucket->walkRejection() as $line) {
+                    $rejection->reject($line);
+                    $state->reject();
+                }
+            }
+            if ($bucket instanceof AcceptanceResultBucketInterface) {
+                yield from $bucket->walkAcceptance();
+                $state->accept();
+            }
+
+            $source->next();
+        }
+
+        $rejection->teardown();
+        $state->teardown();
+    }
+}
diff --git a/tests/functional/ServiceTest.php b/tests/functional/ServiceTest.php

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ class Query implements ConfigurationInterface`
`11`	`11`	`{`
`12`	`12`	`public function getConfigTreeBuilder()`
`13`	`13`	`{`
`14`		`- $builder = new TreeBuilder('query', 'scalar');`
`15`		`-`
`16`		`- return $builder;`
	`14`	`+ return new TreeBuilder('query', 'scalar');`
`17`	`15`	`}`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@ public function compile(array $config): SQL\Factory\Repository\Loader`
`55`	`55`	`compileValueWhenExpression($this->interpreter, $config["query"]),`
`56`	`56`	`);`
`57`	`57`
`58`		`- if ($config['parameters'] != null) {`
`59`		`- foreach ($config["parameters"] as $parameter) {`
`60`		`- $loader->addParameter($parameter['key'], compileValue($this->interpreter, $parameter['value']));`
	`58`	`+ if ($config['parameters'] !== null) {`
	`59`	`+ foreach ($config["parameters"] as $key => $parameter) {`
	`60`	`+ $loader->addParameter($key, compileValue($this->interpreter, $parameter));`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`} else {`
`@@ -69,8 +69,8 @@ public function compile(array $config): SQL\Factory\Repository\Loader`
`69`	`69`	`);`
`70`	`70`
`71`	`71`	`if (array_key_exists('parameters', $alternative)) {`
`72`		`- foreach ($alternative["parameters"] as $param) {`
`73`		`- $alternativeLoaderBuilder->addParam($param["key"], compileValueWhenExpression($this->interpreter, $param["value"]));`
	`72`	`+ foreach ($alternative["parameters"] as $key => $parameter) {`
	`73`	`+ $alternativeLoaderBuilder->addParam($key, compileValueWhenExpression($this->interpreter, $parameter));`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`