diff --git a/src/Action/Action.php b/src/Action/Action.php index 14897c9c..1896093d 100644 --- a/src/Action/Action.php +++ b/src/Action/Action.php @@ -33,7 +33,7 @@ public function __invoke(array $config, ActionBuilder $action, RepositoryInterfa $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 @@ public function __invoke(array $config, ActionBuilder $action, RepositoryInterfa $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'), ); } diff --git a/src/Action/ConfigurationApplier.php b/src/Action/ConfigurationApplier.php index 014be7b1..1dcc4011 100644 --- a/src/Action/ConfigurationApplier.php +++ b/src/Action/ConfigurationApplier.php @@ -10,7 +10,7 @@ final class ConfigurationApplier { - private ?Satellite\Action\Action $action = null; + private ?Action $action = null; private array $packages = []; public function __construct( @@ -22,7 +22,7 @@ public function __construct( 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; } diff --git a/src/Action/Custom/Factory/Action.php b/src/Action/Custom/Factory/Action.php index 2780917c..97cf083c 100644 --- a/src/Action/Custom/Factory/Action.php +++ b/src/Action/Custom/Factory/Action.php @@ -63,18 +63,18 @@ public function validate(array $config): bool /** * @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( diff --git a/src/Action/Custom/Service.php b/src/Action/Custom/Service.php index a7694a1c..0bc55314 100644 --- a/src/Action/Custom/Service.php +++ b/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 @@ public function __construct( private ExpressionLanguage $interpreter = new Satellite\ExpressionLanguage() ) { $this->processor = new Processor(); - $this->configuration = new Custom\Configuration(); + $this->configuration = new Configuration(); } public function interpreter(): ExpressionLanguage @@ -78,7 +77,7 @@ public function compile(array $config): Configurator\RepositoryInterface } } - $actionFactory = new Custom\Factory\Action($this->interpreter); + $actionFactory = new Factory\Action($this->interpreter); return $actionFactory->compile($config); } diff --git a/src/Action/SFTP/Builder/Action.php b/src/Action/SFTP/Builder/Action.php index 89a9ad5b..ea0ca1b5 100644 --- 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/Adapter/ComposerFailureException.php b/src/Adapter/ComposerFailureException.php index ab012812..dcf19b37 100644 --- a/src/Adapter/ComposerFailureException.php +++ b/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); } diff --git a/src/Adapter/Docker/SatelliteBuilder.php b/src/Adapter/Docker/SatelliteBuilder.php index 1ad2594c..e50c58c1 100644 --- 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 */ 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> */ private iterable $paths = []; /** @var \AppendIterator> */ @@ -67,7 +67,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; @@ -77,7 +77,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); @@ -92,7 +92,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->paths[] = [$source->getPath(), $destinationPath ?? $source->getPath()]; diff --git a/src/Adapter/FactoryInterface.php b/src/Adapter/FactoryInterface.php index 75554601..f0bd9a07 100644 --- a/src/Adapter/FactoryInterface.php +++ b/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'); diff --git a/src/Adapter/Filesystem/SatelliteBuilder.php b/src/Adapter/Filesystem/SatelliteBuilder.php index 1a400c38..8e2c4e13 100644 --- 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\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> */ private iterable $paths = []; /** @var \AppendIterator> */ @@ -55,7 +55,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; @@ -65,7 +65,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); @@ -80,7 +80,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->paths[] = [$source->getPath(), $destinationPath ?? $source->getPath()]; diff --git a/src/Adapter/Tar/SatelliteBuilder.php b/src/Adapter/Tar/SatelliteBuilder.php index 68c89afd..650b9511 100644 --- a/src/Adapter/Tar/SatelliteBuilder.php +++ b/src/Adapter/Tar/SatelliteBuilder.php @@ -13,8 +13,8 @@ final class SatelliteBuilder implements Configurator\SatelliteBuilderInterface { /** @var iterable */ 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> */ private readonly iterable $files; /** @var array> */ @@ -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)); diff --git a/src/Builder/API/APIRuntime.php b/src/Builder/API/APIRuntime.php index 84f36637..824392df 100644 --- a/src/Builder/API/APIRuntime.php +++ b/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') ) ), ] diff --git a/src/Builder/API/PipelineBuilder.php b/src/Builder/API/PipelineBuilder.php index 967d928a..66d43659 100644 --- a/src/Builder/API/PipelineBuilder.php +++ b/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' => [ diff --git a/src/Builder/Hook/HookRuntime.php b/src/Builder/Hook/HookRuntime.php index f9cce9fa..fff2d7bf 100644 --- a/src/Builder/Hook/HookRuntime.php +++ b/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') ) ), ] diff --git a/src/Builder/Hook/PipelineBuilder.php b/src/Builder/Hook/PipelineBuilder.php index 957659ef..88768417 100644 --- a/src/Builder/Hook/PipelineBuilder.php +++ b/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' => [ diff --git a/src/Builder/Pipeline/ConsoleRuntime.php b/src/Builder/Pipeline/ConsoleRuntime.php index 1c42e17f..62aae9c4 100644 --- a/src/Builder/Pipeline/ConsoleRuntime.php +++ b/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'), ) ), ], diff --git a/src/Builder/Workflow.php b/src/Builder/Workflow.php index 478eb825..8107075c 100644 --- a/src/Builder/Workflow.php +++ b/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)), diff --git a/src/Builder/Workflow/ActionBuilder.php b/src/Builder/Workflow/ActionBuilder.php index 62fa9924..2c136b13 100644 --- a/src/Builder/Workflow/ActionBuilder.php +++ b/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' => [ diff --git a/src/Builder/Workflow/PipelineBuilder.php b/src/Builder/Workflow/PipelineBuilder.php index f9a4485f..c8762e31 100644 --- a/src/Builder/Workflow/PipelineBuilder.php +++ b/src/Builder/Workflow/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\\Pipeline\\PipelineRuntimeInterface'), + type: new Node\Name\FullyQualified('Kiboko\Component\Runtime\Pipeline\PipelineRuntimeInterface'), ), ], 'stmts' => [ diff --git a/src/Builder/Workflow/WorkflowRuntime.php b/src/Builder/Workflow/WorkflowRuntime.php index 7e97f832..01bf89a8 100644 --- a/src/Builder/Workflow/WorkflowRuntime.php +++ b/src/Builder/Workflow/WorkflowRuntime.php @@ -12,20 +12,20 @@ final class WorkflowRuntime implements Builder public function getNode(): Node\Expr { return new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\Workflow\\Console'), + class: new Node\Name\FullyQualified('Kiboko\Component\Runtime\Workflow\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( 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'), ) ), ], diff --git a/src/Cloud/Auth.php b/src/Cloud/Auth.php index 838a87b1..d88cd87c 100644 --- a/src/Cloud/Auth.php +++ b/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/'; diff --git a/src/Cloud/CommandBus.php b/src/Cloud/CommandBus.php index ce856758..2cf8e03c 100644 --- a/src/Cloud/CommandBus.php +++ b/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), ]); } diff --git a/src/Cloud/DTO/JobList.php b/src/Cloud/DTO/JobList.php index 6dc57b87..c19c7821 100644 --- a/src/Cloud/DTO/JobList.php +++ b/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) { diff --git a/src/Cloud/Normalizer/ExpressionNormalizer.php b/src/Cloud/Normalizer/ExpressionNormalizer.php index 3d26e4e7..a4f62820 100644 --- a/src/Cloud/Normalizer/ExpressionNormalizer.php +++ b/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; } diff --git a/src/ConfigLoader.php b/src/ConfigLoader.php index f299dfe0..d0045329 100644 --- a/src/ConfigLoader.php +++ b/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); diff --git a/src/ExpressionLanguage/ExpressionLanguage.php b/src/ExpressionLanguage/ExpressionLanguage.php index 391fe305..99f955ad 100644 --- a/src/ExpressionLanguage/ExpressionLanguage.php +++ b/src/ExpressionLanguage/ExpressionLanguage.php @@ -9,7 +9,7 @@ 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, diff --git a/src/ExpressionLanguage/File.php b/src/ExpressionLanguage/File.php index 8abfedc3..7ac8daf9 100644 --- a/src/ExpressionLanguage/File.php +++ b/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); diff --git a/src/ExpressionLanguage/Open.php b/src/ExpressionLanguage/Open.php new file mode 100644 index 00000000..e119e7fb --- /dev/null +++ b/src/ExpressionLanguage/Open.php @@ -0,0 +1,38 @@ +applicationName), diff --git a/src/Feature/Logger/Builder/Monolog/ElasticSearchBuilder.php b/src/Feature/Logger/Builder/Monolog/ElasticSearchBuilder.php index 53e79c75..29c731ac 100644 --- a/src/Feature/Logger/Builder/Monolog/ElasticSearchBuilder.php +++ b/src/Feature/Logger/Builder/Monolog/ElasticSearchBuilder.php @@ -57,7 +57,7 @@ public function getNode(): Node\Expr value: new Node\Expr\MethodCall( var: new Node\Expr\MethodCall( var: new Node\Expr\StaticCall( - class: new Node\Name\FullyQualified('Elasticsearch\\ClientBuilder'), + class: new Node\Name\FullyQualified('Elasticsearch\ClientBuilder'), name: new Node\Identifier('create'), ), name: new Node\Identifier('setHosts'), @@ -98,7 +98,7 @@ class: new Node\Name\FullyQualified('Elasticsearch\\ClientBuilder'), } $instance = new Node\Expr\New_( - class: new Node\Name\FullyQualified('Monolog\\Handler\\ElasticsearchHandler'), + class: new Node\Name\FullyQualified('Monolog\Handler\ElasticsearchHandler'), args: $arguments, ); diff --git a/src/Feature/Logger/Builder/Monolog/GelfBuilder.php b/src/Feature/Logger/Builder/Monolog/GelfBuilder.php index c5f91540..ef0849c1 100644 --- a/src/Feature/Logger/Builder/Monolog/GelfBuilder.php +++ b/src/Feature/Logger/Builder/Monolog/GelfBuilder.php @@ -25,7 +25,7 @@ public function withLevel(string $level): self return $this; } - public function withTCPTransport(string $host = null, int $port = null): self + public function withTCPTransport(?string $host = null, ?int $port = null): self { $this->transport = 'tcp'; $this->host = $host; @@ -34,7 +34,7 @@ public function withTCPTransport(string $host = null, int $port = null): self return $this; } - public function withAMQPTransport(string $queue, string $channel, string $vhost, string $host = null, int $port = null, float $timeout = null): self + public function withAMQPTransport(string $queue, string $channel, string $vhost, ?string $host = null, ?int $port = null, ?float $timeout = null): self { $this->transport = 'amqp'; $this->queue = $queue; @@ -68,7 +68,7 @@ public function getNode(): Node\Expr if (null !== $this->level) { $arguments[] = new Node\Arg( value: new Node\Expr\New_( - class: new Node\Name\FullyQualified('Gelf\\Publisher'), + class: new Node\Name\FullyQualified('Gelf\Publisher'), args: [ new Node\Arg( value: $this->buildTransport(), @@ -81,7 +81,7 @@ class: new Node\Name\FullyQualified('Gelf\\Publisher'), } $instance = new Node\Expr\New_( - class: new Node\Name\FullyQualified('Monolog\\Handler\\GelfHandler'), + class: new Node\Name\FullyQualified('Monolog\Handler\GelfHandler'), args: $arguments, ); @@ -126,7 +126,7 @@ private function buildTCPTransport(): Node\Expr } return new Node\Expr\New_( - class: new Node\Name\FullyQualified('Gelf\\Transport\\TcpTransport'), + class: new Node\Name\FullyQualified('Gelf\Transport\TcpTransport'), args: $arguments, ); } @@ -202,7 +202,7 @@ class: new Node\Name\FullyQualified('AMQPConnection'), new Node\Stmt\Return_( new Node\Expr\New_( - class: new Node\Name\FullyQualified('Gelf\\Transport\\AmqpTransport'), + class: new Node\Name\FullyQualified('Gelf\Transport\AmqpTransport'), args: [ new Node\Arg( value: new Node\Expr\New_( diff --git a/src/Feature/Logger/Builder/Monolog/StreamBuilder.php b/src/Feature/Logger/Builder/Monolog/StreamBuilder.php index 5a4e427b..ea9a4b45 100644 --- a/src/Feature/Logger/Builder/Monolog/StreamBuilder.php +++ b/src/Feature/Logger/Builder/Monolog/StreamBuilder.php @@ -76,7 +76,7 @@ public function getNode(): Node\Expr } $instance = new Node\Expr\New_( - class: new Node\Name\FullyQualified('Monolog\\Handler\\StreamHandler'), + class: new Node\Name\FullyQualified('Monolog\Handler\StreamHandler'), args: $arguments, ); diff --git a/src/Feature/Logger/Builder/Monolog/SyslogBuilder.php b/src/Feature/Logger/Builder/Monolog/SyslogBuilder.php index be583dd3..20c6f644 100644 --- a/src/Feature/Logger/Builder/Monolog/SyslogBuilder.php +++ b/src/Feature/Logger/Builder/Monolog/SyslogBuilder.php @@ -76,7 +76,7 @@ public function getNode(): Node\Expr } $instance = new Node\Expr\New_( - class: new Node\Name\FullyQualified('Monolog\\Handler\\SyslogHandler'), + class: new Node\Name\FullyQualified('Monolog\Handler\SyslogHandler'), args: $arguments, ); diff --git a/src/Feature/Logger/Builder/Monolog/TestBuilder.php b/src/Feature/Logger/Builder/Monolog/TestBuilder.php index afe3ac3c..9e8ca816 100644 --- a/src/Feature/Logger/Builder/Monolog/TestBuilder.php +++ b/src/Feature/Logger/Builder/Monolog/TestBuilder.php @@ -11,7 +11,7 @@ public function getNode(): Node\Expr { return new Node\Expr\New_( - class: new Node\Name\FullyQualified('Monolog\\Handler\\TestHandler'), + class: new Node\Name\FullyQualified('Monolog\Handler\TestHandler'), ); } } diff --git a/src/Feature/Logger/Builder/MonologLogger.php b/src/Feature/Logger/Builder/MonologLogger.php index 6bc89885..2fae53b7 100644 --- a/src/Feature/Logger/Builder/MonologLogger.php +++ b/src/Feature/Logger/Builder/MonologLogger.php @@ -33,7 +33,7 @@ public function withProcessors(Node\Expr ...$processors): self public function getNode(): Node\Expr { $instance = new Node\Expr\New_( - class: new Node\Name\FullyQualified('Monolog\\Logger'), + class: new Node\Name\FullyQualified('Monolog\Logger'), args: [ new Node\Arg( new Node\Scalar\String_($this->channel) @@ -62,7 +62,7 @@ class: new Node\Name\FullyQualified('Monolog\\Logger'), args: [ new Node\Arg( new Node\Expr\New_( - class: new Node\Name\FullyQualified('Monolog\\Processor\\PsrLogMessageProcessor') + class: new Node\Name\FullyQualified('Monolog\Processor\PsrLogMessageProcessor') ) ), ], @@ -74,7 +74,7 @@ class: new Node\Name\FullyQualified('Monolog\\Processor\\PsrLogMessageProcessor' args: [ new Node\Arg( new Node\Expr\New_( - class: new Node\Name\FullyQualified('Monolog\\Processor\\MemoryUsageProcessor') + class: new Node\Name\FullyQualified('Monolog\Processor\MemoryUsageProcessor') ) ), ], diff --git a/src/Feature/Logger/Factory/ElasticSearchFactory.php b/src/Feature/Logger/Factory/ElasticSearchFactory.php index 4e681b5a..7e265448 100644 --- a/src/Feature/Logger/Factory/ElasticSearchFactory.php +++ b/src/Feature/Logger/Factory/ElasticSearchFactory.php @@ -53,7 +53,7 @@ public function validate(array $config): bool return false; } - public function compile(array $config): Logger\Factory\Repository\ElasticSearchRepository + public function compile(array $config): Repository\ElasticSearchRepository { $builder = new Logger\Builder\Monolog\ElasticSearchBuilder($this->interpreter); @@ -69,6 +69,6 @@ public function compile(array $config): Logger\Factory\Repository\ElasticSearchR $builder->withIndex($config['index']); } - return new Logger\Factory\Repository\ElasticSearchRepository($builder); + return new Repository\ElasticSearchRepository($builder); } } diff --git a/src/Feature/Logger/Factory/GelfFactory.php b/src/Feature/Logger/Factory/GelfFactory.php index d510c07d..c7017afe 100644 --- a/src/Feature/Logger/Factory/GelfFactory.php +++ b/src/Feature/Logger/Factory/GelfFactory.php @@ -50,7 +50,7 @@ public function validate(array $config): bool return false; } - public function compile(array $config): Logger\Factory\Repository\GelfRepository + public function compile(array $config): Repository\GelfRepository { $builder = new Logger\Builder\Monolog\GelfBuilder(); @@ -74,6 +74,6 @@ public function compile(array $config): Logger\Factory\Repository\GelfRepository ); } - return new Logger\Factory\Repository\GelfRepository($builder); + return new Repository\GelfRepository($builder); } } diff --git a/src/Feature/Logger/Factory/StreamFactory.php b/src/Feature/Logger/Factory/StreamFactory.php index 2c98d56c..0048058d 100644 --- a/src/Feature/Logger/Factory/StreamFactory.php +++ b/src/Feature/Logger/Factory/StreamFactory.php @@ -50,7 +50,7 @@ public function validate(array $config): bool return false; } - public function compile(array $config): Logger\Factory\Repository\StreamRepository + public function compile(array $config): Repository\StreamRepository { $builder = new Logger\Builder\Monolog\StreamBuilder($config['path']); @@ -66,6 +66,6 @@ public function compile(array $config): Logger\Factory\Repository\StreamReposito $builder->withLocking($config['use_locking']); } - return new Logger\Factory\Repository\StreamRepository($builder); + return new Repository\StreamRepository($builder); } } diff --git a/src/Feature/Logger/Factory/SyslogFactory.php b/src/Feature/Logger/Factory/SyslogFactory.php index 30d9fd6e..9d2ad46c 100644 --- a/src/Feature/Logger/Factory/SyslogFactory.php +++ b/src/Feature/Logger/Factory/SyslogFactory.php @@ -50,7 +50,7 @@ public function validate(array $config): bool return false; } - public function compile(array $config): Logger\Factory\Repository\SyslogRepository + public function compile(array $config): Repository\SyslogRepository { $builder = new Logger\Builder\Monolog\SyslogBuilder($config['ident']); @@ -66,6 +66,6 @@ public function compile(array $config): Logger\Factory\Repository\SyslogReposito $builder->withLogopts($config['logopts']); } - return new Logger\Factory\Repository\SyslogRepository($builder); + return new Repository\SyslogRepository($builder); } } diff --git a/src/Feature/Rejection/Builder/RabbitMQBuilder.php b/src/Feature/Rejection/Builder/RabbitMQBuilder.php index 145a55cb..49ddb595 100644 --- a/src/Feature/Rejection/Builder/RabbitMQBuilder.php +++ b/src/Feature/Rejection/Builder/RabbitMQBuilder.php @@ -66,14 +66,14 @@ public function getNode(): Node\Expr ); return new Node\Expr\StaticCall( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Flow\\RabbitMQ\\Rejection'), + class: new Node\Name\FullyQualified('Kiboko\Component\Flow\RabbitMQ\Rejection'), name: new Identifier('withAuthentication'), args: $args, ); } return new Node\Expr\StaticCall( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Flow\\RabbitMQ\\Rejection'), + class: new Node\Name\FullyQualified('Kiboko\Component\Flow\RabbitMQ\Rejection'), name: new Identifier('withoutAuthentication'), args: $args, ); diff --git a/src/Feature/Rejection/Builder/Rejection.php b/src/Feature/Rejection/Builder/Rejection.php index 2732ecb3..57ffcc3c 100644 --- 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') + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\NullRejection') ); } diff --git a/src/Feature/Rejection/Factory/RabbitMQFactory.php b/src/Feature/Rejection/Factory/RabbitMQFactory.php index 66813ca4..7de68b4f 100644 --- a/src/Feature/Rejection/Factory/RabbitMQFactory.php +++ b/src/Feature/Rejection/Factory/RabbitMQFactory.php @@ -55,7 +55,7 @@ public function validate(array $config): bool return false; } - public function compile(array $config): Rejection\Factory\Repository\RabbitMQRepository + public function compile(array $config): Repository\RabbitMQRepository { $builder = new Rejection\Builder\RabbitMQBuilder( stepUuid: compileValueWhenExpression($this->interpreter, uniqid()), @@ -76,6 +76,6 @@ public function compile(array $config): Rejection\Factory\Repository\RabbitMQRep $builder->withExchange(compileValueWhenExpression($this->interpreter, $config['exchange'])); } - return new Rejection\Factory\Repository\RabbitMQRepository($builder); + return new Repository\RabbitMQRepository($builder); } } diff --git a/src/Filesystem/Asset/InMemory.php b/src/Filesystem/Asset/InMemory.php index 2cbbe2e0..0657becd 100644 --- a/src/Filesystem/Asset/InMemory.php +++ b/src/Filesystem/Asset/InMemory.php @@ -4,9 +4,9 @@ use Kiboko\Component\Packaging; -trigger_deprecation('php-etl/satellite', '0.1', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\Asset\\InMemory', Packaging\Asset\InMemory::class); +trigger_deprecation('php-etl/satellite', '0.1', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\Asset\InMemory', Packaging\Asset\InMemory::class); /* * @deprecated since Satellite 0.1, use Kiboko\Component\Packaging\Asset\InMemory instead. */ -class_alias(Packaging\Asset\InMemory::class, 'Kiboko\\Component\\Satellite\\Filesystem\\Asset\\InMemory'); +class_alias(Packaging\Asset\InMemory::class, 'Kiboko\Component\Satellite\Filesystem\Asset\InMemory'); diff --git a/src/Filesystem/Asset/LocalFile.php b/src/Filesystem/Asset/LocalFile.php index 293ec7a4..761e4c99 100644 --- a/src/Filesystem/Asset/LocalFile.php +++ b/src/Filesystem/Asset/LocalFile.php @@ -4,9 +4,9 @@ use Kiboko\Component\Packaging; -trigger_deprecation('php-etl/satellite', '0.1', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\Asset\\LocalFile', Packaging\Asset\LocalFile::class); +trigger_deprecation('php-etl/satellite', '0.1', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\Asset\LocalFile', Packaging\Asset\LocalFile::class); /* * @deprecated since Satellite 0.1, use Kiboko\Component\Packaging\Asset\LocalFile instead. */ -class_alias(Packaging\Asset\LocalFile::class, 'Kiboko\\Component\\Satellite\\Filesystem\\Asset\\LocalFile'); +class_alias(Packaging\Asset\LocalFile::class, 'Kiboko\Component\Satellite\Filesystem\Asset\LocalFile'); diff --git a/src/Filesystem/Asset/Resource.php b/src/Filesystem/Asset/Resource.php index c4f040b5..78a01631 100644 --- a/src/Filesystem/Asset/Resource.php +++ b/src/Filesystem/Asset/Resource.php @@ -4,9 +4,9 @@ use Kiboko\Component\Packaging; -trigger_deprecation('php-etl/satellite', '0.1', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\Asset\\Resource', Packaging\Asset\NativeResource::class); +trigger_deprecation('php-etl/satellite', '0.1', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\Asset\Resource', Packaging\Asset\NativeResource::class); /* * @deprecated since Satellite 0.1, use Kiboko\Component\Packaging\Asset\Resource instead. */ -class_alias(Packaging\Asset\NativeResource::class, 'Kiboko\\Component\\Satellite\\Filesystem\\Asset\\Resource'); +class_alias(Packaging\Asset\NativeResource::class, 'Kiboko\Component\Satellite\Filesystem\Asset\Resource'); diff --git a/src/Filesystem/AssetInterface.php b/src/Filesystem/AssetInterface.php index dbc9cfd1..b04f822f 100644 --- a/src/Filesystem/AssetInterface.php +++ b/src/Filesystem/AssetInterface.php @@ -4,9 +4,9 @@ use Kiboko\Contract\Packaging; -trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" interface is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\AssetInterface', Packaging\AssetInterface::class); +trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" interface is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\AssetInterface', Packaging\AssetInterface::class); /* * @deprecated since Satellite 0.1, use Kiboko\Contract\Packaging\AssetInterface instead. */ -class_alias(Packaging\AssetInterface::class, 'Kiboko\\Component\\Satellite\\Filesystem\\AssetInterface'); +class_alias(Packaging\AssetInterface::class, 'Kiboko\Component\Satellite\Filesystem\AssetInterface'); diff --git a/src/Filesystem/Directory.php b/src/Filesystem/Directory.php index 547d68ef..21e4ba1d 100644 --- a/src/Filesystem/Directory.php +++ b/src/Filesystem/Directory.php @@ -4,9 +4,9 @@ use Kiboko\Component\Packaging; -trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\Directory', Packaging\Directory::class); +trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\Directory', Packaging\Directory::class); /* * @deprecated since Satellite 0.1, use Kiboko\Component\Packaging\Directory instead. */ -class_alias(Packaging\Directory::class, 'Kiboko\\Component\\Satellite\\Filesystem\\Directory'); +class_alias(Packaging\Directory::class, 'Kiboko\Component\Satellite\Filesystem\Directory'); diff --git a/src/Filesystem/DirectoryInterface.php b/src/Filesystem/DirectoryInterface.php index 16964078..d4db57b9 100644 --- a/src/Filesystem/DirectoryInterface.php +++ b/src/Filesystem/DirectoryInterface.php @@ -4,9 +4,9 @@ use Kiboko\Contract\Packaging; -trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" interface is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\DirectoryInterface', Packaging\DirectoryInterface::class); +trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" interface is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\DirectoryInterface', Packaging\DirectoryInterface::class); /* * @deprecated since Satellite 0.1, use Kiboko\Contract\Packaging\DirectoryInterface instead. */ -class_alias(Packaging\DirectoryInterface::class, 'Kiboko\\Component\\Satellite\\Filesystem\\DirectoryInterface'); +class_alias(Packaging\DirectoryInterface::class, 'Kiboko\Component\Satellite\Filesystem\DirectoryInterface'); diff --git a/src/Filesystem/File.php b/src/Filesystem/File.php index abb1a565..935da280 100644 --- a/src/Filesystem/File.php +++ b/src/Filesystem/File.php @@ -4,9 +4,9 @@ use Kiboko\Component\Packaging; -trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\File', Packaging\File::class); +trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\File', Packaging\File::class); /* * @deprecated since Satellite 0.1, use Kiboko\Component\Packaging\File instead. */ -class_alias(Packaging\File::class, 'Kiboko\\Component\\Satellite\\Filesystem\\File'); +class_alias(Packaging\File::class, 'Kiboko\Component\Satellite\Filesystem\File'); diff --git a/src/Filesystem/FileInterface.php b/src/Filesystem/FileInterface.php index d5b76e73..7d5ef38c 100644 --- a/src/Filesystem/FileInterface.php +++ b/src/Filesystem/FileInterface.php @@ -4,9 +4,9 @@ use Kiboko\Contract\Packaging; -trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" interface is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\FileInterface', Packaging\FileInterface::class); +trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" interface is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\FileInterface', Packaging\FileInterface::class); /* * @deprecated since Satellite 0.1, use Kiboko\Contract\Packaging\FileInterface instead. */ -class_alias(Packaging\FileInterface::class, 'Kiboko\\Component\\Satellite\\Filesystem\\FileInterface'); +class_alias(Packaging\FileInterface::class, 'Kiboko\Component\Satellite\Filesystem\FileInterface'); diff --git a/src/Filesystem/TarArchive.php b/src/Filesystem/TarArchive.php index cde16df8..bca90783 100644 --- a/src/Filesystem/TarArchive.php +++ b/src/Filesystem/TarArchive.php @@ -4,9 +4,9 @@ use Kiboko\Component\Packaging; -trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\TarArchive', Packaging\TarArchive::class); +trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\TarArchive', Packaging\TarArchive::class); /* * @deprecated since Satellite 0.1, use Kiboko\Component\Packaging\TarArchive instead. */ -class_alias(Packaging\TarArchive::class, 'Kiboko\\Component\\Satellite\\Filesystem\\TarArchive'); +class_alias(Packaging\TarArchive::class, 'Kiboko\Component\Satellite\Filesystem\TarArchive'); diff --git a/src/Filesystem/VirtualDirectory.php b/src/Filesystem/VirtualDirectory.php index 376ceaa3..a7b913a8 100644 --- a/src/Filesystem/VirtualDirectory.php +++ b/src/Filesystem/VirtualDirectory.php @@ -4,9 +4,9 @@ use Kiboko\Component\Packaging; -trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\VirtualDirectory', Packaging\VirtualDirectory::class); +trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\VirtualDirectory', Packaging\VirtualDirectory::class); /* * @deprecated since Satellite 0.1, use Kiboko\Component\Packaging\VirtualDirectory instead. */ -class_alias(Packaging\VirtualDirectory::class, 'Kiboko\\Component\\Satellite\\Filesystem\\VirtualDirectory'); +class_alias(Packaging\VirtualDirectory::class, 'Kiboko\Component\Satellite\Filesystem\VirtualDirectory'); diff --git a/src/Filesystem/VirtualFile.php b/src/Filesystem/VirtualFile.php index de6a2faf..416e6b14 100644 --- a/src/Filesystem/VirtualFile.php +++ b/src/Filesystem/VirtualFile.php @@ -4,9 +4,9 @@ use Kiboko\Component\Packaging; -trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\\Component\\Satellite\\Filesystem\\VirtualFile', Packaging\VirtualFile::class); +trigger_deprecation('php-etl/satellite', '0.2', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\Filesystem\VirtualFile', Packaging\VirtualFile::class); /* * @deprecated since Satellite 0.1, use Kiboko\Component\Packaging\VirtualFile instead. */ -class_alias(Packaging\VirtualFile::class, 'Kiboko\\Component\\Satellite\\Filesystem\\VirtualFile'); +class_alias(Packaging\VirtualFile::class, 'Kiboko\Component\Satellite\Filesystem\VirtualFile'); diff --git a/src/Pipeline/Extractor.php b/src/Pipeline/Extractor.php index 7e8bca76..76b75dee 100644 --- a/src/Pipeline/Extractor.php +++ b/src/Pipeline/Extractor.php @@ -74,7 +74,7 @@ public function __invoke(array $config, Pipeline $pipeline, StepRepositoryInterf $pipeline->addExtractor( new Node\Expr\StaticCall( - new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\StepCode'), + new Node\Name\FullyQualified('Kiboko\Component\Pipeline\StepCode'), new Node\Identifier('fromString'), [ new Node\Arg(new Node\Scalar\String_($code)), diff --git a/src/Pipeline/Loader.php b/src/Pipeline/Loader.php index ff1fa4bb..476c8821 100644 --- 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'), + 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'), + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\NullStepState'), ); } @@ -74,7 +74,7 @@ public function __invoke(array $config, Pipeline $pipeline, StepRepositoryInterf $pipeline->addLoader( new Node\Expr\StaticCall( - new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\StepCode'), + new Node\Name\FullyQualified('Kiboko\Component\Pipeline\StepCode'), new Node\Identifier('fromString'), [ new Node\Arg(new Node\Scalar\String_($code)), diff --git a/src/Pipeline/Transformer.php b/src/Pipeline/Transformer.php index 7b7c3607..e78355dd 100644 --- 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'), + 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'), + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\NullStepState'), ); } @@ -74,7 +74,7 @@ public function __invoke(array $config, Pipeline $pipeline, StepRepositoryInterf $pipeline->addTransformer( new Node\Expr\StaticCall( - new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\StepCode'), + new Node\Name\FullyQualified('Kiboko\Component\Pipeline\StepCode'), new Node\Identifier('fromString'), [ new Node\Arg(new Node\Scalar\String_($code)), diff --git a/src/Plugin/Batching/Builder/Fork.php b/src/Plugin/Batching/Builder/Fork.php index cb23858c..30deb0de 100644 --- 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'), + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\TransformerInterface'), ], 'stmts' => [ new Node\Stmt\ClassMethod( @@ -72,7 +72,7 @@ class: new Node\Stmt\Class_( expr: new Node\Expr\Yield_( new Node\Expr\New_( class: new Node\Name\FullyQualified( - name: 'Kiboko\\Component\\Bucket\\AcceptanceResultBucket' + name: 'Kiboko\Component\Bucket\AcceptanceResultBucket' ), args: [ new Node\Arg( diff --git a/src/Plugin/Batching/Builder/Merge.php b/src/Plugin/Batching/Builder/Merge.php index 54faf87c..08be4fbe 100644 --- 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'), - new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\FlushableInterface'), + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\TransformerInterface'), + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\FlushableInterface'), ], 'stmts' => [ new Node\Stmt\Property( @@ -146,7 +146,7 @@ class: new Node\Stmt\Class_( var: new Node\Expr\Variable('line'), expr: new Node\Expr\Yield_( value: new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\AcceptanceResultBucket'), + class: new Node\Name\FullyQualified('Kiboko\Component\Bucket\AcceptanceResultBucket'), args: [ new Node\Arg( new Node\Expr\PropertyFetch( @@ -192,7 +192,7 @@ class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\AcceptanceResult var: new Node\Expr\Variable('line'), expr: new Node\Expr\Yield_( value: new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\EmptyResultBucket') + class: new Node\Name\FullyQualified('Kiboko\Component\Bucket\EmptyResultBucket') ), ), ), @@ -214,7 +214,7 @@ class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\EmptyResultBucke 'stmts' => [ new Node\Stmt\Return_( expr: new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\AcceptanceResultBucket'), + class: new Node\Name\FullyQualified('Kiboko\Component\Bucket\AcceptanceResultBucket'), args: [ new Node\Arg( new Node\Expr\PropertyFetch( @@ -226,7 +226,7 @@ class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\AcceptanceResult ) ), ], - 'returnType' => new Node\Name\FullyQualified('Kiboko\\Contract\\Bucket\\ResultBucketInterface'), + 'returnType' => new Node\Name\FullyQualified('Kiboko\Contract\Bucket\ResultBucketInterface'), ], ), ], diff --git a/src/Plugin/Custom/Factory/Extractor.php b/src/Plugin/Custom/Factory/Extractor.php index 848688bc..9f96b7b6 100644 --- a/src/Plugin/Custom/Factory/Extractor.php +++ b/src/Plugin/Custom/Factory/Extractor.php @@ -63,18 +63,18 @@ public function validate(array $config): bool /** * @throws Configurator\ConfigurationExceptionInterface */ - public function compile(array $config): Custom\Factory\Repository\Extractor + public function compile(array $config): Repository\Extractor { $containerName = sprintf('ProjectServiceContainer%s', ByteString::fromRandom(8)->toString()); $builder = new Custom\Builder\Extractor( compileValueWhenExpression($this->interpreter, $config['use']), - sprintf('GyroscopsGenerated\\%s', $containerName), + sprintf('GyroscopsGenerated\%s', $containerName), ); $container = (new SatelliteDependencyInjection(...$this->providers))($config); - $repository = new Custom\Factory\Repository\Extractor($builder); + $repository = new Repository\Extractor($builder); $dumper = new PhpDumper($container); $repository->addFiles( diff --git a/src/Plugin/Custom/Factory/Loader.php b/src/Plugin/Custom/Factory/Loader.php index 9fd5d1b3..bdcd4f26 100644 --- a/src/Plugin/Custom/Factory/Loader.php +++ b/src/Plugin/Custom/Factory/Loader.php @@ -63,18 +63,18 @@ public function validate(array $config): bool /** * @throws Configurator\ConfigurationExceptionInterface */ - public function compile(array $config): Custom\Factory\Repository\Loader + public function compile(array $config): Repository\Loader { $containerName = sprintf('ProjectServiceContainer%s', ByteString::fromRandom(8)->toString()); $builder = new Custom\Builder\Loader( compileValueWhenExpression($this->interpreter, $config['use']), - sprintf('GyroscopsGenerated\\%s', $containerName), + sprintf('GyroscopsGenerated\%s', $containerName), ); $container = (new SatelliteDependencyInjection(...$this->providers))($config); - $repository = new Custom\Factory\Repository\Loader($builder); + $repository = new Repository\Loader($builder); $dumper = new PhpDumper($container); $repository->addFiles( diff --git a/src/Plugin/Custom/Factory/Transformer.php b/src/Plugin/Custom/Factory/Transformer.php index e1c29e41..d04624e3 100644 --- a/src/Plugin/Custom/Factory/Transformer.php +++ b/src/Plugin/Custom/Factory/Transformer.php @@ -63,18 +63,18 @@ public function validate(array $config): bool /** * @throws Configurator\ConfigurationExceptionInterface */ - public function compile(array $config): Custom\Factory\Repository\Transformer + public function compile(array $config): Repository\Transformer { $containerName = sprintf('ProjectServiceContainer%s', ByteString::fromRandom(8)->toString()); $builder = new Custom\Builder\Transformer( compileValueWhenExpression($this->interpreter, $config['use']), - sprintf('GyroscopsGenerated\\%s', $containerName), + sprintf('GyroscopsGenerated\%s', $containerName), ); $container = (new SatelliteDependencyInjection(...$this->providers))($config); - $repository = new Custom\Factory\Repository\Transformer($builder); + $repository = new Repository\Transformer($builder); $dumper = new PhpDumper($container); $repository->addFiles( diff --git a/src/Plugin/Custom/Service.php b/src/Plugin/Custom/Service.php index de5fdf72..6e2fe4f4 100644 --- a/src/Plugin/Custom/Service.php +++ b/src/Plugin/Custom/Service.php @@ -5,7 +5,6 @@ namespace Kiboko\Component\Satellite\Plugin\Custom; use Kiboko\Component\Satellite\ExpressionLanguage as Satellite; -use Kiboko\Component\Satellite\Plugin\Custom; use Kiboko\Contract\Configurator; use Symfony\Component\Config\Definition\Exception as Symfony; use Symfony\Component\Config\Definition\Processor; @@ -30,7 +29,7 @@ public function __construct( private ExpressionLanguage $interpreter = new Satellite\ExpressionLanguage() ) { $this->processor = new Processor(); - $this->configuration = new Custom\Configuration(); + $this->configuration = new Configuration(); } public function interpreter(): ExpressionLanguage @@ -83,13 +82,13 @@ public function compile(array $config): Configurator\RepositoryInterface } if (\array_key_exists('extractor', $config)) { - return (new Custom\Factory\Extractor($interpreter, $config['expression_language'] ?? []))->compile($config['extractor']); + return (new Factory\Extractor($interpreter, $config['expression_language'] ?? []))->compile($config['extractor']); } if (\array_key_exists('transformer', $config)) { - return (new Custom\Factory\Transformer($interpreter, $config['expression_language'] ?? []))->compile($config['transformer']); + return (new Factory\Transformer($interpreter, $config['expression_language'] ?? []))->compile($config['transformer']); } if (\array_key_exists('loader', $config)) { - return (new Custom\Factory\Loader($interpreter, $config['expression_language'] ?? []))->compile($config['loader']); + return (new Factory\Loader($interpreter, $config['expression_language'] ?? []))->compile($config['loader']); } throw new \RuntimeException('No possible pipeline step, expecting "extractor", "transformer" or "loader".'); diff --git a/src/Plugin/FTP/Builder/Loader.php b/src/Plugin/FTP/Builder/Loader.php index e4e966ae..65593d9e 100644 --- a/src/Plugin/FTP/Builder/Loader.php +++ b/src/Plugin/FTP/Builder/Loader.php @@ -218,7 +218,7 @@ class: new Node\Stmt\Class_( name: null, subNodes: [ 'implements' => [ - new Node\Name\FullyQualified('Kiboko\\Contract\\Pipeline\\LoaderInterface:'), + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\LoaderInterface:'), ], 'stmts' => [ new Node\Stmt\ClassMethod( @@ -291,7 +291,7 @@ class: new Node\Stmt\Class_( new Node\Expr\Assign( var: new Node\Expr\Variable('bucket'), expr: new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\ComplexResultBucket') + class: new Node\Name\FullyQualified('Kiboko\Component\Bucket\ComplexResultBucket') ) ) ), diff --git a/src/Plugin/FTP/Factory/Loader.php b/src/Plugin/FTP/Factory/Loader.php index f9caa4a7..3d74988d 100644 --- a/src/Plugin/FTP/Factory/Loader.php +++ b/src/Plugin/FTP/Factory/Loader.php @@ -63,7 +63,7 @@ public function compile(array $config): RepositoryInterface && \is_array($config['loader']['servers']) ) { foreach ($config['loader']['servers'] as $server) { - $serverFactory = new FTP\Factory\Server($this->interpreter); + $serverFactory = new Server($this->interpreter); $builder->addServerBasePath(compileValueWhenExpression($this->interpreter, $server['base_path'])); $loader = $serverFactory->compile($server); @@ -87,7 +87,7 @@ public function compile(array $config): RepositoryInterface } try { - return new FTP\Factory\Repository\Repository($builder); + return new Repository\Repository($builder); } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) { throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception); } diff --git a/src/Plugin/FTP/Factory/Server.php b/src/Plugin/FTP/Factory/Server.php index 8bd71dd2..d490bbfc 100644 --- a/src/Plugin/FTP/Factory/Server.php +++ b/src/Plugin/FTP/Factory/Server.php @@ -54,7 +54,7 @@ public function validate(array $config): bool } } - public function compile(array $config): FTP\Factory\Repository\Repository + public function compile(array $config): Repository\Repository { $builder = new FTP\Builder\Server(compileValueWhenExpression($this->interpreter, $config['host']), compileValueWhenExpression($this->interpreter, $config['port']), compileValueWhenExpression($this->interpreter, $config['timeout'])); @@ -74,7 +74,7 @@ public function compile(array $config): FTP\Factory\Repository\Repository $builder->withPassiveMode(compileValueWhenExpression($this->interpreter, $config['passif_mode'])); try { - return new FTP\Factory\Repository\Repository($builder); + return new Repository\Repository($builder); } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) { throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception); } diff --git a/src/Plugin/Filtering/Builder/Drop.php b/src/Plugin/Filtering/Builder/Drop.php index 32ae3f7e..ff7c745d 100644 --- 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'), + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\TransformerInterface'), ], 'stmts' => [ (new Builder\Method('transform')) @@ -122,7 +122,7 @@ class: new Node\Stmt\Class_(null, [ new Node\Expr\Variable('input'), new Node\Expr\Yield_( new Node\Expr\New_( - new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\RejectionResultBucket'), + new Node\Name\FullyQualified('Kiboko\Component\Bucket\RejectionResultBucket'), ), ), ), @@ -136,7 +136,7 @@ class: new Node\Stmt\Class_(null, [ new Node\Expr\Variable('input'), new Node\Expr\Yield_( new Node\Expr\New_( - new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\AcceptanceResultBucket'), + new Node\Name\FullyQualified('Kiboko\Component\Bucket\AcceptanceResultBucket'), [ new Node\Arg(new Node\Expr\Variable('input')), ] diff --git a/src/Plugin/Filtering/Builder/Reject.php b/src/Plugin/Filtering/Builder/Reject.php index 12bfdfb6..c055020e 100644 --- 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'), + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\TransformerInterface'), ], 'stmts' => [ (new Builder\Method('transform')) @@ -122,7 +122,7 @@ class: new Node\Stmt\Class_(null, [ new Node\Expr\Variable('input'), new Node\Expr\Yield_( new Node\Expr\New_( - new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\RejectionResultBucket'), + new Node\Name\FullyQualified('Kiboko\Component\Bucket\RejectionResultBucket'), [ new Node\Arg(new Node\Expr\Variable('input')), ] @@ -139,7 +139,7 @@ class: new Node\Stmt\Class_(null, [ new Node\Expr\Variable('input'), new Node\Expr\Yield_( new Node\Expr\New_( - new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\AcceptanceResultBucket'), + new Node\Name\FullyQualified('Kiboko\Component\Bucket\AcceptanceResultBucket'), [ new Node\Arg(new Node\Expr\Variable('input')), ] diff --git a/src/Plugin/Filtering/Factory/Drop.php b/src/Plugin/Filtering/Factory/Drop.php index 4648a092..0736b536 100644 --- a/src/Plugin/Filtering/Factory/Drop.php +++ b/src/Plugin/Filtering/Factory/Drop.php @@ -59,13 +59,13 @@ public function validate(array $config): bool /** * @throws Configurator\ConfigurationExceptionInterface */ - public function compile(array $config): Filtering\Factory\Repository\Drop + public function compile(array $config): Repository\Drop { $interpreter = clone $this->interpreter; $builder = new Filtering\Builder\Drop(); - $repository = new Filtering\Factory\Repository\Drop($builder); + $repository = new Repository\Drop($builder); foreach ($config as $condition) { $builder->withExclusions( diff --git a/src/Plugin/Filtering/Factory/Reject.php b/src/Plugin/Filtering/Factory/Reject.php index 3de1a3c8..73cb67a0 100644 --- a/src/Plugin/Filtering/Factory/Reject.php +++ b/src/Plugin/Filtering/Factory/Reject.php @@ -59,13 +59,13 @@ public function validate(array $config): bool /** * @throws Configurator\ConfigurationExceptionInterface */ - public function compile(array $config): Filtering\Factory\Repository\Reject + public function compile(array $config): Repository\Reject { $interpreter = clone $this->interpreter; $builder = new Filtering\Builder\Reject(); - $repository = new Filtering\Factory\Repository\Reject($builder); + $repository = new Repository\Reject($builder); foreach ($config as $condition) { $builder->withExclusions( diff --git a/src/Plugin/Filtering/Service.php b/src/Plugin/Filtering/Service.php index 364773a1..525ef830 100644 --- a/src/Plugin/Filtering/Service.php +++ b/src/Plugin/Filtering/Service.php @@ -5,7 +5,6 @@ namespace Kiboko\Component\Satellite\Plugin\Filtering; use Kiboko\Component\Satellite\ExpressionLanguage as Satellite; -use Kiboko\Component\Satellite\Plugin\Filtering; use Kiboko\Contract\Configurator; use Symfony\Component\Config\Definition\Exception as Symfony; use Symfony\Component\Config\Definition\Processor; @@ -26,7 +25,7 @@ public function __construct( private ExpressionLanguage $interpreter = new Satellite\ExpressionLanguage() ) { $this->processor = new Processor(); - $this->configuration = new Filtering\Configuration(); + $this->configuration = new Configuration(); } public function interpreter(): ExpressionLanguage @@ -79,11 +78,11 @@ public function compile(array $config): Configurator\RepositoryInterface } if (\array_key_exists('reject', $config)) { - return (new Filtering\Factory\Reject($interpreter, $config['expression_language'] ?? []))->compile($config['reject']); + return (new Factory\Reject($interpreter, $config['expression_language'] ?? []))->compile($config['reject']); } if (\array_key_exists('drop', $config)) { - return (new Filtering\Factory\Drop($interpreter, $config['expression_language'] ?? []))->compile($config['drop']); + return (new Factory\Drop($interpreter, $config['expression_language'] ?? []))->compile($config['drop']); } throw new \RuntimeException('No possible pipeline step, expecting "extractor", "transformer" or "loader".'); diff --git a/src/Plugin/SFTP/Builder/Extractor.php b/src/Plugin/SFTP/Builder/Extractor.php index 3f362576..e5fbff3f 100644 --- 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'), + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\LoaderInterface'), ], 'stmts' => [ new Node\Stmt\ClassMethod( @@ -137,7 +137,7 @@ class: new Node\Stmt\Class_( new Node\Expr\Assign( var: new Node\Expr\Variable('bucket'), expr: new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\ComplexResultBucket') + class: new Node\Name\FullyQualified('Kiboko\Component\Bucket\ComplexResultBucket') ) ) ), diff --git a/src/Plugin/SFTP/Builder/Loader.php b/src/Plugin/SFTP/Builder/Loader.php index 7f1629c4..2bc566f2 100644 --- 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'), + new Node\Name\FullyQualified('Kiboko\Contract\Pipeline\LoaderInterface'), ], 'stmts' => [ new Node\Stmt\ClassMethod( @@ -137,7 +137,7 @@ class: new Node\Stmt\Class_( new Node\Expr\Assign( var: new Node\Expr\Variable('bucket'), expr: new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\ComplexResultBucket') + class: new Node\Name\FullyQualified('Kiboko\Component\Bucket\ComplexResultBucket') ) ) ), diff --git a/src/Plugin/SFTP/Builder/Server.php b/src/Plugin/SFTP/Builder/Server.php index dbbef64c..1e90198f 100644 --- a/src/Plugin/SFTP/Builder/Server.php +++ b/src/Plugin/SFTP/Builder/Server.php @@ -77,7 +77,7 @@ public function withPasswordAuthentication(Node\Expr $username, Node\Expr $passw return $this; } - public function withPrivateKeyAuthentication(Node\Expr $username, Node\Expr $publicKey, Node\Expr $privateKey, Node\Expr $privateKeyPassphrase = null): self + public function withPrivateKeyAuthentication(Node\Expr $username, Node\Expr $publicKey, Node\Expr $privateKey, ?Node\Expr $privateKeyPassphrase = null): self { $this->username = $username; $this->publicKey = $publicKey; diff --git a/src/Plugin/SFTP/Factory/Extractor.php b/src/Plugin/SFTP/Factory/Extractor.php index 0d5ea13d..dc4e97ed 100644 --- a/src/Plugin/SFTP/Factory/Extractor.php +++ b/src/Plugin/SFTP/Factory/Extractor.php @@ -63,7 +63,7 @@ public function compile(array $config): Repository && \is_array($config['loader']['servers']) ) { foreach ($config['loader']['servers'] as $server) { - $serverFactory = new SFTP\Factory\Server($this->interpreter); + $serverFactory = new Server($this->interpreter); $loader = $serverFactory->compile($server); $serverBuilder = $loader->getBuilder(); diff --git a/src/Plugin/SFTP/Factory/Loader.php b/src/Plugin/SFTP/Factory/Loader.php index 6ef47e8b..e24b3611 100644 --- a/src/Plugin/SFTP/Factory/Loader.php +++ b/src/Plugin/SFTP/Factory/Loader.php @@ -63,7 +63,7 @@ public function compile(array $config): Repository && \is_array($config['loader']['servers']) ) { foreach ($config['loader']['servers'] as $server) { - $serverFactory = new SFTP\Factory\Server($this->interpreter); + $serverFactory = new Server($this->interpreter); $loader = $serverFactory->compile($server); $serverBuilder = $loader->getBuilder(); diff --git a/src/Plugin/SFTP/Factory/Server.php b/src/Plugin/SFTP/Factory/Server.php index 1a2f7d02..2dc65062 100644 --- a/src/Plugin/SFTP/Factory/Server.php +++ b/src/Plugin/SFTP/Factory/Server.php @@ -54,7 +54,7 @@ public function validate(array $config): bool } } - public function compile(array $config): SFTP\Factory\Repository\Repository + public function compile(array $config): Repository\Repository { $builder = new SFTP\Builder\Server(compileValueWhenExpression($this->interpreter, $config['host']), compileValueWhenExpression($this->interpreter, $config['port'])); @@ -83,7 +83,7 @@ public function compile(array $config): SFTP\Factory\Repository\Repository } try { - return new SFTP\Factory\Repository\Repository($builder); + return new Repository\Repository($builder); } catch (Symfony\InvalidConfigurationException|Symfony\InvalidTypeException $exception) { throw new Configurator\InvalidConfigurationException(message: $exception->getMessage(), previous: $exception); } diff --git a/src/Plugin/Stream/Builder/DebugLoader.php b/src/Plugin/Stream/Builder/DebugLoader.php index dfda9007..7c4ecbfd 100644 --- a/src/Plugin/Stream/Builder/DebugLoader.php +++ b/src/Plugin/Stream/Builder/DebugLoader.php @@ -41,7 +41,7 @@ public function withState(Node\Expr $state): self public function getNode(): Node { return new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\Loader\\DebugLoader'), + class: new Node\Name\FullyQualified('Kiboko\Component\Pipeline\Loader\DebugLoader'), args: [ new Node\Arg( value: new Node\Expr\FuncCall( diff --git a/src/Plugin/Stream/Builder/JSONStreamLoader.php b/src/Plugin/Stream/Builder/JSONStreamLoader.php index cdae743d..08ca50d3 100644 --- a/src/Plugin/Stream/Builder/JSONStreamLoader.php +++ b/src/Plugin/Stream/Builder/JSONStreamLoader.php @@ -41,7 +41,7 @@ public function withState(Node\Expr $state): self public function getNode(): Node { return new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\Loader\\JSONStreamLoader'), + class: new Node\Name\FullyQualified('Kiboko\Component\Pipeline\Loader\JSONStreamLoader'), args: [ new Node\Arg( value: new Node\Expr\FuncCall( diff --git a/src/Plugin/Stream/Builder/StderrLoader.php b/src/Plugin/Stream/Builder/StderrLoader.php index cc10c56b..28c0e9c6 100644 --- a/src/Plugin/Stream/Builder/StderrLoader.php +++ b/src/Plugin/Stream/Builder/StderrLoader.php @@ -37,7 +37,7 @@ public function withState(Node\Expr $state): self public function getNode(): Node { return new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\Loader\\StderrLoader'), + class: new Node\Name\FullyQualified('Kiboko\Component\Pipeline\Loader\StderrLoader'), ); } } diff --git a/src/Plugin/Stream/Builder/StdoutLoader.php b/src/Plugin/Stream/Builder/StdoutLoader.php index 4cceec34..7b178274 100644 --- a/src/Plugin/Stream/Builder/StdoutLoader.php +++ b/src/Plugin/Stream/Builder/StdoutLoader.php @@ -37,7 +37,7 @@ public function withState(Node\Expr $state): self public function getNode(): Node { return new Node\Expr\New_( - class: new Node\Name\FullyQualified('Kiboko\\Component\\Pipeline\\Loader\\StdoutLoader'), + class: new Node\Name\FullyQualified('Kiboko\Component\Pipeline\Loader\StdoutLoader'), ); } } diff --git a/src/Runtime/Api/Runtime.php b/src/Runtime/Api/Runtime.php index b038ad4a..f8e7abe9 100644 --- a/src/Runtime/Api/Runtime.php +++ b/src/Runtime/Api/Runtime.php @@ -53,14 +53,14 @@ public function build(Builder $builder): array ), ), new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('FastRoute'), 'NikiFastRoute')]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\\FastRoute'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\\Utils\\Dispatcher'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\\Uuid'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\\BasePath'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\\RequestHandler'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Nyholm\\Psr7'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Nyholm\\Psr7Server'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Laminas\\HttpHandlerRunner\\Emitter\\SapiEmitter'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\FastRoute'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\Utils\Dispatcher'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\Uuid'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\BasePath'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\RequestHandler'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Nyholm\Psr7'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Nyholm\Psr7Server'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Laminas\HttpHandlerRunner\Emitter\SapiEmitter'))]), new Node\Stmt\Return_( new Node\Expr\Closure( @@ -69,7 +69,7 @@ public function build(Builder $builder): array 'params' => [ new Node\Param( var: new Node\Expr\Variable('runtime'), - type: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\API\\APIRuntime'), + type: new Node\Name\FullyQualified('Kiboko\Component\Runtime\API\APIRuntime'), ), ], 'stmts' => $this->buildAPIClosure($builder), @@ -85,14 +85,14 @@ public function buildAPIClosure(Builder $builder): array new Node\Stmt\Expression( new Node\Expr\Assign( new Node\Expr\Variable('psr17Factory'), - new Node\Expr\New_(new Node\Name('Psr7\\Factory\\Psr17Factory')), + new Node\Expr\New_(new Node\Name('Psr7\Factory\Psr17Factory')), ), ), new Node\Stmt\Expression( new Node\Expr\Assign( new Node\Expr\Variable('creator'), new Node\Expr\New_( - new Node\Name('Psr7Server\\ServerRequestCreator'), + new Node\Name('Psr7Server\ServerRequestCreator'), [ new Node\Arg(new Node\Expr\Variable('psr17Factory')), new Node\Arg(new Node\Expr\Variable('psr17Factory')), @@ -116,7 +116,7 @@ public function buildAPIClosure(Builder $builder): array new Node\Expr\Assign( new Node\Expr\Variable('fastRouteDispatcher'), new Node\Expr\FuncCall( - new Node\Name('NikiFastRoute\\simpleDispatcher'), + new Node\Name('NikiFastRoute\simpleDispatcher'), [ new Node\Arg( new Node\Expr\Closure([ @@ -124,7 +124,7 @@ public function buildAPIClosure(Builder $builder): array new Node\Param( new Node\Expr\Variable('router'), null, - new Node\Name('NikiFastRoute\\RouteCollector') + new Node\Name('NikiFastRoute\RouteCollector') ), ], 'uses' => [ diff --git a/src/Runtime/Authorization.php b/src/Runtime/Authorization.php index 10dafb0b..8406b670 100644 --- a/src/Runtime/Authorization.php +++ b/src/Runtime/Authorization.php @@ -35,7 +35,7 @@ private function buildBasic(array $users) } return new Node\Expr\New_( - new Node\Name('Tuupola\\Middleware\\HttpBasicAuthentication'), + new Node\Name('Tuupola\Middleware\HttpBasicAuthentication'), [ new Node\Arg( value: new Node\Expr\Array_( @@ -56,7 +56,7 @@ private function buildBasic(array $users) private function buildJwt(string $secret) { return new Node\Expr\New_( - new Node\Name('Tuupola\\Middleware\\JwtAuthentication'), + new Node\Name('Tuupola\Middleware\JwtAuthentication'), [ new Node\Arg( value: new Node\Expr\Array_( diff --git a/src/Runtime/HttpHook/Runtime.php b/src/Runtime/HttpHook/Runtime.php index 683a5d79..719e435b 100644 --- a/src/Runtime/HttpHook/Runtime.php +++ b/src/Runtime/HttpHook/Runtime.php @@ -51,7 +51,7 @@ public function build(Builder $builder): array 'params' => [ new Node\Param( var: new Node\Expr\Variable('runtime'), - type: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\Hook\\HookRuntime'), + type: new Node\Name\FullyQualified('Kiboko\Component\Runtime\Hook\HookRuntime'), ), ], 'stmts' => $this->buildHookClosure($builder), @@ -73,12 +73,12 @@ private function buildAutoload() type: Node\Expr\Include_::TYPE_REQUIRE ), ), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\\BasePath'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\\Utils\\Dispatcher'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\\Uuid'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Nyholm\\Psr7'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Nyholm\\Psr7Server'))]), - new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Laminas\\HttpHandlerRunner\\Emitter\\SapiEmitter'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\BasePath'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\Utils\Dispatcher'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Middlewares\Uuid'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Nyholm\Psr7'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Nyholm\Psr7Server'))]), + new Node\Stmt\Use_([new Node\Stmt\UseUse(new Node\Name('Laminas\HttpHandlerRunner\Emitter\SapiEmitter'))]), ]; } @@ -88,14 +88,14 @@ private function buildHookClosure(Builder $builder) new Node\Stmt\Expression( expr: new Node\Expr\Assign( var: new Node\Expr\Variable('psr17Factory'), - expr: new Node\Expr\New_(new Node\Name('Psr7\\Factory\\Psr17Factory')), + expr: new Node\Expr\New_(new Node\Name('Psr7\Factory\Psr17Factory')), ), ), new Node\Stmt\Expression( expr: new Node\Expr\Assign( var: new Node\Expr\Variable('creator'), expr: new Node\Expr\New_( - class: new Node\Name('Psr7Server\\ServerRequestCreator'), + class: new Node\Name('Psr7Server\ServerRequestCreator'), args: [ new Node\Arg(new Node\Expr\Variable('psr17Factory')), new Node\Arg(new Node\Expr\Variable('psr17Factory')), diff --git a/src/Runtime/Pipeline/Runtime.php b/src/Runtime/Pipeline/Runtime.php index 19b68910..6a0381f6 100644 --- a/src/Runtime/Pipeline/Runtime.php +++ b/src/Runtime/Pipeline/Runtime.php @@ -52,7 +52,7 @@ public function build(Builder $builder): array 'params' => [ new Node\Param( var: new Node\Expr\Variable('runtime'), - type: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\Pipeline\\PipelineRuntimeInterface'), + type: new Node\Name\FullyQualified('Kiboko\Component\Runtime\Pipeline\PipelineRuntimeInterface'), ), ], 'stmts' => [ diff --git a/src/Runtime/RuntimeChoice.php b/src/Runtime/RuntimeChoice.php index 3dccba45..8d0feb8a 100644 --- a/src/Runtime/RuntimeChoice.php +++ b/src/Runtime/RuntimeChoice.php @@ -17,18 +17,18 @@ public function __construct( ) { } - public function __invoke(array $configuration): Satellite\Runtime\RuntimeInterface + public function __invoke(array $configuration): RuntimeInterface { $satellite = ($this->adapterChoice)($configuration)->build(); if (\array_key_exists('http_api', $configuration)) { - $factory = new Satellite\Runtime\Api\Factory(); + $factory = new Api\Factory(); } elseif (\array_key_exists('http_hook', $configuration)) { - $factory = new Satellite\Runtime\HttpHook\Factory(); + $factory = new HttpHook\Factory(); } elseif (\array_key_exists('pipeline', $configuration)) { - $factory = new Satellite\Runtime\Pipeline\Factory(); + $factory = new Pipeline\Factory(); } elseif (\array_key_exists('workflow', $configuration)) { - $factory = new Satellite\Runtime\Workflow\Factory(); + $factory = new Workflow\Factory(); } else { throw new \RuntimeException('No compatible runtime was found for your satellite configuration.'); } diff --git a/src/Runtime/Workflow/Runtime.php b/src/Runtime/Workflow/Runtime.php index 55f96256..730976eb 100644 --- a/src/Runtime/Workflow/Runtime.php +++ b/src/Runtime/Workflow/Runtime.php @@ -50,7 +50,7 @@ public function build(Builder $builder): array 'params' => [ new Node\Param( var: new Node\Expr\Variable('runtime'), - type: new Node\Name\FullyQualified('Kiboko\\Component\\Runtime\\Workflow\\WorkflowRuntimeInterface'), + type: new Node\Name\FullyQualified('Kiboko\Component\Runtime\Workflow\WorkflowRuntimeInterface'), ), ], 'stmts' => [ diff --git a/src/SatelliteBuilderInterface.php b/src/SatelliteBuilderInterface.php index b10011a0..5f069476 100644 --- a/src/SatelliteBuilderInterface.php +++ b/src/SatelliteBuilderInterface.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\\SatelliteBuilderInterface', Kiboko\Contract\Configurator\SatelliteBuilderInterface::class); +trigger_deprecation('php-etl/satellite', '0.4', 'The "%s" interface is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\SatelliteBuilderInterface', Kiboko\Contract\Configurator\SatelliteBuilderInterface::class); /* * @deprecated since Satellite 0.4, use Kiboko\Contract\Configurator\SatelliteBuilderInterface instead. */ -class_alias(Kiboko\Contract\Configurator\SatelliteBuilderInterface::class, 'Kiboko\\Component\\Satellite\\SatelliteBuilderInterface'); +class_alias(Kiboko\Contract\Configurator\SatelliteBuilderInterface::class, 'Kiboko\Component\Satellite\SatelliteBuilderInterface'); diff --git a/src/SatelliteInterface.php b/src/SatelliteInterface.php index 646776d0..b0210186 100644 --- a/src/SatelliteInterface.php +++ b/src/SatelliteInterface.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\\SatelliteInterface', Kiboko\Contract\Configurator\SatelliteInterface::class); +trigger_deprecation('php-etl/satellite', '0.4', 'The "%s" interface is deprecated, use "%s" instead.', 'Kiboko\Component\Satellite\SatelliteInterface', Kiboko\Contract\Configurator\SatelliteInterface::class); /* * @deprecated since Satellite 0.4, use Kiboko\Contract\Configurator\SatelliteInterface instead. */ -class_alias(Kiboko\Contract\Configurator\SatelliteInterface::class, 'Kiboko\\Component\\Satellite\\SatelliteInterface'); +class_alias(Kiboko\Contract\Configurator\SatelliteInterface::class, 'Kiboko\Component\Satellite\SatelliteInterface'); diff --git a/src/Service.php b/src/Service.php index e73fe8b2..d72448f0 100644 --- a/src/Service.php +++ b/src/Service.php @@ -18,7 +18,7 @@ final class Service implements Configurator\FactoryInterface { private readonly Processor $processor; - private readonly Satellite\Configuration $configuration; + private readonly Configuration $configuration; private readonly ExpressionLanguage $interpreter; /** @var array */ private array $adapters = []; @@ -35,16 +35,16 @@ final class Service implements Configurator\FactoryInterface /** @var array */ private array $actionPlugins = []; - public function __construct(ExpressionLanguage $expressionLanguage = null) + public function __construct(?ExpressionLanguage $expressionLanguage = null) { $this->processor = new Processor(); - $this->configuration = new Satellite\Configuration(); + $this->configuration = new Configuration(); $this->interpreter = $expressionLanguage ?? new Satellite\ExpressionLanguage\ExpressionLanguage(); } - public function adapterChoice(): Satellite\Adapter\AdapterChoice + public function adapterChoice(): Adapter\AdapterChoice { - return new Satellite\Adapter\AdapterChoice($this->adapters); + return new Adapter\AdapterChoice($this->adapters); } private function addAdapter(Configurator\Adapter $attribute, Configurator\Adapter\FactoryInterface $adapter): self @@ -55,7 +55,7 @@ private function addAdapter(Configurator\Adapter $attribute, Configurator\Adapte return $this; } - private function addRuntime(Configurator\Runtime $attribute, Satellite\Runtime\FactoryInterface $runtime): self + private function addRuntime(Configurator\Runtime $attribute, Runtime\FactoryInterface $runtime): self { $this->runtimes[$attribute->name] = $runtime; $this->configuration->addRuntime($attribute->name, $runtime->configuration()); @@ -87,7 +87,7 @@ private function addPipelinePlugin( $this->configuration->addPlugin($attribute->name, $plugin->configuration()); $this->pipelines[$attribute->name] = $plugin; - $this->plugins[$attribute->name] = $applier = new Satellite\Pipeline\ConfigurationApplier($attribute->name, $plugin, $plugin->interpreter()); + $this->plugins[$attribute->name] = $applier = new Pipeline\ConfigurationApplier($attribute->name, $plugin, $plugin->interpreter()); $applier->withPackages(...$attribute->dependencies); foreach ($attribute->steps as $step) { @@ -112,7 +112,7 @@ private function addAction( $this->configuration->addAction($attribute->name, $action->configuration()); $this->actions[$attribute->name] = $action; - $this->actionPlugins[$attribute->name] = $applier = new Satellite\Action\ConfigurationApplier($attribute->name, $action, $action->interpreter()); + $this->actionPlugins[$attribute->name] = $applier = new Action\ConfigurationApplier($attribute->name, $action, $action->interpreter()); $applier->withPackages(...$attribute->dependencies); $applier->withAction(); @@ -128,14 +128,14 @@ public function registerAdapters(Configurator\Adapter\FactoryInterface ...$adapt foreach (expectAttributes($adapter, Configurator\Adapter::class) as $attribute) { $this->addAdapter($attribute, $adapter); } - } catch (Satellite\MissingAttributeException) { + } catch (MissingAttributeException) { } } return $this; } - public function registerRuntimes(Satellite\Runtime\FactoryInterface ...$runtimes): self + public function registerRuntimes(Runtime\FactoryInterface ...$runtimes): self { foreach ($runtimes as $runtime) { /** @var Configurator\Runtime $attribute */ @@ -225,13 +225,13 @@ public function compile(array $config): Configurator\RepositoryInterface throw new \LogicException('Not implemented'); } - private function compileWorkflow(array $config): Satellite\Builder\Repository\Workflow + private function compileWorkflow(array $config): Builder\Repository\Workflow { - $workflow = new Satellite\Builder\Workflow( + $workflow = new Builder\Workflow( new Node\Expr\Variable('runtime') ); - $repository = new Satellite\Builder\Repository\Workflow($workflow); + $repository = new Builder\Repository\Workflow($workflow); $repository->addPackages( 'php-etl/satellite-contracts:>=0.1.1 <0.2', @@ -274,7 +274,7 @@ private function compileWorkflow(array $config): Satellite\Builder\Repository\Wo 'runtime.php', new Packaging\Asset\AST( new Node\Stmt\Return_( - (new Satellite\Builder\Workflow\WorkflowRuntime())->getNode() + (new Builder\Workflow\WorkflowRuntime())->getNode() ) ) ) @@ -291,7 +291,7 @@ private function compileWorkflow(array $config): Satellite\Builder\Repository\Wo $pipelineFilename, new Packaging\Asset\AST( new Node\Stmt\Return_( - (new Satellite\Builder\Workflow\PipelineBuilder($pipeline->getBuilder()))->getNode() + (new Builder\Workflow\PipelineBuilder($pipeline->getBuilder()))->getNode() ) ) ) @@ -308,7 +308,7 @@ private function compileWorkflow(array $config): Satellite\Builder\Repository\Wo $actionFilename, new Packaging\Asset\AST( new Node\Stmt\Return_( - (new Satellite\Builder\Workflow\ActionBuilder($action->getBuilder()))->getNode() + (new Builder\Workflow\ActionBuilder($action->getBuilder()))->getNode() ) ) ) @@ -323,13 +323,13 @@ private function compileWorkflow(array $config): Satellite\Builder\Repository\Wo return $repository; } - private function compilePipelineJob(array $config): Satellite\Builder\Repository\Pipeline + private function compilePipelineJob(array $config): Builder\Repository\Pipeline { - $pipeline = new Satellite\Builder\Pipeline( + $pipeline = new Builder\Pipeline( new Node\Expr\Variable('runtime'), ); - $repository = new Satellite\Builder\Repository\Pipeline($pipeline); + $repository = new Builder\Repository\Pipeline($pipeline); $repository->addPackages( 'php-etl/satellite-contracts:>=0.1.1 <0.2', @@ -360,13 +360,13 @@ private function compilePipelineJob(array $config): Satellite\Builder\Repository return $repository; } - private function compileActionJob(array $config): Satellite\Builder\Repository\Action + private function compileActionJob(array $config): Builder\Repository\Action { - $action = new Satellite\Builder\Action( + $action = new Builder\Action( new Node\Expr\Variable('runtime'), ); - $repository = new Satellite\Builder\Repository\Action($action); + $repository = new Builder\Repository\Action($action); $actions = array_intersect_key($this->actionPlugins, $config['action']); foreach ($actions as $action) { @@ -376,7 +376,7 @@ private function compileActionJob(array $config): Satellite\Builder\Repository\A return $repository; } - private function compilePipeline(array $config): Satellite\Builder\Repository\Pipeline + private function compilePipeline(array $config): Builder\Repository\Pipeline { $repository = $this->compilePipelineJob($config); @@ -411,7 +411,7 @@ private function compilePipeline(array $config): Satellite\Builder\Repository\Pi 'runtime.php', new Packaging\Asset\AST( new Node\Stmt\Return_( - (new Satellite\Builder\Pipeline\ConsoleRuntime())->getNode() + (new Builder\Pipeline\ConsoleRuntime())->getNode() ) ) ) @@ -420,11 +420,11 @@ private function compilePipeline(array $config): Satellite\Builder\Repository\Pi return $repository; } - private function compileApi(array $config): Satellite\Builder\Repository\API + private function compileApi(array $config): Builder\Repository\API { - $apiBuilder = new Satellite\Builder\API(); + $apiBuilder = new Builder\API(); - $repository = new Satellite\Builder\Repository\API($apiBuilder); + $repository = new Builder\Repository\API($apiBuilder); $pipelineMapping = []; @@ -440,7 +440,7 @@ private function compileApi(array $config): Satellite\Builder\Repository\API $pipelineFilename, new Packaging\Asset\AST( new Node\Stmt\Return_( - (new Satellite\Builder\API\PipelineBuilder($pipeline->getBuilder()))->getNode() + (new Builder\API\PipelineBuilder($pipeline->getBuilder()))->getNode() ) ) ) @@ -492,7 +492,7 @@ private function compileApi(array $config): Satellite\Builder\Repository\API 'hook.php', new Packaging\Asset\AST( new Node\Stmt\Return_( - (new Satellite\Builder\Hook\HookRuntime())->getNode() + (new Builder\Hook\HookRuntime())->getNode() ) ) ) @@ -503,7 +503,7 @@ private function compileApi(array $config): Satellite\Builder\Repository\API 'runtime.php', new Packaging\Asset\AST( new Node\Stmt\Return_( - (new Satellite\Builder\API\APIRuntime())->getNode() + (new Builder\API\APIRuntime())->getNode() ) ) ) @@ -524,11 +524,11 @@ private function compileApi(array $config): Satellite\Builder\Repository\API return $repository; } - private function compileHook(array $config): Satellite\Builder\Repository\Hook + private function compileHook(array $config): Builder\Repository\Hook { - $hookBuilder = new Satellite\Builder\Hook(); + $hookBuilder = new Builder\Hook(); - $repository = new Satellite\Builder\Repository\Hook($hookBuilder); + $repository = new Builder\Repository\Hook($hookBuilder); $repository->addFiles( new Packaging\File( @@ -563,7 +563,7 @@ private function compileHook(array $config): Satellite\Builder\Repository\Hook 'runtime.php', new Packaging\Asset\AST( new Node\Stmt\Return_( - (new Satellite\Builder\Hook\HookRuntime())->getNode() + (new Builder\Hook\HookRuntime())->getNode() ) ) ) @@ -591,7 +591,7 @@ private function compileHook(array $config): Satellite\Builder\Repository\Hook $pipelineFilename, new Packaging\Asset\AST( new Node\Stmt\Return_( - (new Satellite\Builder\Hook\PipelineBuilder($pipeline->getBuilder()))->getNode() + (new Builder\Hook\PipelineBuilder($pipeline->getBuilder()))->getNode() ) ) )