cs-fixer + remove the PHP_CS_FIXER_IGNORE_ENV

php-etl · Dec 1, 2023 · 7c6c206 · 7c6c206
1 parent 23bac27
commit 7c6c206
Show file tree

Hide file tree

Showing 71 changed files with 225 additions and 222 deletions.
diff --git a/.github/workflows/quality.yaml b/.github/workflows/quality.yaml
@@ -14,7 +14,7 @@ jobs:
                 run: |
                     wget -q https://cs.symfony.com/download/php-cs-fixer-v3.phar -O php-cs-fixer
                     chmod a+x php-cs-fixer
-                    PHP_CS_FIXER_IGNORE_ENV=true ./php-cs-fixer fix src --dry-run
+                    ./php-cs-fixer fix src --dry-run
 
     phpstan:
         runs-on: ubuntu-latest

diff --git a/src/Action/Custom/Factory/Action.php b/src/Action/Custom/Factory/Action.php
@@ -44,7 +44,7 @@ public function normalize(array $config): array
     {
         try {
             return $this->processor->processConfiguration($this->configuration, $config);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
         }
     }
@@ -55,7 +55,7 @@ public function validate(array $config): bool
             $this->processor->processConfiguration($this->configuration, $config);
 
             return true;
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException) {
             return false;
         }
     }

diff --git a/src/Action/Custom/Factory/Repository/RepositoryTrait.php b/src/Action/Custom/Factory/Repository/RepositoryTrait.php
@@ -14,7 +14,7 @@ trait RepositoryTrait
     /** @var string[] */
     private array $packages;
 
-    public function addFiles(Packaging\FileInterface|Packaging\DirectoryInterface ...$files): Configurator\RepositoryInterface
+    public function addFiles(Packaging\DirectoryInterface|Packaging\FileInterface ...$files): Configurator\RepositoryInterface
     {
         array_push($this->files, ...$files);
 

diff --git a/src/Action/Custom/Service.php b/src/Action/Custom/Service.php
@@ -43,7 +43,7 @@ public function normalize(array $config): array
     {
         try {
             return $this->processor->processConfiguration($this->configuration, $config);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
         }
     }
@@ -54,7 +54,7 @@ public function validate(array $config): bool
             $this->processor->processConfiguration($this->configuration, $config);
 
             return true;
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException) {
             return false;
         }
     }

diff --git a/src/Action/SFTP/Factory/Action.php b/src/Action/SFTP/Factory/Action.php
@@ -39,7 +39,7 @@ public function normalize(array $config): array
     {
         try {
             return $this->processor->processConfiguration($this->configuration, $config);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
         }
     }
@@ -50,7 +50,7 @@ public function validate(array $config): bool
             $this->normalize($config);
 
             return true;
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException) {
             return false;
         }
     }
@@ -68,7 +68,7 @@ public function compile(array $config): Repository
 
         try {
             return new Repository($builder);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception);
         }
     }

diff --git a/src/Action/SFTP/Factory/Repository/Repository.php b/src/Action/SFTP/Factory/Repository/Repository.php
@@ -12,7 +12,7 @@
 {
     public function __construct(private Builder\Action $builder) {}
 
-    public function addFiles(Packaging\FileInterface|Packaging\DirectoryInterface ...$files): self
+    public function addFiles(Packaging\DirectoryInterface|Packaging\FileInterface ...$files): self
     {
         return $this;
     }

diff --git a/src/Action/SFTP/Service.php b/src/Action/SFTP/Service.php
@@ -45,7 +45,7 @@ public function normalize(array $config): array
     {
         try {
             return $this->processor->processConfiguration($this->configuration, $config);
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) {
             throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
         }
     }
@@ -56,7 +56,7 @@ public function validate(array $config): bool
             $this->processor->processConfiguration($this->configuration, $config);
 
             return true;
-        } catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException) {
+        } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException) {
             return false;
         }
     }

diff --git a/src/Adapter/Composer.php b/src/Adapter/Composer.php
@@ -8,6 +8,7 @@
 use Psr\Log\LoggerInterface;
 use React\ChildProcess\Process;
 use React\Promise\Deferred;
+
 use function React\Async\await;
 use function React\Promise\Timer\timeout;
 
@@ -28,16 +29,16 @@ private function execute(Process $process, float $timeout = 300): void
     {
         $process->start();
 
-        $process->stdout->on('data', function ($chunk) {
+        $process->stdout->on('data', function ($chunk): void {
             $this->logger->debug($chunk);
         });
-        $process->stderr->on('data', function ($chunk) {
+        $process->stderr->on('data', function ($chunk): void {
             $this->logger->info($chunk);
         });
 
         $deferred = new Deferred();
 
-        $process->on('exit', function () use ($deferred) {
+        $process->on('exit', function () use ($deferred): void {
             $deferred->resolve();
         });
 
@@ -53,7 +54,7 @@ private function execute(Process $process, float $timeout = 300): void
     private function command(string ...$command): void
     {
         $process = new Process(
-            implode (' ', array_map(fn ($part) => escapeshellarg($part), $command)),
+            implode(' ', array_map(fn ($part) => escapeshellarg($part), $command)),
             $this->workdir,
         );
 

diff --git a/src/Adapter/Docker/Satellite.php b/src/Adapter/Docker/Satellite.php
@@ -13,6 +13,7 @@
 use React\ChildProcess\Process;
 use React\Promise\Deferred;
 use React\Stream\ReadableResourceStream;
+
 use function React\Async\await;
 use function React\Promise\Timer\timeout;
 
@@ -27,7 +28,7 @@ final class Satellite implements Configurator\SatelliteInterface
     public function __construct(
         private readonly Dockerfile\Dockerfile $dockerfile,
         private readonly string $workdir,
-        Packaging\FileInterface|Packaging\DirectoryInterface ...$files
+        Packaging\DirectoryInterface|Packaging\FileInterface ...$files
     ) {
         $this->files = $files;
     }
@@ -39,7 +40,7 @@ public function addTags(string ...$imageTags): self
         return $this;
     }
 
-    public function withFile(Packaging\FileInterface|Packaging\DirectoryInterface ...$files): self
+    public function withFile(Packaging\DirectoryInterface|Packaging\FileInterface ...$files): self
     {
         array_push($this->files, ...$files);
 
@@ -73,7 +74,7 @@ public function build(
         $command = ['docker', 'build', '--rm', '-', ...iterator_to_array($iterator($this->imageTags))];
 
         $process = new Process(
-            implode (' ', array_map(fn (string $part) => escapeshellarg($part), $command)),
+            implode(' ', array_map(fn (string $part) => escapeshellarg($part), $command)),
             $this->workdir,
         );
 
@@ -95,16 +96,16 @@ private function execute(
         Process $process,
         float $timeout = 300
     ): void {
-        $process->stdout->on('data', function ($chunk) use ($logger) {
+        $process->stdout->on('data', function ($chunk) use ($logger): void {
             $logger->debug($chunk);
         });
-        $process->stderr->on('data', function ($chunk) use ($logger) {
+        $process->stderr->on('data', function ($chunk) use ($logger): void {
             $logger->info($chunk);
         });
 
         $deferred = new Deferred();
 
-        $process->on('exit', function () use ($deferred) {
+        $process->on('exit', function () use ($deferred): void {
             $deferred->resolve();
         });
 

diff --git a/src/Adapter/Docker/SatelliteBuilder.php b/src/Adapter/Docker/SatelliteBuilder.php
@@ -23,8 +23,8 @@ final class SatelliteBuilder implements Configurator\SatelliteBuilderInterface
     private iterable $command = [];
     /** @var iterable<string> */
     private iterable $tags = [];
-    private null|PackagingContract\FileInterface|PackagingContract\AssetInterface $composerJsonFile = null;
-    private null|PackagingContract\FileInterface|PackagingContract\AssetInterface $composerLockFile = null;
+    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile = null;
+    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null;
     /** @var iterable<array<string, string>> */
     private iterable $paths = [];
     /** @var \AppendIterator<string,PackagingContract\FileInterface, \Iterator<string,PackagingContract\FileInterface>> */
@@ -66,8 +66,8 @@ public function withComposerRequire(string ...$package): self
     }
 
     public function withComposerFile(
-        PackagingContract\FileInterface|PackagingContract\AssetInterface $composerJsonFile,
-        PackagingContract\FileInterface|PackagingContract\AssetInterface $composerLockFile = null
+        PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile,
+        PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null
     ): self {
         $this->composerJsonFile = $composerJsonFile;
         $this->composerLockFile = $composerLockFile;
@@ -76,7 +76,7 @@ public function withComposerFile(
     }
 
     public function withFile(
-        PackagingContract\FileInterface|PackagingContract\AssetInterface $source,
+        PackagingContract\AssetInterface|PackagingContract\FileInterface $source,
         string $destinationPath = null
     ): self {
         if (!$source instanceof PackagingContract\FileInterface) {

diff --git a/src/Adapter/Filesystem/Satellite.php b/src/Adapter/Filesystem/Satellite.php
@@ -18,12 +18,12 @@ final class Satellite implements Configurator\SatelliteInterface
     public function __construct(
         private readonly string $workdir,
         private readonly Composer $composer,
-        Packaging\FileInterface|Packaging\DirectoryInterface ...$files
+        Packaging\DirectoryInterface|Packaging\FileInterface ...$files
     ) {
         $this->files = $files;
     }
 
-    public function withFile(Packaging\FileInterface|Packaging\DirectoryInterface ...$files): self
+    public function withFile(Packaging\DirectoryInterface|Packaging\FileInterface ...$files): self
     {
         array_push($this->files, ...$files);
 

diff --git a/src/Adapter/Filesystem/SatelliteBuilder.php b/src/Adapter/Filesystem/SatelliteBuilder.php
@@ -20,8 +20,8 @@ final class SatelliteBuilder implements Configurator\SatelliteBuilderInterface
     ];
     private array $authenticationTokens = [];
     private array $repositories = [];
-    private null|PackagingContract\FileInterface|PackagingContract\AssetInterface $composerJsonFile = null;
-    private null|PackagingContract\FileInterface|PackagingContract\AssetInterface $composerLockFile = null;
+    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile = null;
+    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null;
     /** @var iterable<array<string, string>> */
     private iterable $paths = [];
     /** @var \AppendIterator<string,PackagingContract\FileInterface, \Iterator<string,PackagingContract\FileInterface>> */
@@ -54,8 +54,8 @@ public function withComposerRequire(string ...$package): self
     }
 
     public function withComposerFile(
-        PackagingContract\FileInterface|PackagingContract\AssetInterface $composerJsonFile,
-        PackagingContract\FileInterface|PackagingContract\AssetInterface $composerLockFile = null
+        PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile,
+        PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null
     ): self {
         $this->composerJsonFile = $composerJsonFile;
         $this->composerLockFile = $composerLockFile;
@@ -64,7 +64,7 @@ public function withComposerFile(
     }
 
     public function withFile(
-        PackagingContract\FileInterface|PackagingContract\AssetInterface $source,
+        PackagingContract\AssetInterface|PackagingContract\FileInterface $source,
         string $destinationPath = null
     ): self {
         if (!$source instanceof PackagingContract\FileInterface) {

diff --git a/src/Adapter/Tar/Satellite.php b/src/Adapter/Tar/Satellite.php
@@ -19,7 +19,7 @@ final class Satellite implements Configurator\SatelliteInterface
 
     public function __construct(
         private readonly string $outputPath,
-        Packaging\FileInterface|Packaging\DirectoryInterface ...$files
+        Packaging\DirectoryInterface|Packaging\FileInterface ...$files
     ) {
         $this->files = $files;
     }
@@ -31,7 +31,7 @@ public function addTags(string ...$imageTags): self
         return $this;
     }
 
-    public function withFile(Packaging\FileInterface|Packaging\DirectoryInterface ...$files): self
+    public function withFile(Packaging\DirectoryInterface|Packaging\FileInterface ...$files): self
     {
         array_push($this->files, ...$files);
 

diff --git a/src/Adapter/Tar/SatelliteBuilder.php b/src/Adapter/Tar/SatelliteBuilder.php
@@ -13,8 +13,8 @@ final class SatelliteBuilder implements Configurator\SatelliteBuilderInterface
 {
     /** @var iterable<string> */
     private iterable $composerRequire = [];
-    private null|PackagingContract\FileInterface|PackagingContract\AssetInterface $composerJsonFile = null;
-    private null|PackagingContract\FileInterface|PackagingContract\AssetInterface $composerLockFile = null;
+    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile = null;
+    private null|PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null;
     /** @var \AppendIterator<string,PackagingContract\FileInterface, \Iterator<string,PackagingContract\FileInterface>> */
     private readonly iterable $files;
     /** @var array<string, array<string, string>> */
@@ -47,8 +47,8 @@ public function withComposerRequire(string ...$package): self
     }
 
     public function withComposerFile(
-        PackagingContract\FileInterface|PackagingContract\AssetInterface $composerJsonFile,
-        PackagingContract\FileInterface|PackagingContract\AssetInterface $composerLockFile = null
+        PackagingContract\AssetInterface|PackagingContract\FileInterface $composerJsonFile,
+        PackagingContract\AssetInterface|PackagingContract\FileInterface $composerLockFile = null
     ): self {
         $this->composerJsonFile = $composerJsonFile;
         $this->composerLockFile = $composerLockFile;
@@ -57,7 +57,7 @@ public function withComposerFile(
     }
 
     public function withFile(
-        PackagingContract\FileInterface|PackagingContract\AssetInterface $source,
+        PackagingContract\AssetInterface|PackagingContract\FileInterface $source,
         string $destinationPath = null
     ): self {
         if (!$source instanceof PackagingContract\FileInterface) {

diff --git a/src/Builder/Action.php b/src/Builder/Action.php
@@ -16,8 +16,8 @@ public function __construct(
     ) {}
 
     public function addAction(
-        Node\Expr|Builder $loader,
-        Node\Expr|Builder $state,
+        Builder|Node\Expr $loader,
+        Builder|Node\Expr $state,
     ): self {
         $this->action = new Node\Expr\MethodCall(
             var: $this->runtime,

diff --git a/src/Builder/Pipeline.php b/src/Builder/Pipeline.php
@@ -16,10 +16,10 @@ public function __construct(
     ) {}
 
     public function addExtractor(
-        Node\Expr|Builder $code,
-        Node\Expr|Builder $extractor,
-        Node\Expr|Builder $rejection,
-        Node\Expr|Builder $state,
+        Builder|Node\Expr $code,
+        Builder|Node\Expr $extractor,
+        Builder|Node\Expr $rejection,
+        Builder|Node\Expr $state,
     ): self {
         $this->steps[] = fn (Node\Expr $runtime) => new Node\Expr\MethodCall(
             var: $runtime,
@@ -36,10 +36,10 @@ public function addExtractor(
     }
 
     public function addTransformer(
-        Node\Expr|Builder $code,
-        Node\Expr|Builder $transformer,
-        Node\Expr|Builder $rejection,
-        Node\Expr|Builder $state,
+        Builder|Node\Expr $code,
+        Builder|Node\Expr $transformer,
+        Builder|Node\Expr $rejection,
+        Builder|Node\Expr $state,
     ): self {
         $this->steps[] = fn (Node\Expr $runtime) => new Node\Expr\MethodCall(
             var: $runtime,
@@ -56,10 +56,10 @@ public function addTransformer(
     }
 
     public function addLoader(
-        Node\Expr|Builder $code,
-        Node\Expr|Builder $loader,
-        Node\Expr|Builder $rejection,
-        Node\Expr|Builder $state,
+        Builder|Node\Expr $code,
+        Builder|Node\Expr $loader,
+        Builder|Node\Expr $rejection,
+        Builder|Node\Expr $state,
     ): self {
         $this->steps[] = fn (Node\Expr $runtime) => new Node\Expr\MethodCall(
             var: $runtime,

diff --git a/src/Builder/Repository/API.php b/src/Builder/Repository/API.php
@@ -17,7 +17,7 @@ final class API implements Configurator\RepositoryInterface
 
     public function __construct(private readonly Satellite\Builder\API $builder) {}
 
-    public function addFiles(Packaging\FileInterface|Packaging\DirectoryInterface ...$files): Configurator\RepositoryInterface
+    public function addFiles(Packaging\DirectoryInterface|Packaging\FileInterface ...$files): Configurator\RepositoryInterface
     {
         array_push($this->files, ...$files);
 

diff --git a/src/Builder/Repository/Action.php b/src/Builder/Repository/Action.php
@@ -17,7 +17,7 @@ final class Action implements Configurator\RepositoryInterface
 
     public function __construct(private readonly Satellite\Builder\Action $builder) {}
 
-    public function addFiles(Packaging\FileInterface|Packaging\DirectoryInterface ...$files): Configurator\RepositoryInterface
+    public function addFiles(Packaging\DirectoryInterface|Packaging\FileInterface ...$files): Configurator\RepositoryInterface
     {
         array_push($this->files, ...$files);