Merge pull request #13 from php-etl/feature/qualityflow-improvments

fix php error

Author: JoMessina

src/Builder/ConditionalLoader.php

@@ -52,14 +52,9 @@ public function addAlternative(Node\Expr $condition, AlternativeLoader $lookup):
         return $this;
     }
 
-    /**
-     * @return array<int, Node>
-     */
-    private function compileAlternative(AlternativeLoader $loader): array
+    private function compileAlternative(AlternativeLoader $loader): Node
     {
-        return [
-            $loader->getNode(),
-        ];
+        return $loader->getNode();
     }
 
     public function withBeforeQuery(InitializerQueries $query): self
@@ -117,13 +112,13 @@ class: new Node\Name\FullyQualified(\Kiboko\Component\Flow\SQL\ConditionalLoader
                                     cond: $condition,
                                     subNodes: [
                                         'stmts' => [
-                                            ...$this->compileAlternative($alternative),
+                                            $this->compileAlternative($alternative),
                                         ],
                                         'elseifs' => array_map(
                                             fn (Node\Expr $condition, AlternativeLoader $loader) => new Node\Stmt\ElseIf_(
                                                 cond: $condition,
                                                 stmts: [
-                                                    ...$this->compileAlternative($loader),
+                                                    $this->compileAlternative($loader),
                                                 ],
                                             ),
                                             array_column($alternatives, 0),

src/Builder/ConditionalLookup.php

@@ -5,7 +5,10 @@
 namespace Kiboko\Plugin\SQL\Builder;
 
 use Kiboko\Contract\Configurator\StepBuilderInterface;
+use Kiboko\Contract\Mapping\CompiledMapperInterface;
 use PhpParser\Node;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 final class ConditionalLookup implements StepBuilderInterface
 {
@@ -154,7 +157,7 @@ class: new Node\Stmt\Class_(
                             name: null,
                             subNodes: [
                                 'implements' => [
-                                    new Node\Name\FullyQualified(\Kiboko\Contract\Mapping\CompiledMapperInterface::class),
+                                    new Node\Name\FullyQualified(CompiledMapperInterface::class),
                                 ],
                                 'stmts' => [
                                     new Node\Stmt\ClassMethod(
@@ -171,7 +174,7 @@ class: new Node\Stmt\Class_(
                                                         expr: new Node\Expr\BinaryOp\Coalesce(
                                                             left: new Node\Expr\Variable('logger'),
                                                             right: new Node\Expr\New_(
-                                                                class: new Node\Name\FullyQualified(\Psr\Log\NullLogger::class)
+                                                                class: new Node\Name\FullyQualified(NullLogger::class)
                                                             )
                                                         )
                                                     )
@@ -185,7 +188,7 @@ class: new Node\Name\FullyQualified(\Psr\Log\NullLogger::class)
                                                     default: new Node\Expr\ConstFetch(
                                                         name: new Node\Name(name: 'null'),
                                                     ),
-                                                    type: new Node\Name\FullyQualified(\Psr\Log\LoggerInterface::class)
+                                                    type: new Node\Name\FullyQualified(LoggerInterface::class)
                                                 ),
                                             ],
                                         ],
@@ -231,7 +234,7 @@ class: new Node\Name\FullyQualified(\Psr\Log\NullLogger::class)
                 new Node\Arg(
                     value: $this->compileAfterQueries()
                 ),
-                new Node\Arg(value: $this->logger ?? new Node\Expr\New_(new Node\Name\FullyQualified(\Psr\Log\NullLogger::class))),
+                new Node\Arg(value: $this->logger ?? new Node\Expr\New_(new Node\Name\FullyQualified(NullLogger::class))),
             ],
         );
     }

src/Builder/Connection.php

@@ -10,8 +10,12 @@ final class Connection implements ConnectionBuilderInterface
 {
     private ?bool $persistentConnection = null;
 
-    public function __construct(private readonly Node\Expr $dsn, private ?Node\Expr $username = null, private ?Node\Expr $password = null, private readonly string $generatedNamespace = 'GyroscopsGenerated')
-    {
+    public function __construct(
+        private readonly Node\Expr $dsn,
+        private ?Node\Expr $username = null,
+        private ?Node\Expr $password = null,
+        private readonly string $generatedNamespace = 'GyroscopsGenerated'
+    ) {
     }
 
     public function withUsername(Node\Expr $username): self

src/Builder/Loader.php

@@ -16,8 +16,10 @@ final class Loader implements StepBuilderInterface
     private array $afterQueries = [];
     private array $parameters = [];
 
-    public function __construct(private readonly Node\Expr $query, private null|Node\Expr|ConnectionBuilderInterface $connection = null)
-    {
+    public function __construct(
+        private readonly Node\Expr $query,
+        private null|Node\Expr|ConnectionBuilderInterface $connection = null
+    ) {
     }
 
     public function withLogger(Node\Expr $logger): StepBuilderInterface

src/Builder/Lookup.php

@@ -15,8 +15,10 @@ final class Lookup implements StepBuilderInterface
     /** @var array<int, InitializerQueries> */
     private array $afterQueries = [];
 
-    public function __construct(private readonly AlternativeLookup $alternative, private null|Node\Expr|ConnectionBuilderInterface $connection = null)
-    {
+    public function __construct(
+        private readonly AlternativeLookup $alternative,
+        private null|Node\Expr|ConnectionBuilderInterface $connection = null
+    ) {
     }
 
     public function withLogger(Node\Expr $logger): StepBuilderInterface

src/Builder/SharedConnection.php

@@ -10,8 +10,12 @@ final class SharedConnection implements ConnectionBuilderInterface
 {
     private ?bool $persistentConnection = null;
 
-    public function __construct(private readonly Node\Expr $dsn, private ?Node\Expr $username = null, private ?Node\Expr $password = null, private readonly string $generatedNamespace = 'GyroscopsGenerated')
-    {
+    public function __construct(
+        private readonly Node\Expr $dsn,
+        private ?Node\Expr $username = null,
+        private ?Node\Expr $password = null,
+        private readonly string $generatedNamespace = 'GyroscopsGenerated'
+    ) {
     }
 
     public function withUsername(Node\Expr $username): self