Skip to content

Add serialize_rejection to the yaml key #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion .github/workflows/quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Action/Custom/Factory/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand All @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Action/Custom/Factory/Repository/RepositoryTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions src/Action/Custom/Service.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand All @@ -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;
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Action/SFTP/Factory/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand All @@ -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;
}
}
Expand All @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Action/SFTP/Factory/Repository/Repository.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Action/SFTP/Service.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand All @@ -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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/Docker/Satellite.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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;
}
Expand All @@ -34,7 +34,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);

Expand Down
10 changes: 5 additions & 5 deletions src/Adapter/Docker/SatelliteBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>> */
Expand Down Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/Filesystem/Satellite.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
10 changes: 5 additions & 5 deletions src/Adapter/Filesystem/SatelliteBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>> */
Expand Down Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/Tar/Satellite.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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);

Expand Down
10 changes: 5 additions & 5 deletions src/Adapter/Tar/SatelliteBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>> */
Expand Down Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/Builder/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
18 changes: 9 additions & 9 deletions src/Builder/Pipeline.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ public function __construct(
) {}

public function addExtractor(
Node\Expr|Builder $extractor,
Node\Expr|Builder $rejection,
Node\Expr|Builder $state,
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,
Expand All @@ -34,9 +34,9 @@ public function addExtractor(
}

public function addTransformer(
Node\Expr|Builder $transformer,
Node\Expr|Builder $rejection,
Node\Expr|Builder $state,
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,
Expand All @@ -52,9 +52,9 @@ public function addTransformer(
}

public function addLoader(
Node\Expr|Builder $loader,
Node\Expr|Builder $rejection,
Node\Expr|Builder $state,
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,
Expand Down
2 changes: 1 addition & 1 deletion src/Builder/Repository/API.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/Builder/Repository/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/Builder/Repository/Hook.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ final class Hook implements Configurator\RepositoryInterface

public function __construct(private readonly Satellite\Builder\Hook $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);

Expand Down
2 changes: 1 addition & 1 deletion src/Builder/Repository/Pipeline.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ final class Pipeline implements Configurator\RepositoryInterface

public function __construct(private readonly Satellite\Builder\Pipeline $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);

Expand Down
2 changes: 1 addition & 1 deletion src/Builder/Repository/Workflow.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ final class Workflow implements Configurator\RepositoryInterface

public function __construct(private readonly Satellite\Builder\Workflow $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);

Expand Down
2 changes: 1 addition & 1 deletion src/Cloud/Console/Command/CreateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O

try {
$configuration = $service->normalize($configuration);
} catch (Config\Definition\Exception\InvalidTypeException|Config\Definition\Exception\InvalidConfigurationException $exception) {
} catch (Config\Definition\Exception\InvalidConfigurationException|Config\Definition\Exception\InvalidTypeException $exception) {
$style->error($exception->getMessage());

return self::FAILURE;
Expand Down
2 changes: 1 addition & 1 deletion src/Cloud/Console/Command/RemoveCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O

try {
$configuration = $service->normalize($configuration);
} catch (Config\Definition\Exception\InvalidTypeException|Config\Definition\Exception\InvalidConfigurationException $exception) {
} catch (Config\Definition\Exception\InvalidConfigurationException|Config\Definition\Exception\InvalidTypeException $exception) {
$style->error($exception->getMessage());

return self::FAILURE;
Expand Down
2 changes: 1 addition & 1 deletion src/Cloud/Console/Command/UpdateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O

try {
$configuration = $service->normalize($configuration);
} catch (Config\Definition\Exception\InvalidTypeException|Config\Definition\Exception\InvalidConfigurationException $exception) {
} catch (Config\Definition\Exception\InvalidConfigurationException|Config\Definition\Exception\InvalidTypeException $exception) {
$style->error($exception->getMessage());

return self::FAILURE;
Expand Down
2 changes: 1 addition & 1 deletion src/Console/Command/BuildCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O

try {
$configuration = $service->normalize($configuration);
} catch (Config\Definition\Exception\InvalidTypeException|Config\Definition\Exception\InvalidConfigurationException $exception) {
} catch (Config\Definition\Exception\InvalidConfigurationException|Config\Definition\Exception\InvalidTypeException $exception) {
$style->error($exception->getMessage());

return 255;
Expand Down
2 changes: 1 addition & 1 deletion src/Console/Command/ValidateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O

try {
$configuration = $service->normalize($configuration);
} catch (Config\Definition\Exception\InvalidTypeException|Config\Definition\Exception\InvalidConfigurationException $exception) {
} catch (Config\Definition\Exception\InvalidConfigurationException|Config\Definition\Exception\InvalidTypeException $exception) {
$style->error($exception->getMessage());

return 255;
Expand Down
Loading