Merge branch 'main' into feature/copy-filesystem

php-etl · Feb 1, 2024 · 91da338 · 91da338
2 parents f8ee82b + 85aaa1f
commit 91da338
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 24 deletions.
diff --git a/bin/satellite b/bin/satellite
@@ -25,6 +25,7 @@ $app->addCommands([
     new \Kiboko\Component\Satellite\Console\Command\ValidateCommand(),
     new \Kiboko\Component\Satellite\Console\Command\PipelineRunCommand(),
     new \Kiboko\Component\Satellite\Console\Command\WorkflowRunCommand(),
+    new \Kiboko\Component\Satellite\Console\Command\RunCommand(),
 ]);
 
 $app->run(new Input\ArgvInput(), new Output\ConsoleOutput());
diff --git a/rector.php b/rector.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\CodingStyle\Rector\String_\UseClassKeywordForClassNameResolutionRector;
 use Rector\Config\RectorConfig;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Rector\Set\ValueObject\LevelSetList;
@@ -22,7 +23,5 @@
         SymfonyLevelSetList::UP_TO_SYMFONY_60,
     ]);
 
-    $rectorConfig->skip([
-        StringClassNameToClassConstantRector::class
-    ]);
+    $rectorConfig->skip([StringClassNameToClassConstantRector::class]);
 };
diff --git a/src/Action/Custom/Service.php b/src/Action/Custom/Service.php
@@ -13,6 +13,9 @@
 
 #[Configurator\Action(
     name: 'custom',
+    dependencies: [
+        'symfony/dependency-injection:^6.0',
+    ],
 )]
 final readonly class Service implements Configurator\ActionInterface
 {

diff --git a/src/Action/SFTP/Builder/Action.php b/src/Action/SFTP/Builder/Action.php
@@ -38,7 +38,7 @@ public function withState(Node\Expr $state): self
     public function getNode(): Node
     {
         return new Node\Expr\New_(
-            class: new Node\Name\FullyQualified('Kiboko\Component\Action\Flow\SFTP\UploadFile'),
+            class: new Node\Name\FullyQualified('Kiboko\\Component\\Action\\Flow\\SFTP\\UploadFile'),
             args: [
                 new Node\Arg(
                     value: $this->host,

diff --git a/src/Feature/Rejection/Builder/Rejection.php b/src/Feature/Rejection/Builder/Rejection.php
@@ -22,7 +22,7 @@ public function withRejection(Node\Expr $rejection): void
     private static function nullRejection(): Node\Expr
     {
         return new Node\Expr\New_(
-            new Node\Name\FullyQualified(\Kiboko\Contract\Pipeline\NullRejection::class)
+            new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\NullRejection')
         );
     }
 

diff --git a/src/Feature/Rejection/Factory/Repository/RabbitMQRepository.php b/src/Feature/Rejection/Factory/Repository/RabbitMQRepository.php
@@ -15,7 +15,7 @@ public function __construct(private readonly Rejection\Builder\RabbitMQBuilder $
     {
         $this->files = [];
         $this->packages = [
-            'php-etl/rabbitmq-flow',
+            'php-etl/rabbitmq-flow:*',
         ];
     }
 

diff --git a/src/Pipeline/Loader.php b/src/Pipeline/Loader.php
@@ -50,7 +50,7 @@ public function __invoke(array $config, Pipeline $pipeline, StepRepositoryInterf
             $rejection = $compiled->getBuilder()->getNode();
         } else {
             $rejection = new Node\Expr\New_(
-                new Node\Name\FullyQualified(\Kiboko\Contract\Pipeline\NullStepRejection::class),
+                new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\NullStepRejection'),
             );
         }
 
@@ -62,7 +62,7 @@ public function __invoke(array $config, Pipeline $pipeline, StepRepositoryInterf
             $state = $compiled->getBuilder()->getNode();
         } else {
             $state = new Node\Expr\New_(
-                new Node\Name\FullyQualified(\Kiboko\Contract\Pipeline\NullStepState::class),
+                new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\NullStepState'),
             );
         }
 

diff --git a/src/Pipeline/Transformer.php b/src/Pipeline/Transformer.php
@@ -50,7 +50,7 @@ public function __invoke(array $config, Pipeline $pipeline, StepRepositoryInterf
             $rejection = $compiled->getBuilder()->getNode();
         } else {
             $rejection = new Node\Expr\New_(
-                new Node\Name\FullyQualified(\Kiboko\Contract\Pipeline\NullStepRejection::class),
+                new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\NullStepRejection'),
             );
         }
 
@@ -62,7 +62,7 @@ public function __invoke(array $config, Pipeline $pipeline, StepRepositoryInterf
             $state = $compiled->getBuilder()->getNode();
         } else {
             $state = new Node\Expr\New_(
-                new Node\Name\FullyQualified(\Kiboko\Contract\Pipeline\NullStepState::class),
+                new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\NullStepState'),
             );
         }
 

diff --git a/src/Plugin/Batching/Builder/Fork.php b/src/Plugin/Batching/Builder/Fork.php
@@ -52,7 +52,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(

diff --git a/src/Plugin/Batching/Builder/Merge.php b/src/Plugin/Batching/Builder/Merge.php
@@ -45,8 +45,8 @@ 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\FlushableInterface::class),
+                        new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\TransformerInterface'),
+                        new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\FlushableInterface'),
                     ],
                     'stmts' => [
                         new Node\Stmt\Property(
@@ -226,7 +226,7 @@ class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\AcceptanceResult
                                         )
                                     ),
                                 ],
-                                'returnType' => new Node\Name\FullyQualified(\Kiboko\Contract\Bucket\ResultBucketInterface::class),
+                                'returnType' => new Node\Name\FullyQualified('Kiboko\\Contract\\Bucket\\ResultBucketInterface'),
                             ],
                         ),
                     ],

diff --git a/src/Plugin/Custom/Service.php b/src/Plugin/Custom/Service.php
@@ -13,11 +13,14 @@
 
 #[Configurator\Pipeline(
     name: 'custom',
+    dependencies: [
+        'symfony/dependency-injection:^6.0',
+    ],
     steps: [
         new Configurator\Pipeline\StepExtractor(),
         new Configurator\Pipeline\StepTransformer(),
         new Configurator\Pipeline\StepLoader(),
-    ],
+    ]
 )] final readonly class Service implements Configurator\PipelinePluginInterface
 {
     private Processor $processor;

diff --git a/src/Plugin/Filtering/Builder/Drop.php b/src/Plugin/Filtering/Builder/Drop.php
@@ -95,7 +95,7 @@ public function getNode(): Node
         return new Node\Expr\New_(
             class: new Node\Stmt\Class_(null, [
                 'implements' => [
-                    new Node\Name\FullyQualified(\Kiboko\Contract\Pipeline\TransformerInterface::class),
+                    new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\TransformerInterface'),
                 ],
                 'stmts' => [
                     (new Builder\Method('transform'))

diff --git a/src/Plugin/Filtering/Builder/Reject.php b/src/Plugin/Filtering/Builder/Reject.php
@@ -95,7 +95,7 @@ public function getNode(): Node
         return new Node\Expr\New_(
             class: new Node\Stmt\Class_(null, [
                 'implements' => [
-                    new Node\Name\FullyQualified(\Kiboko\Contract\Pipeline\TransformerInterface::class),
+                    new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\TransformerInterface'),
                 ],
                 'stmts' => [
                     (new Builder\Method('transform'))

diff --git a/src/Plugin/SFTP/Builder/Extractor.php b/src/Plugin/SFTP/Builder/Extractor.php
@@ -89,7 +89,7 @@ class: new Node\Stmt\Class_(
                 name: null,
                 subNodes: [
                     'implements' => [
-                        new Node\Name\FullyQualified(\Kiboko\Contract\Pipeline\LoaderInterface::class),
+                        new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\LoaderInterface'),
                     ],
                     'stmts' => [
                         new Node\Stmt\ClassMethod(

diff --git a/src/Plugin/SFTP/Builder/Loader.php b/src/Plugin/SFTP/Builder/Loader.php
@@ -89,7 +89,7 @@ class: new Node\Stmt\Class_(
                 name: null,
                 subNodes: [
                     'implements' => [
-                        new Node\Name\FullyQualified(\Kiboko\Contract\Pipeline\LoaderInterface::class),
+                        new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\LoaderInterface'),
                     ],
                     'stmts' => [
                         new Node\Stmt\ClassMethod(

diff --git a/src/Service.php b/src/Service.php
@@ -238,6 +238,10 @@ private function compileWorkflow(array $config): Satellite\Builder\Repository\Wo
             'php-etl/pipeline-contracts:>=0.5.1 <0.6',
             'php-etl/action-contracts:>=0.2.0 <0.3',
             'php-etl/workflow:*',
+            'php-etl/workflow-console-runtime:*',
+            'psr/log:*',
+            'monolog/monolog:*',
+            'symfony/dotenv:^6.0'
         );
 
         $repository->addFiles(
@@ -328,16 +332,13 @@ private function compilePipelineJob(array $config): Satellite\Builder\Repository
         $repository = new Satellite\Builder\Repository\Pipeline($pipeline);
 
         $repository->addPackages(
+            'php-etl/satellite-contracts:>=0.1.1 <0.2',
             'php-etl/pipeline-contracts:>=0.5.1 <0.6',
             'php-etl/pipeline:*',
-            'php-etl/console-state:*',
             'php-etl/pipeline-console-runtime:*',
-            'php-etl/workflow-console-runtime:*',
             'psr/log:*',
             'monolog/monolog:*',
-            'symfony/console:^6.0',
-            'symfony/dotenv:^6.0',
-            'symfony/dependency-injection:^6.0',
+            'symfony/dotenv:^6.0'
         );
 
         if (\array_key_exists('expression_language', $config['pipeline'])