fix file expression language

src/Action/Action.php

@@ -19,9 +19,9 @@
     {
     }
 
     public function __invoke(array $config, ActionBuilder $action, RepositoryInterface $repository): void
     {
         if (!\array_key_exists($this->plugin, $config)) {
             return;
         }
 
@@ -33,7 +33,7 @@
             $logger = $compiled->getBuilder()->getNode();
         } else {
             $logger = new Node\Expr\New_(
-                new Node\Name\FullyQualified('Psr\\Log\\NullLogger'),
+                new Node\Name\FullyQualified('Psr\Log\NullLogger'),
             );
         }
 
@@ -45,7 +45,7 @@
             $state = $compiled->getBuilder()->getNode();
         } else {
             $state = new Node\Expr\New_(
-                new Node\Name\FullyQualified('Kiboko\\Contract\\Action\\NullState'),
+                new Node\Name\FullyQualified('Kiboko\Contract\Action\NullState'),
             );
         }
 
@@ -55,8 +55,8 @@
         $action->addAction(
             $builder
                 ->withLogger($logger)
                 ->withState($state),
             $state,
         );
     }
 }

src/Action/ConfigurationApplier.php

@@ -10,8 +10,8 @@
 
 final class ConfigurationApplier
 {
-    private ?Satellite\Action\Action $action = null;
+    private ?Action $action = null;
     private array $packages = [];
 
     public function __construct(
         private readonly string $plugin,
@@ -22,7 +22,7 @@
 
     public function withAction(): self
     {
-        $this->action = new Satellite\Action\Action($this->plugin, clone $this->interpreter);
+        $this->action = new Action($this->plugin, clone $this->interpreter);
 
         return $this;
     }
@@ -34,11 +34,11 @@
         return $this;
     }
 
     public function appendTo(array $config, Satellite\Builder\Repository\Action $action): void
     {
         $repository = $this->service->compile($config[$this->plugin]);
 
         ($this->action)($config, $action->getBuilder(), $repository);
 
         $action->addPackages(...$this->packages);
 

src/Action/Custom/Factory/Action.php

@@ -24,7 +24,7 @@
     private readonly Processor $processor;
     private readonly ConfigurationInterface $configuration;
 
     public function __construct(
         private readonly ExpressionLanguage $interpreter = new Satellite\ExpressionLanguage(),
         private readonly array $providers = [],
     ) {
@@ -63,25 +63,25 @@
     /**
      * @throws Configurator\ConfigurationExceptionInterface
      */
-    public function compile(array $config): Custom\Factory\Repository\Action
+    public function compile(array $config): Repository\Action
     {
         $containerName = sprintf('ProjectServiceContainer%s', ByteString::fromRandom(8)->toString());
 
         $builder = new Custom\Builder\Action(
             compileValueWhenExpression($this->interpreter, $config['use']),
-            sprintf('GyroscopsGenerated\\%s', $containerName),
+            sprintf('GyroscopsGenerated\%s', $containerName),
         );
 
         $container = (new SatelliteDependencyInjection(...$this->providers))($config);
 
-        $repository = new Custom\Factory\Repository\Action($builder);
+        $repository = new Repository\Action($builder);
 
         $dumper = new PhpDumper($container);
         $repository->addFiles(
             new Packaging\File(
                 sprintf('%s.php', $containerName),
                 new Packaging\Asset\InMemory(
                     $dumper->dump(['class' => $containerName, 'namespace' => 'GyroscopsGenerated'])
                 )
             ),
         );

src/Action/Custom/Service.php

@@ -4,7 +4,6 @@
 
 namespace Kiboko\Component\Satellite\Action\Custom;
 
-use Kiboko\Component\Satellite\Action\Custom;
 use Kiboko\Component\Satellite\ExpressionLanguage as Satellite;
 use Kiboko\Contract\Configurator;
 use Symfony\Component\Config\Definition\Exception as Symfony;
@@ -26,7 +25,7 @@
         private ExpressionLanguage $interpreter = new Satellite\ExpressionLanguage()
     ) {
         $this->processor = new Processor();
-        $this->configuration = new Custom\Configuration();
+        $this->configuration = new Configuration();
     }
 
     public function interpreter(): ExpressionLanguage
@@ -74,11 +73,11 @@
             && \count($config['expression_language'])
         ) {
             foreach ($config['expression_language'] as $provider) {
                 $interpreter->registerProvider(new $provider());
             }
         }
 
-        $actionFactory = new Custom\Factory\Action($this->interpreter);
+        $actionFactory = new Factory\Action($this->interpreter);
 
         return $actionFactory->compile($config);
     }

src/Action/SFTP/Builder/Action.php

@@ -8,8 +8,8 @@
 
 final class Action implements ActionBuilderInterface
 {
     private ?Node\Expr $logger = null;
     private ?Node\Expr $state = null;
 
     public function __construct(
         private readonly Node\Expr $host,
@@ -38,7 +38,7 @@
     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,

src/Adapter/ComposerFailureException.php

@@ -6,7 +6,7 @@
 
 final class ComposerFailureException extends \RuntimeException
 {
-    public function __construct(private readonly string $command = '', string $message = '', int $code = 0, \Throwable $previous = null)
+    public function __construct(private readonly string $command = '', string $message = '', int $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

src/Adapter/Docker/SatelliteBuilder.php

@@ -23,8 +23,8 @@
     private iterable $command = [];
     /** @var iterable<string> */
     private iterable $tags = [];
-    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile = null;
-    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null;
+    private PackagingContract\AssetInterface|PackagingContract\FileInterface|null $composerJsonFile = null;
+    private PackagingContract\AssetInterface|PackagingContract\FileInterface|null $composerLockFile = null;
     /** @var iterable<array<string, string>> */
     private iterable $paths = [];
     /** @var \AppendIterator<string,PackagingContract\FileInterface, \Iterator<string,PackagingContract\FileInterface>> */
@@ -67,7 +67,7 @@
 
     public function withComposerFile(
         PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile,
-        PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null
+        PackagingContract\AssetInterface|PackagingContract\FileInterface|null $composerLockFile = null
     ): self {
         $this->composerJsonFile = $composerJsonFile;
         $this->composerLockFile = $composerLockFile;
@@ -77,7 +77,7 @@
 
     public function withFile(
         PackagingContract\AssetInterface|PackagingContract\FileInterface $source,
-        string $destinationPath = null
+        ?string $destinationPath = null
     ): self {
         if (!$source instanceof PackagingContract\FileInterface) {
             $source = new Packaging\VirtualFile($source);
@@ -85,14 +85,14 @@
 
         $this->paths[] = [$source->getPath(), $destinationPath ?? $source->getPath()];
 
         $this->files->append(new \ArrayIterator([
             new Packaging\File($destinationPath, $source),
         ]));
 
         return $this;
     }
 
-    public function withDirectory(PackagingContract\DirectoryInterface $source, string $destinationPath = null): self
+    public function withDirectory(PackagingContract\DirectoryInterface $source, ?string $destinationPath = null): self
     {
         $this->paths[] = [$source->getPath(), $destinationPath ?? $source->getPath()];
 
@@ -152,13 +152,13 @@
 
         if (null !== $this->composerJsonFile) {
             $dockerfile->push(new Dockerfile\Dockerfile\Copy('composer.json', 'composer.json'));
             $this->files->append(new \ArrayIterator([
                 new Packaging\File('composer.json', $this->composerJsonFile),
             ]));
 
             if (null !== $this->composerLockFile) {
                 $dockerfile->push(new Dockerfile\Dockerfile\Copy('composer.json', 'composer.lock'));
                 $this->files->append(new \ArrayIterator([
                     new Packaging\File('composer.lock', $this->composerLockFile),
                 ]));
             }

src/Adapter/FactoryInterface.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-trigger_deprecation('php-etl/satellite', '0.4', 'The "%s" interface is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Adapter\\FactoryInterface', Kiboko\Contract\Configurator\Adapter\FactoryInterface::class);
+trigger_deprecation('php-etl/satellite', '0.4', 'The "%s" interface is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Adapter\FactoryInterface', Kiboko\Contract\Configurator\Adapter\FactoryInterface::class);
 
 /*
  * @deprecated since Satellite 0.4, use Kiboko\Contract\Configurator\Adapter\FactoryInterface instead.
  */
-class_alias(Kiboko\Contract\Configurator\Adapter\FactoryInterface::class, 'Kiboko\\Component\\Satellite\\Adapter\\FactoryInterface');
+class_alias(Kiboko\Contract\Configurator\Adapter\FactoryInterface::class, 'Kiboko\Component\Satellite\Adapter\FactoryInterface');

src/Adapter/Filesystem/SatelliteBuilder.php

@@ -20,10 +20,10 @@
     ];
     private array $authenticationTokens = [];
     private array $repositories = [];
-    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile = null;
-    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null;
+    private PackagingContract\AssetInterface|PackagingContract\FileInterface|null $composerJsonFile = null;
+    private PackagingContract\AssetInterface|PackagingContract\FileInterface|null $composerLockFile = null;
     /** @var iterable<array<string, string>> */
     private iterable $paths = [];
     /** @var \AppendIterator<string,PackagingContract\FileInterface, \Iterator<string,PackagingContract\FileInterface>> */
     private readonly iterable $files;
 
@@ -55,7 +55,7 @@
 
     public function withComposerFile(
         PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile,
-        PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null
+        PackagingContract\AssetInterface|PackagingContract\FileInterface|null $composerLockFile = null
     ): self {
         $this->composerJsonFile = $composerJsonFile;
         $this->composerLockFile = $composerLockFile;
@@ -65,7 +65,7 @@
 
     public function withFile(
         PackagingContract\AssetInterface|PackagingContract\FileInterface $source,
-        string $destinationPath = null
+        ?string $destinationPath = null
     ): self {
         if (!$source instanceof PackagingContract\FileInterface) {
             $source = new Packaging\VirtualFile($source);
@@ -73,14 +73,14 @@
 
         $this->paths[] = [$source->getPath(), $destinationPath ?? $source->getPath()];
 
         $this->files->append(new \ArrayIterator([
             new Packaging\File($destinationPath, $source),
         ]));
 
         return $this;
     }
 
-    public function withDirectory(PackagingContract\DirectoryInterface $source, string $destinationPath = null): self
+    public function withDirectory(PackagingContract\DirectoryInterface $source, ?string $destinationPath = null): self
     {
         $this->paths[] = [$source->getPath(), $destinationPath ?? $source->getPath()];
 

src/Adapter/Tar/SatelliteBuilder.php

@@ -13,8 +13,8 @@ final class SatelliteBuilder implements Configurator\SatelliteBuilderInterface
 {
     /** @var iterable<string> */
     private iterable $composerRequire = [];
-    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile = null;
-    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null;
+    private PackagingContract\AssetInterface|PackagingContract\FileInterface|null $composerJsonFile = null;
+    private PackagingContract\AssetInterface|PackagingContract\FileInterface|null $composerLockFile = null;
     /** @var \AppendIterator<string,PackagingContract\FileInterface, \Iterator<string,PackagingContract\FileInterface>> */
     private readonly iterable $files;
     /** @var array<string, array<string, string>> */
@@ -48,7 +48,7 @@ public function withComposerRequire(string ...$package): self
 
     public function withComposerFile(
         PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile,
-        PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null
+        PackagingContract\AssetInterface|PackagingContract\FileInterface|null $composerLockFile = null
     ): self {
         $this->composerJsonFile = $composerJsonFile;
         $this->composerLockFile = $composerLockFile;
@@ -58,7 +58,7 @@ public function withComposerFile(
 
     public function withFile(
         PackagingContract\AssetInterface|PackagingContract\FileInterface $source,
-        string $destinationPath = null
+        ?string $destinationPath = null
     ): self {
         if (!$source instanceof PackagingContract\FileInterface) {
             $source = new Packaging\VirtualFile($source);
@@ -71,7 +71,7 @@ public function withFile(
         return $this;
     }
 
-    public function withDirectory(PackagingContract\DirectoryInterface $source, string $destinationPath = null): self
+    public function withDirectory(PackagingContract\DirectoryInterface $source, ?string $destinationPath = null): self
     {
         $this->files->append(new \RecursiveIteratorIterator($source, \RecursiveIteratorIterator::SELF_FIRST));
 

src/Builder/API/APIRuntime.php

@@ -11,19 +11,19 @@ final class APIRuntime
     public function getNode(): Node\Expr
     {
         return new Node\Expr\New_(
-            class: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\API\\APIRuntime'),
+            class: new Node\Name\FullyQualified('Kiboko\Component\Runtime\API\APIRuntime'),
             args: [
                 new Node\Arg(
                     value: new Node\Expr\New_(
-                        class: new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\Pipeline'),
+                        class: new Node\Name\FullyQualified('Kiboko\Component\Pipeline\Pipeline'),
                         args: [
                             new Node\Arg(
                                 value: new Node\Expr\New_(
-                                    class: new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\PipelineRunner'),
+                                    class: new Node\Name\FullyQualified('Kiboko\Component\Pipeline\PipelineRunner'),
                                     args: [
                                         new Node\Arg(
                                             value: new Node\Expr\New_(
-                                                class: new Node\Name\FullyQualified('Psr\\Log\\NullLogger')
+                                                class: new Node\Name\FullyQualified('Psr\Log\NullLogger')
                                             )
                                         ),
                                     ]

src/Builder/API/PipelineBuilder.php

@@ -21,7 +21,7 @@ public function getNode(): Node\Expr
                 'params' => [
                     new Node\Param(
                         var: new Node\Expr\Variable('runtime'),
-                        type: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\Hook\\HookRuntimeInterface'),
+                        type: new Node\Name\FullyQualified('Kiboko\Component\Runtime\Hook\HookRuntimeInterface'),
                     ),
                 ],
                 'stmts' => [

src/Builder/Hook/HookRuntime.php

@@ -11,19 +11,19 @@ final class HookRuntime
     public function getNode(): Node\Expr
     {
         return new Node\Expr\New_(
-            class: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\Hook\\HookRuntime'),
+            class: new Node\Name\FullyQualified('Kiboko\Component\Runtime\Hook\HookRuntime'),
             args: [
                 new Node\Arg(
                     value: new Node\Expr\New_(
-                        class: new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\Pipeline'),
+                        class: new Node\Name\FullyQualified('Kiboko\Component\Pipeline\Pipeline'),
                         args: [
                             new Node\Arg(
                                 value: new Node\Expr\New_(
-                                    class: new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\PipelineRunner'),
+                                    class: new Node\Name\FullyQualified('Kiboko\Component\Pipeline\PipelineRunner'),
                                     args: [
                                         new Node\Arg(
                                             value: new Node\Expr\New_(
-                                                class: new Node\Name\FullyQualified('Psr\\Log\\NullLogger')
+                                                class: new Node\Name\FullyQualified('Psr\Log\NullLogger')
                                             )
                                         ),
                                     ]

src/Builder/Hook/PipelineBuilder.php

@@ -21,7 +21,7 @@ public function getNode(): Node\Expr
                 'params' => [
                     new Node\Param(
                         var: new Node\Expr\Variable('runtime'),
-                        type: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\Hook\\HookRuntimeInterface'),
+                        type: new Node\Name\FullyQualified('Kiboko\Component\Runtime\Hook\HookRuntimeInterface'),
                     ),
                 ],
                 'stmts' => [

src/Builder/Pipeline/ConsoleRuntime.php

@@ -12,24 +12,24 @@ final class ConsoleRuntime implements Builder
     public function getNode(): Node\Expr
     {
         return new Node\Expr\New_(
-            class: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\Pipeline\\Console'),
+            class: new Node\Name\FullyQualified('Kiboko\Component\Runtime\Pipeline\Console'),
             args: [
                 new Node\Arg(
                     value: new Node\Expr\New_(
-                        class: new Node\Name\FullyQualified('Symfony\\Component\\Console\\Output\\ConsoleOutput'),
+                        class: new Node\Name\FullyQualified('Symfony\Component\Console\Output\ConsoleOutput'),
                     )
                 ),
                 new Node\Arg(
                     value: new Node\Expr\New_(
-                        class: new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\Pipeline'),
+                        class: new Node\Name\FullyQualified('Kiboko\Component\Pipeline\Pipeline'),
                         args: [
                             new Node\Arg(
                                 new Node\Expr\New_(
-                                    class: new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\PipelineRunner'),
+                                    class: new Node\Name\FullyQualified('Kiboko\Component\Pipeline\PipelineRunner'),
                                     args: [
                                         new Node\Arg(
                                             value: new Node\Expr\New_(
-                                                class: new Node\Name\FullyQualified('Psr\\Log\\NullLogger'),
+                                                class: new Node\Name\FullyQualified('Psr\Log\NullLogger'),
                                             )
                                         ),
                                     ],

src/Builder/Workflow.php

@@ -24,7 +24,7 @@ public function addPipeline(string $code, string $pipelineFilename): self
             args: [
                 new Node\Arg(
                     new Node\Expr\StaticCall(
-                        new Node\Name\FullyQualified('Kiboko\\Component\\Workflow\\JobCode'),
+                        new Node\Name\FullyQualified('Kiboko\Component\Workflow\JobCode'),
                         new Node\Identifier('fromString'),
                         [
                             new Node\Arg(new Node\Scalar\String_($code)),
@@ -38,7 +38,7 @@ public function addPipeline(string $code, string $pipelineFilename): self
                         args: [
                             new Node\Arg(
                                 new Node\Expr\StaticCall(
-                                    new Node\Name\FullyQualified('Kiboko\\Component\\Workflow\\JobCode'),
+                                    new Node\Name\FullyQualified('Kiboko\Component\Workflow\JobCode'),
                                     new Node\Identifier('fromString'),
                                     [
                                         new Node\Arg(new Node\Scalar\String_($code)),
@@ -73,7 +73,7 @@ public function addAction(string $code, string $pipelineFilename): self
             args: [
                 new Node\Arg(
                     new Node\Expr\StaticCall(
-                        new Node\Name\FullyQualified('Kiboko\\Component\\Workflow\\JobCode'),
+                        new Node\Name\FullyQualified('Kiboko\Component\Workflow\JobCode'),
                         new Node\Identifier('fromString'),
                         [
                             new Node\Arg(new Node\Scalar\String_($code)),
@@ -87,7 +87,7 @@ public function addAction(string $code, string $pipelineFilename): self
                         args: [
                             new Node\Arg(
                                 new Node\Expr\StaticCall(
-                                    new Node\Name\FullyQualified('Kiboko\\Component\\Workflow\\JobCode'),
+                                    new Node\Name\FullyQualified('Kiboko\Component\Workflow\JobCode'),
                                     new Node\Identifier('fromString'),
                                     [
                                         new Node\Arg(new Node\Scalar\String_($code)),

src/Builder/Workflow/ActionBuilder.php

@@ -21,7 +21,7 @@ public function getNode(): Node\Expr
                 'params' => [
                     new Node\Param(
                         var: new Node\Expr\Variable('runtime'),
-                        type: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\Action\\ActionRuntimeInterface'),
+                        type: new Node\Name\FullyQualified('Kiboko\Component\Runtime\Action\ActionRuntimeInterface'),
                     ),
                 ],
                 'stmts' => [