fix file expression language

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,7 +63,7 @@
     /**
      * @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());
 
@@ -74,14 +74,14 @@
 
         $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/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/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/Cloud/Auth.php

@@ -13,7 +13,7 @@ final class Auth
     private string $pathName;
     private array $configuration;
 
-    public function __construct(string $pathName = null)
+    public function __construct(?string $pathName = null)
     {
         if (null === $pathName) {
             $this->pathName = getenv('HOME').'/.gyroscops/';

src/Cloud/CommandBus.php

@@ -5,7 +5,6 @@
 namespace Kiboko\Component\Satellite\Cloud;
 
 use Gyroscops\Api\Client;
-use Kiboko\Component\Satellite;
 use React\Promise\Deferred;
 use React\Promise\PromiseInterface;
 
@@ -22,16 +21,16 @@ public function __construct(
     public static function withStandardHandlers(Client $client): self
     {
         return new self([
-            Satellite\Cloud\Command\Pipeline\DeclarePipelineCommand::class => new Satellite\Cloud\Handler\Pipeline\DeclarePipelineCommandHandler($client),
-            Satellite\Cloud\Command\Pipeline\AddPipelineComposerPSR4AutoloadCommand::class => new Satellite\Cloud\Handler\Pipeline\AddPipelineComposerPSR4AutoloadCommandHandler($client),
-            Satellite\Cloud\Command\Pipeline\AppendPipelineStepCommand::class => new Satellite\Cloud\Handler\Pipeline\AppendPipelineStepCommandHandler($client),
-            Satellite\Cloud\Command\Pipeline\RemovePipelineCommand::class => new Satellite\Cloud\Handler\Pipeline\RemovePipelineCommandHandler($client),
-            Satellite\Cloud\Command\Pipeline\AddAfterPipelineStepCommand::class => new Satellite\Cloud\Handler\Pipeline\AddAfterPipelineStepCommandHandler($client),
-            Satellite\Cloud\Command\Pipeline\AddBeforePipelineStepCommand::class => new Satellite\Cloud\Handler\Pipeline\AddBeforePipelineStepCommandHandler($client),
-            Satellite\Cloud\Command\Pipeline\ReplacePipelineStepCommand::class => new Satellite\Cloud\Handler\Pipeline\ReplacePipelineStepCommandHandler($client),
-            Satellite\Cloud\Command\Pipeline\RemovePipelineStepCommand::class => new Satellite\Cloud\Handler\Pipeline\RemovePipelineStepCommandHandler($client),
-            Satellite\Cloud\Command\Workflow\DeclareWorkflowCommand::class => new Satellite\Cloud\Handler\Workflow\DeclareWorkflowCommandHandler($client),
-            Satellite\Cloud\Command\Workflow\RemoveWorkflowCommand::class => new Satellite\Cloud\Handler\Workflow\RemoveWorkflowCommandHandler($client),
+            Command\Pipeline\DeclarePipelineCommand::class => new Handler\Pipeline\DeclarePipelineCommandHandler($client),
+            Command\Pipeline\AddPipelineComposerPSR4AutoloadCommand::class => new Handler\Pipeline\AddPipelineComposerPSR4AutoloadCommandHandler($client),
+            Command\Pipeline\AppendPipelineStepCommand::class => new Handler\Pipeline\AppendPipelineStepCommandHandler($client),
+            Command\Pipeline\RemovePipelineCommand::class => new Handler\Pipeline\RemovePipelineCommandHandler($client),
+            Command\Pipeline\AddAfterPipelineStepCommand::class => new Handler\Pipeline\AddAfterPipelineStepCommandHandler($client),
+            Command\Pipeline\AddBeforePipelineStepCommand::class => new Handler\Pipeline\AddBeforePipelineStepCommandHandler($client),
+            Command\Pipeline\ReplacePipelineStepCommand::class => new Handler\Pipeline\ReplacePipelineStepCommandHandler($client),
+            Command\Pipeline\RemovePipelineStepCommand::class => new Handler\Pipeline\RemovePipelineStepCommandHandler($client),
+            Command\Workflow\DeclareWorkflowCommand::class => new Handler\Workflow\DeclareWorkflowCommandHandler($client),
+            Command\Workflow\RemoveWorkflowCommand::class => new Handler\Workflow\RemoveWorkflowCommandHandler($client),
         ]);
     }
 

src/Cloud/DTO/JobList.php

@@ -4,14 +4,12 @@
 
 namespace Kiboko\Component\Satellite\Cloud\DTO;
 
-use Kiboko\Component\Satellite\Cloud\DTO;
-
 readonly class JobList implements \Countable, \IteratorAggregate
 {
     private array $jobs;
 
     public function __construct(
-        DTO\Workflow\JobInterface ...$job,
+        Workflow\JobInterface ...$job,
     ) {
         $this->jobs = $job;
     }
@@ -21,7 +19,7 @@ public function getIterator(): \Traversable
         $jobs = $this->jobs;
 
         /* @phpstan-ignore-next-line */
-        usort($jobs, fn (DTO\Workflow\JobInterface $left, DTO\Workflow\JobInterface $right) => $left->order <=> $right->order);
+        usort($jobs, fn (Workflow\JobInterface $left, Workflow\JobInterface $right) => $left->order <=> $right->order);
 
         return new \ArrayIterator($jobs);
     }
@@ -31,13 +29,13 @@ public function codes(): array
         $jobs = $this->jobs;
 
         /* @phpstan-ignore-next-line */
-        usort($jobs, fn (DTO\Workflow\JobInterface $left, DTO\Workflow\JobInterface $right) => $left->order <=> $right->order);
+        usort($jobs, fn (Workflow\JobInterface $left, Workflow\JobInterface $right) => $left->order <=> $right->order);
 
         /* @phpstan-ignore-next-line */
-        return array_map(fn (DTO\Workflow\JobInterface $job) => $job->code->asString(), $jobs);
+        return array_map(fn (Workflow\JobInterface $job) => $job->code->asString(), $jobs);
     }
 
-    public function get(string $code): DTO\Workflow\JobInterface
+    public function get(string $code): Workflow\JobInterface
     {
         foreach ($this->jobs as $job) {
             if ($job->code->asString() === $code) {

src/Cloud/Normalizer/ExpressionNormalizer.php

@@ -9,12 +9,12 @@
 
 class ExpressionNormalizer implements NormalizerInterface
 {
-    public function normalize(mixed $object, string $format = null, array $context = []): string
+    public function normalize(mixed $object, ?string $format = null, array $context = []): string
     {
         return (string) $object;
     }
 
-    public function supportsNormalization(mixed $data, string $format = null): bool
+    public function supportsNormalization(mixed $data, ?string $format = null): bool
     {
         return $data instanceof Expression;
     }

src/ConfigLoader.php

@@ -4,11 +4,10 @@
 
 namespace Kiboko\Component\Satellite;
 
-use Kiboko\Component\Satellite;
 use Kiboko\Contract\Configurator\InvalidConfigurationException;
 use Symfony\Component\Config;
 
-class ConfigLoader implements Satellite\ConfigLoaderInterface
+class ConfigLoader implements ConfigLoaderInterface
 {
     public function __construct(private readonly string $basePath)
     {
@@ -120,8 +119,8 @@ public function loadFile(string $file): array
         $locator = new Config\FileLocator([$this->basePath]);
 
         $loaderResolver = new Config\Loader\LoaderResolver([
-            new Satellite\Console\Config\YamlFileLoader($locator),
-            new Satellite\Console\Config\JsonFileLoader($locator),
+            new Console\Config\YamlFileLoader($locator),
+            new Console\Config\JsonFileLoader($locator),
         ]);
 
         $delegatingLoader = new Config\Loader\DelegatingLoader($loaderResolver);

src/ExpressionLanguage/Download.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kiboko\Component\Satellite\ExpressionLanguage;
+
+use Symfony\Component\ExpressionLanguage\ExpressionFunction;
+
+final class Download extends ExpressionFunction
+{
+    public function __construct(string $name)
+    {
+        parent::__construct(
+            $name,
+            function (string $value, string $context = ''): string {
+                $pattern = <<<'PHP'
+                    (function () use($input) {
+                        $resource = \fopen(%s %s, 'r');
+                        if ($resource === false) {
+                            throw new \RuntimeException('Could not open file.');
+                        }
+                        return $resource;
+                    })()
+                    PHP;
+
+                return sprintf($pattern, $value, $context);
+            },
+            function (string $value, string $context = '') {
+                $resource = fopen($context.$value, 'r');
+                if (false === $resource) {
+                    throw new \RuntimeException('Could not open file.');
+                }
+
+                return $resource;
+            },
+        );
+    }
+}

src/ExpressionLanguage/ExpressionLanguage.php

@@ -9,9 +9,9 @@
 
 final class ExpressionLanguage extends BaseExpressionLanguage
 {
-    public function __construct(CacheItemPoolInterface $cache = null, array $providers = [])
+    public function __construct(?CacheItemPoolInterface $cache = null, array $providers = [])
     {
         parent::__construct($cache, [
             ...$providers,
             new Provider(),
         ]);

src/ExpressionLanguage/File.php

@@ -14,7 +14,7 @@ public function __construct(string $name)
             $name,
             function (string $value): string {
                 $pattern = <<<'PHP'
-                    (function () {
+                    (function () use ($input) {
                         $resource = \tmpfile();
                         if ($resource === false) {
                             throw new \RuntimeException('Could not open temporary file.');
@@ -24,7 +24,7 @@ function (string $value): string {
                         \fseek($resource, 0, \SEEK_SET);
 
                         return \stream_get_meta_data($resource)['uri'];
-                    })();
+                    })()
                     PHP;
 
                 return sprintf($pattern, $value);

src/ExpressionLanguage/TemporaryFile.php

@@ -14,15 +14,15 @@ public function __construct(string $name)
             $name,
             function (string $value): string {
                 $pattern = <<<'PHP'
-                    (function ($data) {
+                    (function ($data) use ($input) {
                         if (!is_string($data)) {
                             return null;
                         }
                         $stream = fopen('php://temp', 'r+');
                         fwrite($stream, $data);
                         fseek($stream, 0, SEEK_SET);
                         return $stream;
-                    })(%s);
+                    })(%s)
                     PHP;
 
                 return sprintf($pattern, $value);