From 27aa39bcfd4439be1a2ebe1d22aef73791159712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Sun, 4 Jun 2023 11:23:46 +0200 Subject: [PATCH 1/7] Replace PHP_CodeSniffer with EasyCodingStandard --- .github/workflows/tests.yml | 4 ++-- .gitignore | 1 - composer.json | 4 ++-- ecs.php | 30 ++++++++++++++++++++++++++++++ phpcs.xml | 25 ------------------------- scripts/tests | 2 +- 6 files changed, 35 insertions(+), 31 deletions(-) create mode 100644 ecs.php delete mode 100644 phpcs.xml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7e34d086..65ae3523 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -57,8 +57,8 @@ jobs: with: php-version: '8.2' symfony-version: '6.2.*' - - name: "Run checkstyle with squizlabs/php_codesniffer" - run: vendor/bin/phpcs + - name: "Run checkstyle with symplify/easy-coding-standard" + run: vendor/bin/ecs conventions: name: "Conventions" diff --git a/.gitignore b/.gitignore index 31a837b7..2a1ccfff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ /.idea/ -/.phpcs-cache /.phpunit.result.cache /tests/.artifacts/ /tests/symfony/var/ diff --git a/composer.json b/composer.json index d0fcbcdf..9b82204a 100644 --- a/composer.json +++ b/composer.json @@ -37,10 +37,10 @@ "phpspec/prophecy-phpunit": "^2.0", "phpstan/phpstan": "^1.4", "phpunit/phpunit": "^9.5", - "squizlabs/php_codesniffer": "^3.6", "symfony/filesystem": "^5.0|^6.0", "symfony/finder": "^5.0|^6.0", - "symfony/process": "^5.0|^6.0" + "symfony/process": "^5.0|^6.0", + "symplify/easy-coding-standard": "^11.3" }, "replace": { "yokai/batch": "self.version", diff --git a/ecs.php b/ecs.php new file mode 100644 index 00000000..df1cae26 --- /dev/null +++ b/ecs.php @@ -0,0 +1,30 @@ +paths([ + __DIR__ . '/src', + __DIR__ . '/tests/convention', + __DIR__ . '/tests/integration', + __DIR__ . '/tests/symfony/src', + __DIR__ . '/tests/symfony/tests', + ]); + + $ecsConfig->sets([ + SetList::STRICT, + SetList::PSR_12, + ]); + + $ecsConfig->ruleWithConfiguration(ForbiddenFunctionsSniff::class, [ + 'forbiddenFunctions' => ['dump' => null, 'dd' => null, 'var_dump' => null, 'die' => null], + ]); + $ecsConfig->ruleWithConfiguration(FunctionDeclarationFixer::class, [ + 'closure_fn_spacing' => 'none', + ]); +}; diff --git a/phpcs.xml b/phpcs.xml deleted file mode 100644 index c38f2be9..00000000 --- a/phpcs.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - src/ - tests/integration - tests/symfony/src - tests/symfony/tests - - - - - - - - - diff --git a/scripts/tests b/scripts/tests index b1608073..ce7a6daa 100755 --- a/scripts/tests +++ b/scripts/tests @@ -16,7 +16,7 @@ install () { } install "php82" "6.2.*" -led in -s php82 -- vendor/bin/phpcs +led in -s php82 -- vendor/bin/ecs led in -s php82 -- vendor/bin/phpstan analyze led in -s php82 -- vendor/bin/phpunit --testsuite=Convention From 440aa85dc4e87d0af50227d97d58a15fba645ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Sun, 4 Jun 2023 11:26:33 +0200 Subject: [PATCH 2/7] Apply CodeStyle from ECS --- src/batch-league-flysystem/src/Job/CopyFilesJob.php | 2 +- src/batch-league-flysystem/src/Job/MoveFilesJob.php | 2 +- src/batch-league-flysystem/tests/Job/CopyFilesJobTest.php | 4 ++-- src/batch-league-flysystem/tests/Job/MoveFilesJobTest.php | 4 ++-- .../tests/Scheduler/FileFoundSchedulerTest.php | 2 +- .../tests/ContainerParameterAccessorTest.php | 2 +- .../tests/Dummy/BufferingMessageBus.php | 2 +- .../tests/LaunchJobMessageHandlerTest.php | 2 +- .../tests/Writer/DispatchEachItemAsMessageWriterTest.php | 2 +- src/batch/src/Job/Item/Writer/ConditionalWriter.php | 2 +- src/batch/src/Registry/JobContainer.php | 2 +- src/batch/src/Storage/FilesystemJobExecutionStorage.php | 4 ++-- src/batch/tests/Event/PostExecuteEventTest.php | 2 +- src/batch/tests/FailureTest.php | 4 ++-- src/batch/tests/Finder/CallbackFinderTest.php | 6 +++--- src/batch/tests/Finder/ClassMapFinderTest.php | 6 +++--- .../tests/Job/Item/Processor/CallbackProcessorTest.php | 2 +- .../tests/Job/Item/Processor/FilterUniqueProcessorTest.php | 2 +- src/batch/tests/Job/Item/Processor/RoutingProcessorTest.php | 2 +- .../tests/Job/Item/Reader/StaticIterableReaderTest.php | 2 +- src/batch/tests/Job/Item/Writer/ConditionalWriterTest.php | 6 +++--- .../Job/Item/Writer/LaunchJobForEachItemWriterTest.php | 4 ++-- .../Job/Item/Writer/LaunchJobForItemsBatchWriterTest.php | 4 ++-- src/batch/tests/Job/Item/Writer/RoutingWriterTest.php | 2 +- src/batch/tests/Job/Item/Writer/SummaryWriterTest.php | 2 +- src/batch/tests/Job/Item/Writer/TransformingWriterTest.php | 4 ++-- .../tests/Job/Parameters/ParentJobExecutionAccessorTest.php | 2 +- .../Job/Parameters/StaticValueParameterAccessorTest.php | 2 +- src/batch/tests/Registry/JobContainerTest.php | 2 +- src/batch/tests/Storage/NullJobExecutionStorageTest.php | 2 +- .../Test/Factory/SequenceJobExecutionIdGeneratorTest.php | 2 +- src/batch/tests/Test/Finder/DummyFinderTest.php | 2 +- src/batch/tests/Test/Job/Item/Writer/InMemoryWriterTest.php | 2 +- .../tests/Test/Storage/InMemoryJobExecutionStorageTest.php | 2 +- src/batch/tests/Trigger/Scheduler/CallbackSchedulerTest.php | 2 +- src/batch/tests/Trigger/Scheduler/TimeSchedulerTest.php | 2 +- tests/convention/Comment/MethodCommentsTest.php | 4 ++-- tests/convention/Dependency/PackagesTest.php | 2 +- tests/convention/Dependency/SourcesTest.php | 4 ++-- tests/integration/DummyJobTest.php | 2 +- tests/integration/FailingDummyJobTest.php | 2 +- tests/integration/JobWithDummyChildrenTest.php | 6 ++---- tests/integration/JobWithDummyItemChildrenTest.php | 2 +- tests/integration/JobWithFailingDummyChidlrenTest.php | 6 ++---- 44 files changed, 61 insertions(+), 65 deletions(-) diff --git a/src/batch-league-flysystem/src/Job/CopyFilesJob.php b/src/batch-league-flysystem/src/Job/CopyFilesJob.php index a50f84c5..ceedaab9 100644 --- a/src/batch-league-flysystem/src/Job/CopyFilesJob.php +++ b/src/batch-league-flysystem/src/Job/CopyFilesJob.php @@ -39,7 +39,7 @@ final public function execute(JobExecution $jobExecution): void throw UnexpectedValueException::type('string|string[]', $config); } - $transformLocation = $this->transformLocation ?? fn ($sourceLocation) => $sourceLocation; + $transformLocation = $this->transformLocation ?? fn($sourceLocation) => $sourceLocation; foreach ($locations as $sourceLocation) { $destinationLocation = $transformLocation($sourceLocation); if (!\is_string($destinationLocation)) { diff --git a/src/batch-league-flysystem/src/Job/MoveFilesJob.php b/src/batch-league-flysystem/src/Job/MoveFilesJob.php index e46bc007..ebc8aba5 100644 --- a/src/batch-league-flysystem/src/Job/MoveFilesJob.php +++ b/src/batch-league-flysystem/src/Job/MoveFilesJob.php @@ -40,7 +40,7 @@ final public function execute(JobExecution $jobExecution): void throw UnexpectedValueException::type('string|string[]', $config); } - $transformLocation = $this->transformLocation ?? fn ($sourceLocation) => $sourceLocation; + $transformLocation = $this->transformLocation ?? fn($sourceLocation) => $sourceLocation; foreach ($locations as $sourceLocation) { $destinationLocation = $transformLocation($sourceLocation); if (!\is_string($destinationLocation)) { diff --git a/src/batch-league-flysystem/tests/Job/CopyFilesJobTest.php b/src/batch-league-flysystem/tests/Job/CopyFilesJobTest.php index 8b029afb..3e018888 100644 --- a/src/batch-league-flysystem/tests/Job/CopyFilesJobTest.php +++ b/src/batch-league-flysystem/tests/Job/CopyFilesJobTest.php @@ -64,7 +64,7 @@ public function testWithPathTransformation(): void $source->write('source-file.txt', 'SOURCE TO BE COPIED'); $destination = new Filesystem(new InMemoryFilesystemAdapter()); $location = new StaticValueParameterAccessor('source-file.txt'); - $transformDestination = fn () => 'destination-file.txt'; + $transformDestination = fn() => 'destination-file.txt'; self::assertFalse( $destination->has('source-file.txt'), @@ -179,7 +179,7 @@ public function testWrongDestinationType(): void $source->write('file.txt', 'FILE'); $destination = new Filesystem(new InMemoryFilesystemAdapter()); $location = new StaticValueParameterAccessor('source'); - $transformation = fn () => null; + $transformation = fn() => null; $job = new CopyFilesJob($location, $source, $destination, $transformation); $job->execute(JobExecution::createRoot('123456', 'phpunit-copy-file')); diff --git a/src/batch-league-flysystem/tests/Job/MoveFilesJobTest.php b/src/batch-league-flysystem/tests/Job/MoveFilesJobTest.php index 0808c38c..7c678ef0 100644 --- a/src/batch-league-flysystem/tests/Job/MoveFilesJobTest.php +++ b/src/batch-league-flysystem/tests/Job/MoveFilesJobTest.php @@ -66,7 +66,7 @@ public function testWithPathTransformation(): void $source->write('source-file.txt', 'SOURCE TO BE MOVED'); $destination = new Filesystem(new InMemoryFilesystemAdapter()); $location = new StaticValueParameterAccessor('source-file.txt'); - $transformDestination = fn () => 'destination-file.txt'; + $transformDestination = fn() => 'destination-file.txt'; self::assertFalse( $destination->has('source-file.txt'), @@ -218,7 +218,7 @@ public function testWrongDestinationType(): void $source->write('file.txt', 'FILE'); $destination = new Filesystem(new InMemoryFilesystemAdapter()); $location = new StaticValueParameterAccessor('source'); - $transformation = fn () => null; + $transformation = fn() => null; $job = new MoveFilesJob($location, $source, $destination, $transformation); $job->execute(JobExecution::createRoot('123456', 'phpunit-move-file')); diff --git a/src/batch-league-flysystem/tests/Scheduler/FileFoundSchedulerTest.php b/src/batch-league-flysystem/tests/Scheduler/FileFoundSchedulerTest.php index dc846fc5..4b0e3434 100644 --- a/src/batch-league-flysystem/tests/Scheduler/FileFoundSchedulerTest.php +++ b/src/batch-league-flysystem/tests/Scheduler/FileFoundSchedulerTest.php @@ -7,8 +7,8 @@ use League\Flysystem\Filesystem; use League\Flysystem\InMemory\InMemoryFilesystemAdapter; use League\Flysystem\UnableToCheckExistence; -use Yokai\Batch\Bridge\League\Flysystem\Scheduler\FileFoundScheduler; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Bridge\League\Flysystem\Scheduler\FileFoundScheduler; use Yokai\Batch\Exception\UnexpectedValueException; use Yokai\Batch\Job\Parameters\StaticValueParameterAccessor; use Yokai\Batch\JobExecution; diff --git a/src/batch-symfony-framework/tests/ContainerParameterAccessorTest.php b/src/batch-symfony-framework/tests/ContainerParameterAccessorTest.php index a52b19ed..3e1d0253 100644 --- a/src/batch-symfony-framework/tests/ContainerParameterAccessorTest.php +++ b/src/batch-symfony-framework/tests/ContainerParameterAccessorTest.php @@ -4,9 +4,9 @@ namespace Yokai\Batch\Tests\Bridge\Symfony\Framework; +use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\Container; use Yokai\Batch\Bridge\Symfony\Framework\ContainerParameterAccessor; -use PHPUnit\Framework\TestCase; use Yokai\Batch\Exception\CannotAccessParameterException; use Yokai\Batch\JobExecution; diff --git a/src/batch-symfony-messenger/tests/Dummy/BufferingMessageBus.php b/src/batch-symfony-messenger/tests/Dummy/BufferingMessageBus.php index 37a99c9f..83fa8762 100644 --- a/src/batch-symfony-messenger/tests/Dummy/BufferingMessageBus.php +++ b/src/batch-symfony-messenger/tests/Dummy/BufferingMessageBus.php @@ -26,7 +26,7 @@ public function dispatch(object $message, array $stamps = []): Envelope */ public function getMessages(): array { - return \array_map(fn (Envelope $envelope) => $envelope->getMessage(), $this->envelopes); + return \array_map(fn(Envelope $envelope) => $envelope->getMessage(), $this->envelopes); } /** diff --git a/src/batch-symfony-messenger/tests/LaunchJobMessageHandlerTest.php b/src/batch-symfony-messenger/tests/LaunchJobMessageHandlerTest.php index ecec6f2d..344d9457 100644 --- a/src/batch-symfony-messenger/tests/LaunchJobMessageHandlerTest.php +++ b/src/batch-symfony-messenger/tests/LaunchJobMessageHandlerTest.php @@ -23,7 +23,7 @@ final class LaunchJobMessageHandlerTest extends TestCase public function testInvoke(): void { - $job = new class implements JobInterface { + $job = new class() implements JobInterface { public JobExecution $execution; public function execute(JobExecution $jobExecution): void { diff --git a/src/batch-symfony-messenger/tests/Writer/DispatchEachItemAsMessageWriterTest.php b/src/batch-symfony-messenger/tests/Writer/DispatchEachItemAsMessageWriterTest.php index 7e6fa5cd..b573d1a4 100644 --- a/src/batch-symfony-messenger/tests/Writer/DispatchEachItemAsMessageWriterTest.php +++ b/src/batch-symfony-messenger/tests/Writer/DispatchEachItemAsMessageWriterTest.php @@ -4,8 +4,8 @@ namespace Yokai\Batch\Tests\Bridge\Symfony\Messenger\Writer; -use Yokai\Batch\Bridge\Symfony\Messenger\Writer\DispatchEachItemAsMessageWriter; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Bridge\Symfony\Messenger\Writer\DispatchEachItemAsMessageWriter; use Yokai\Batch\Exception\UnexpectedValueException; use Yokai\Batch\Tests\Bridge\Symfony\Messenger\Dummy\BufferingMessageBus; use Yokai\Batch\Tests\Bridge\Symfony\Messenger\Dummy\DummyMessage; diff --git a/src/batch/src/Job/Item/Writer/ConditionalWriter.php b/src/batch/src/Job/Item/Writer/ConditionalWriter.php index 1c563871..8089b65d 100644 --- a/src/batch/src/Job/Item/Writer/ConditionalWriter.php +++ b/src/batch/src/Job/Item/Writer/ConditionalWriter.php @@ -4,11 +4,11 @@ namespace Yokai\Batch\Job\Item\Writer; +use Closure; use Yokai\Batch\Job\Item\ElementConfiguratorTrait; use Yokai\Batch\Job\Item\FlushableInterface; use Yokai\Batch\Job\Item\InitializableInterface; use Yokai\Batch\Job\Item\ItemWriterInterface; -use Closure; use Yokai\Batch\Job\JobExecutionAwareInterface; use Yokai\Batch\Job\JobExecutionAwareTrait; diff --git a/src/batch/src/Registry/JobContainer.php b/src/batch/src/Registry/JobContainer.php index ffbf0ae6..672f8838 100644 --- a/src/batch/src/Registry/JobContainer.php +++ b/src/batch/src/Registry/JobContainer.php @@ -30,7 +30,7 @@ public function get(string $id): JobInterface { if (!isset($this->jobs[$id])) { $message = \sprintf('You have requested a non-existent job "%s".', $id); - throw new class ($message) extends Exception implements NotFoundExceptionInterface { + throw new class($message) extends Exception implements NotFoundExceptionInterface { }; } diff --git a/src/batch/src/Storage/FilesystemJobExecutionStorage.php b/src/batch/src/Storage/FilesystemJobExecutionStorage.php index b7804a0c..0f12a12e 100644 --- a/src/batch/src/Storage/FilesystemJobExecutionStorage.php +++ b/src/batch/src/Storage/FilesystemJobExecutionStorage.php @@ -114,12 +114,12 @@ public function query(Query $query): iterable } $names = $query->jobs(); - if (count($names) > 0 && !in_array($execution->getJobName(), $names)) { + if (count($names) > 0 && !in_array($execution->getJobName(), $names, true)) { continue; } $ids = $query->ids(); - if (count($ids) > 0 && !in_array($execution->getId(), $ids)) { + if (count($ids) > 0 && !in_array($execution->getId(), $ids, true)) { continue; } diff --git a/src/batch/tests/Event/PostExecuteEventTest.php b/src/batch/tests/Event/PostExecuteEventTest.php index 82cacd46..a44c4e1a 100644 --- a/src/batch/tests/Event/PostExecuteEventTest.php +++ b/src/batch/tests/Event/PostExecuteEventTest.php @@ -4,8 +4,8 @@ namespace Yokai\Batch\Tests\Event; -use Yokai\Batch\Event\PostExecuteEvent; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Event\PostExecuteEvent; use Yokai\Batch\JobExecution; class PostExecuteEventTest extends TestCase diff --git a/src/batch/tests/FailureTest.php b/src/batch/tests/FailureTest.php index bfa965ae..046678f3 100644 --- a/src/batch/tests/FailureTest.php +++ b/src/batch/tests/FailureTest.php @@ -39,7 +39,7 @@ public function test( public function failures(): Generator { yield [ - fn () => Failure::fromException( + fn() => Failure::fromException( new LogicException('I will fail because of {var}'), ['{var}' => 'test var'] ), @@ -53,7 +53,7 @@ public function failures(): Generator 'I will fail because of test var' ]; yield [ - fn () => Failure::fromException( + fn() => Failure::fromException( new RuntimeException('This is a test', 123, new LogicException('Previous exception')) ), 'RuntimeException', diff --git a/src/batch/tests/Finder/CallbackFinderTest.php b/src/batch/tests/Finder/CallbackFinderTest.php index d0e76d4c..4ae6a9f3 100644 --- a/src/batch/tests/Finder/CallbackFinderTest.php +++ b/src/batch/tests/Finder/CallbackFinderTest.php @@ -11,11 +11,11 @@ class CallbackFinderTest extends TestCase { public function test(): void { - $integers = new class { + $integers = new class() { }; - $numbers = new class { + $numbers = new class() { }; - $default = new class { + $default = new class() { }; $finder = new CallbackFinder([ [fn($subject) => \is_int($subject), $integers], diff --git a/src/batch/tests/Finder/ClassMapFinderTest.php b/src/batch/tests/Finder/ClassMapFinderTest.php index 06fbffa3..f4f0e52b 100644 --- a/src/batch/tests/Finder/ClassMapFinderTest.php +++ b/src/batch/tests/Finder/ClassMapFinderTest.php @@ -17,11 +17,11 @@ class ClassMapFinderTest extends TestCase { public function test(): void { - $dates = new class { + $dates = new class() { }; - $exceptions = new class { + $exceptions = new class() { }; - $default = new class { + $default = new class() { }; $finder = new ClassMapFinder([DateTimeInterface::class => $dates, Throwable::class => $exceptions], $default); diff --git a/src/batch/tests/Job/Item/Processor/CallbackProcessorTest.php b/src/batch/tests/Job/Item/Processor/CallbackProcessorTest.php index e676a497..530dd898 100644 --- a/src/batch/tests/Job/Item/Processor/CallbackProcessorTest.php +++ b/src/batch/tests/Job/Item/Processor/CallbackProcessorTest.php @@ -4,8 +4,8 @@ namespace Yokai\Batch\Tests\Job\Item\Processor; -use Yokai\Batch\Job\Item\Processor\CallbackProcessor; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Job\Item\Processor\CallbackProcessor; class CallbackProcessorTest extends TestCase { diff --git a/src/batch/tests/Job/Item/Processor/FilterUniqueProcessorTest.php b/src/batch/tests/Job/Item/Processor/FilterUniqueProcessorTest.php index 02a7f477..06219ca6 100644 --- a/src/batch/tests/Job/Item/Processor/FilterUniqueProcessorTest.php +++ b/src/batch/tests/Job/Item/Processor/FilterUniqueProcessorTest.php @@ -6,9 +6,9 @@ use ArrayIterator; use Generator; +use PHPUnit\Framework\TestCase; use Yokai\Batch\Job\Item\Exception\SkipItemException; use Yokai\Batch\Job\Item\Processor\FilterUniqueProcessor; -use PHPUnit\Framework\TestCase; class FilterUniqueProcessorTest extends TestCase { diff --git a/src/batch/tests/Job/Item/Processor/RoutingProcessorTest.php b/src/batch/tests/Job/Item/Processor/RoutingProcessorTest.php index 6bf65628..46da4636 100644 --- a/src/batch/tests/Job/Item/Processor/RoutingProcessorTest.php +++ b/src/batch/tests/Job/Item/Processor/RoutingProcessorTest.php @@ -6,11 +6,11 @@ use PHPUnit\Framework\TestCase; use Yokai\Batch\Exception\UnexpectedValueException; +use Yokai\Batch\Finder\CallbackFinder; use Yokai\Batch\Job\Item\Processor\CallbackProcessor; use Yokai\Batch\Job\Item\Processor\NullProcessor; use Yokai\Batch\Job\Item\Processor\RoutingProcessor; use Yokai\Batch\JobExecution; -use Yokai\Batch\Finder\CallbackFinder; use Yokai\Batch\Test\Finder\DummyFinder; use Yokai\Batch\Test\Job\Item\Processor\TestDebugProcessor; diff --git a/src/batch/tests/Job/Item/Reader/StaticIterableReaderTest.php b/src/batch/tests/Job/Item/Reader/StaticIterableReaderTest.php index 3d115bb7..653e35c0 100644 --- a/src/batch/tests/Job/Item/Reader/StaticIterableReaderTest.php +++ b/src/batch/tests/Job/Item/Reader/StaticIterableReaderTest.php @@ -28,7 +28,7 @@ public function items(): \Iterator { $items = [1, 2, 3]; - $aggregate = new class ($items) implements \IteratorAggregate { + $aggregate = new class($items) implements \IteratorAggregate { /** * @var array */ diff --git a/src/batch/tests/Job/Item/Writer/ConditionalWriterTest.php b/src/batch/tests/Job/Item/Writer/ConditionalWriterTest.php index 4daf2027..c101612e 100644 --- a/src/batch/tests/Job/Item/Writer/ConditionalWriterTest.php +++ b/src/batch/tests/Job/Item/Writer/ConditionalWriterTest.php @@ -4,8 +4,8 @@ namespace Yokai\Batch\Tests\Job\Item\Writer; -use Yokai\Batch\Job\Item\Writer\ConditionalWriter; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Job\Item\Writer\ConditionalWriter; use Yokai\Batch\JobExecution; use Yokai\Batch\Test\Job\Item\Writer\InMemoryWriter; use Yokai\Batch\Test\Job\Item\Writer\TestDebugWriter; @@ -15,7 +15,7 @@ class ConditionalWriterTest extends TestCase public function testWriteSomething(): void { $writer = new ConditionalWriter( - fn (int $number) => ($number % 2) === 0, + fn(int $number) => ($number % 2) === 0, $debugWriter = new TestDebugWriter($memoryWriter = new InMemoryWriter()) ); @@ -33,7 +33,7 @@ public function testWriteSomething(): void public function testWriteNothing(): void { $writer = new ConditionalWriter( - fn () => false, + fn() => false, $debugWriter = new TestDebugWriter($memoryWriter = new InMemoryWriter()) ); diff --git a/src/batch/tests/Job/Item/Writer/LaunchJobForEachItemWriterTest.php b/src/batch/tests/Job/Item/Writer/LaunchJobForEachItemWriterTest.php index 9b732fa9..997257e8 100644 --- a/src/batch/tests/Job/Item/Writer/LaunchJobForEachItemWriterTest.php +++ b/src/batch/tests/Job/Item/Writer/LaunchJobForEachItemWriterTest.php @@ -4,8 +4,8 @@ namespace Yokai\Batch\Tests\Job\Item\Writer; -use Yokai\Batch\Job\Item\Writer\LaunchJobForEachItemWriter; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Job\Item\Writer\LaunchJobForEachItemWriter; use Yokai\Batch\Job\Item\Writer\LaunchJobForItemsBatchWriter; use Yokai\Batch\JobExecution; use Yokai\Batch\Test\Factory\SequenceJobExecutionIdGenerator; @@ -47,7 +47,7 @@ public function testClosureParameter(): void $writer = new LaunchJobForEachItemWriter( $launcher = new BufferingJobLauncher(new SequenceJobExecutionIdGenerator(['abc', 'def', 'hij', 'klm'])), 'test.launched_job', - fn ($item) => ['itemInLaunchedJob' => $item, 'extraParameter' => 'foo'] + fn($item) => ['itemInLaunchedJob' => $item, 'extraParameter' => 'foo'] ); $writer->setJobExecution($execution = JobExecution::createRoot('123', 'test.launch_for_items_writer')); diff --git a/src/batch/tests/Job/Item/Writer/LaunchJobForItemsBatchWriterTest.php b/src/batch/tests/Job/Item/Writer/LaunchJobForItemsBatchWriterTest.php index b562cedf..144142c6 100644 --- a/src/batch/tests/Job/Item/Writer/LaunchJobForItemsBatchWriterTest.php +++ b/src/batch/tests/Job/Item/Writer/LaunchJobForItemsBatchWriterTest.php @@ -4,8 +4,8 @@ namespace Yokai\Batch\Tests\Job\Item\Writer; -use Yokai\Batch\Job\Item\Writer\LaunchJobForItemsBatchWriter; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Job\Item\Writer\LaunchJobForItemsBatchWriter; use Yokai\Batch\JobExecution; use Yokai\Batch\Test\Factory\SequenceJobExecutionIdGenerator; use Yokai\Batch\Test\Launcher\BufferingJobLauncher; @@ -40,7 +40,7 @@ public function testClosureParameter(): void $writer = new LaunchJobForItemsBatchWriter( $launcher = new BufferingJobLauncher(new SequenceJobExecutionIdGenerator(['456', '789'])), 'test.launched_job', - fn (iterable $items) => ['itemsInLaunchedJob' => $items, 'extraParameter' => 'foo'] + fn(iterable $items) => ['itemsInLaunchedJob' => $items, 'extraParameter' => 'foo'] ); $writer->setJobExecution($execution = JobExecution::createRoot('123', 'test.launch_for_items_writer')); diff --git a/src/batch/tests/Job/Item/Writer/RoutingWriterTest.php b/src/batch/tests/Job/Item/Writer/RoutingWriterTest.php index 25f3045c..0a42263f 100644 --- a/src/batch/tests/Job/Item/Writer/RoutingWriterTest.php +++ b/src/batch/tests/Job/Item/Writer/RoutingWriterTest.php @@ -12,9 +12,9 @@ use Throwable; use Traversable; use Yokai\Batch\Exception\UnexpectedValueException; +use Yokai\Batch\Finder\ClassMapFinder; use Yokai\Batch\Job\Item\Writer\RoutingWriter; use Yokai\Batch\JobExecution; -use Yokai\Batch\Finder\ClassMapFinder; use Yokai\Batch\Test\Finder\DummyFinder; use Yokai\Batch\Test\Job\Item\Writer\InMemoryWriter; use Yokai\Batch\Test\Job\Item\Writer\TestDebugWriter; diff --git a/src/batch/tests/Job/Item/Writer/SummaryWriterTest.php b/src/batch/tests/Job/Item/Writer/SummaryWriterTest.php index 1aab4573..b2c5ae04 100644 --- a/src/batch/tests/Job/Item/Writer/SummaryWriterTest.php +++ b/src/batch/tests/Job/Item/Writer/SummaryWriterTest.php @@ -4,8 +4,8 @@ namespace Yokai\Batch\Tests\Job\Item\Writer; -use Yokai\Batch\Job\Item\Writer\SummaryWriter; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Job\Item\Writer\SummaryWriter; use Yokai\Batch\Job\Parameters\StaticValueParameterAccessor; use Yokai\Batch\JobExecution; diff --git a/src/batch/tests/Job/Item/Writer/TransformingWriterTest.php b/src/batch/tests/Job/Item/Writer/TransformingWriterTest.php index 0f7e8aac..5aab09e0 100644 --- a/src/batch/tests/Job/Item/Writer/TransformingWriterTest.php +++ b/src/batch/tests/Job/Item/Writer/TransformingWriterTest.php @@ -20,7 +20,7 @@ class TransformingWriterTest extends TestCase public function test(): void { $writer = new TransformingWriter( - $debugProcessor = new TestDebugProcessor(new CallbackProcessor(fn ($string) => \strtoupper($string))), + $debugProcessor = new TestDebugProcessor(new CallbackProcessor(fn($string) => \strtoupper($string))), $debugWriter = new TestDebugWriter($innerWriter = new InMemoryWriter()) ); @@ -41,7 +41,7 @@ public function testSkipItems(): void $writer = new TransformingWriter( $debugProcessor = new TestDebugProcessor( new CallbackProcessor( - fn ($item) => throw SkipItemException::withWarning($item, 'Skipped for test purpose') + fn($item) => throw SkipItemException::withWarning($item, 'Skipped for test purpose') ) ), $debugWriter = new TestDebugWriter($innerWriter = new InMemoryWriter()) diff --git a/src/batch/tests/Job/Parameters/ParentJobExecutionAccessorTest.php b/src/batch/tests/Job/Parameters/ParentJobExecutionAccessorTest.php index b9c07ed1..197e657b 100644 --- a/src/batch/tests/Job/Parameters/ParentJobExecutionAccessorTest.php +++ b/src/batch/tests/Job/Parameters/ParentJobExecutionAccessorTest.php @@ -4,10 +4,10 @@ namespace Yokai\Batch\Tests\Job\Parameters; +use PHPUnit\Framework\TestCase; use Yokai\Batch\Exception\CannotAccessParameterException; use Yokai\Batch\Job\Parameters\JobParameterAccessorInterface; use Yokai\Batch\Job\Parameters\ParentJobExecutionAccessor; -use PHPUnit\Framework\TestCase; use Yokai\Batch\JobExecution; class ParentJobExecutionAccessorTest extends TestCase diff --git a/src/batch/tests/Job/Parameters/StaticValueParameterAccessorTest.php b/src/batch/tests/Job/Parameters/StaticValueParameterAccessorTest.php index f8af4ecb..35003707 100644 --- a/src/batch/tests/Job/Parameters/StaticValueParameterAccessorTest.php +++ b/src/batch/tests/Job/Parameters/StaticValueParameterAccessorTest.php @@ -4,8 +4,8 @@ namespace Yokai\Batch\Tests\Job\Parameters; -use Yokai\Batch\Job\Parameters\StaticValueParameterAccessor; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Job\Parameters\StaticValueParameterAccessor; use Yokai\Batch\JobExecution; class StaticValueParameterAccessorTest extends TestCase diff --git a/src/batch/tests/Registry/JobContainerTest.php b/src/batch/tests/Registry/JobContainerTest.php index 3a8bb83b..eb1e759e 100644 --- a/src/batch/tests/Registry/JobContainerTest.php +++ b/src/batch/tests/Registry/JobContainerTest.php @@ -4,11 +4,11 @@ namespace Yokai\Batch\Tests\Registry; +use PHPUnit\Framework\TestCase; use Prophecy\PhpUnit\ProphecyTrait; use Psr\Container\NotFoundExceptionInterface; use Yokai\Batch\Job\JobInterface; use Yokai\Batch\Registry\JobContainer; -use PHPUnit\Framework\TestCase; class JobContainerTest extends TestCase { diff --git a/src/batch/tests/Storage/NullJobExecutionStorageTest.php b/src/batch/tests/Storage/NullJobExecutionStorageTest.php index ed8bc83a..6661bb06 100644 --- a/src/batch/tests/Storage/NullJobExecutionStorageTest.php +++ b/src/batch/tests/Storage/NullJobExecutionStorageTest.php @@ -4,10 +4,10 @@ namespace Yokai\Batch\Tests\Storage; +use PHPUnit\Framework\TestCase; use Yokai\Batch\Exception\JobExecutionNotFoundException; use Yokai\Batch\JobExecution; use Yokai\Batch\Storage\NullJobExecutionStorage; -use PHPUnit\Framework\TestCase; class NullJobExecutionStorageTest extends TestCase { diff --git a/src/batch/tests/Test/Factory/SequenceJobExecutionIdGeneratorTest.php b/src/batch/tests/Test/Factory/SequenceJobExecutionIdGeneratorTest.php index 9198b29c..f81921f9 100644 --- a/src/batch/tests/Test/Factory/SequenceJobExecutionIdGeneratorTest.php +++ b/src/batch/tests/Test/Factory/SequenceJobExecutionIdGeneratorTest.php @@ -4,8 +4,8 @@ namespace Yokai\Batch\Tests\Test\Factory; -use Yokai\Batch\Test\Factory\SequenceJobExecutionIdGenerator; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Test\Factory\SequenceJobExecutionIdGenerator; class SequenceJobExecutionIdGeneratorTest extends TestCase { diff --git a/src/batch/tests/Test/Finder/DummyFinderTest.php b/src/batch/tests/Test/Finder/DummyFinderTest.php index 0af5cb21..a9ae41c4 100644 --- a/src/batch/tests/Test/Finder/DummyFinderTest.php +++ b/src/batch/tests/Test/Finder/DummyFinderTest.php @@ -11,7 +11,7 @@ class DummyFinderTest extends TestCase { public function test(): void { - $dummy = new class { + $dummy = new class() { }; $finder = new DummyFinder($dummy); diff --git a/src/batch/tests/Test/Job/Item/Writer/InMemoryWriterTest.php b/src/batch/tests/Test/Job/Item/Writer/InMemoryWriterTest.php index 17940436..72ead8a4 100644 --- a/src/batch/tests/Test/Job/Item/Writer/InMemoryWriterTest.php +++ b/src/batch/tests/Test/Job/Item/Writer/InMemoryWriterTest.php @@ -4,8 +4,8 @@ namespace Yokai\Batch\Tests\Test\Job\Item\Writer; -use Yokai\Batch\Test\Job\Item\Writer\InMemoryWriter; use PHPUnit\Framework\TestCase; +use Yokai\Batch\Test\Job\Item\Writer\InMemoryWriter; class InMemoryWriterTest extends TestCase { diff --git a/src/batch/tests/Test/Storage/InMemoryJobExecutionStorageTest.php b/src/batch/tests/Test/Storage/InMemoryJobExecutionStorageTest.php index 5915d74a..8eb9ced3 100644 --- a/src/batch/tests/Test/Storage/InMemoryJobExecutionStorageTest.php +++ b/src/batch/tests/Test/Storage/InMemoryJobExecutionStorageTest.php @@ -4,11 +4,11 @@ namespace Yokai\Batch\Tests\Test\Storage; +use PHPUnit\Framework\TestCase; use Yokai\Batch\Exception\CannotRemoveJobExecutionException; use Yokai\Batch\Exception\JobExecutionNotFoundException; use Yokai\Batch\JobExecution; use Yokai\Batch\Test\Storage\InMemoryJobExecutionStorage; -use PHPUnit\Framework\TestCase; class InMemoryJobExecutionStorageTest extends TestCase { diff --git a/src/batch/tests/Trigger/Scheduler/CallbackSchedulerTest.php b/src/batch/tests/Trigger/Scheduler/CallbackSchedulerTest.php index 34e385b0..fd1011d1 100644 --- a/src/batch/tests/Trigger/Scheduler/CallbackSchedulerTest.php +++ b/src/batch/tests/Trigger/Scheduler/CallbackSchedulerTest.php @@ -4,9 +4,9 @@ namespace Yokai\Batch\Tests\Trigger\Scheduler; +use PHPUnit\Framework\TestCase; use Yokai\Batch\JobExecution; use Yokai\Batch\Trigger\Scheduler\CallbackScheduler; -use PHPUnit\Framework\TestCase; use Yokai\Batch\Trigger\Scheduler\ScheduledJob; class CallbackSchedulerTest extends TestCase diff --git a/src/batch/tests/Trigger/Scheduler/TimeSchedulerTest.php b/src/batch/tests/Trigger/Scheduler/TimeSchedulerTest.php index bef11f6e..e1ecb66a 100644 --- a/src/batch/tests/Trigger/Scheduler/TimeSchedulerTest.php +++ b/src/batch/tests/Trigger/Scheduler/TimeSchedulerTest.php @@ -6,10 +6,10 @@ use DateTime; use DateTimeImmutable; +use PHPUnit\Framework\TestCase; use Yokai\Batch\JobExecution; use Yokai\Batch\Trigger\Scheduler\ScheduledJob; use Yokai\Batch\Trigger\Scheduler\TimeScheduler; -use PHPUnit\Framework\TestCase; class TimeSchedulerTest extends TestCase { diff --git a/tests/convention/Comment/MethodCommentsTest.php b/tests/convention/Comment/MethodCommentsTest.php index 220ba7a1..7f74d699 100644 --- a/tests/convention/Comment/MethodCommentsTest.php +++ b/tests/convention/Comment/MethodCommentsTest.php @@ -20,8 +20,8 @@ public function testAllPublicMethodsHasComment(ReflectionMethod $method): void { // Only true comments are relevant, phpdoc is not. $lines = \explode(\PHP_EOL, $method->getDocComment() ?: ''); - $lines = \array_map(fn ($line) => \trim($line, '/* '), $lines); - $lines = \array_filter($lines, fn ($line) => !\str_starts_with($line, '@')); + $lines = \array_map(fn($line) => \trim($line, '/* '), $lines); + $lines = \array_filter($lines, fn($line) => !\str_starts_with($line, '@')); $lines = \array_filter($lines); $comment = \implode(\PHP_EOL, $lines); diff --git a/tests/convention/Dependency/PackagesTest.php b/tests/convention/Dependency/PackagesTest.php index 931117ed..40254ec9 100644 --- a/tests/convention/Dependency/PackagesTest.php +++ b/tests/convention/Dependency/PackagesTest.php @@ -6,8 +6,8 @@ use PHPUnit\Framework\TestCase; use Yokai\Batch\Sources\Tests\Convention\Autoload; -use Yokai\Batch\Sources\Tests\Convention\Packages; use Yokai\Batch\Sources\Tests\Convention\Package; +use Yokai\Batch\Sources\Tests\Convention\Packages; final class PackagesTest extends TestCase { diff --git a/tests/convention/Dependency/SourcesTest.php b/tests/convention/Dependency/SourcesTest.php index bac0a3d2..95c401cf 100644 --- a/tests/convention/Dependency/SourcesTest.php +++ b/tests/convention/Dependency/SourcesTest.php @@ -6,8 +6,8 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Filesystem\Path; -use Yokai\Batch\Sources\Tests\Convention\Packages; use Yokai\Batch\Sources\Tests\Convention\Package; +use Yokai\Batch\Sources\Tests\Convention\Packages; /** * Perform some tests over root repository dependencies. @@ -19,7 +19,7 @@ final class SourcesTest extends TestCase */ public function test(): void { - $relative = fn (string $path) => Path::makeRelative($path, __DIR__ . '/../../..') . '/'; + $relative = fn(string $path) => Path::makeRelative($path, __DIR__ . '/../../..') . '/'; $expectedReplace = []; $expectedProdDeps = []; diff --git a/tests/integration/DummyJobTest.php b/tests/integration/DummyJobTest.php index bfc13d02..a8e3c6c7 100644 --- a/tests/integration/DummyJobTest.php +++ b/tests/integration/DummyJobTest.php @@ -13,7 +13,7 @@ class DummyJobTest extends JobTestCase { protected function createJob(JobExecutionStorageInterface $executionStorage): JobInterface { - return new class implements JobInterface { + return new class() implements JobInterface { public function execute(JobExecution $jobExecution): void { $jobExecution->getSummary()->set('done', true); diff --git a/tests/integration/FailingDummyJobTest.php b/tests/integration/FailingDummyJobTest.php index 8cc43369..0dde588b 100644 --- a/tests/integration/FailingDummyJobTest.php +++ b/tests/integration/FailingDummyJobTest.php @@ -14,7 +14,7 @@ class FailingDummyJobTest extends JobTestCase { protected function createJob(JobExecutionStorageInterface $executionStorage): JobInterface { - return new class implements JobInterface { + return new class() implements JobInterface { public function execute(JobExecution $jobExecution): void { $jobExecution->addWarning(new Warning('WARNING! I am a dummy.')); diff --git a/tests/integration/JobWithDummyChildrenTest.php b/tests/integration/JobWithDummyChildrenTest.php index 394dbfeb..8ab22fb8 100644 --- a/tests/integration/JobWithDummyChildrenTest.php +++ b/tests/integration/JobWithDummyChildrenTest.php @@ -17,15 +17,13 @@ protected function createJob(JobExecutionStorageInterface $executionStorage): Jo return new JobWithChildJobs( $executionStorage, self::createJobExecutor($executionStorage, [ - 'prepare' => new class implements JobInterface - { + 'prepare' => new class() implements JobInterface { public function execute(JobExecution $jobExecution): void { $jobExecution->getSummary()->set('done', true); } }, - 'do' => new class implements JobInterface - { + 'do' => new class() implements JobInterface { public function execute(JobExecution $jobExecution): void { $jobExecution->getSummary()->set('done', true); diff --git a/tests/integration/JobWithDummyItemChildrenTest.php b/tests/integration/JobWithDummyItemChildrenTest.php index 2fa2c88d..84897489 100644 --- a/tests/integration/JobWithDummyItemChildrenTest.php +++ b/tests/integration/JobWithDummyItemChildrenTest.php @@ -22,7 +22,7 @@ protected function createJob(JobExecutionStorageInterface $executionStorage): Jo { $output = self::OUTPUT_FILE; - $fileLineWriter = new class ($output) implements ItemWriterInterface { + $fileLineWriter = new class($output) implements ItemWriterInterface { /** * @var string */ diff --git a/tests/integration/JobWithFailingDummyChidlrenTest.php b/tests/integration/JobWithFailingDummyChidlrenTest.php index 3ec180bd..28df9529 100644 --- a/tests/integration/JobWithFailingDummyChidlrenTest.php +++ b/tests/integration/JobWithFailingDummyChidlrenTest.php @@ -17,15 +17,13 @@ protected function createJob(JobExecutionStorageInterface $executionStorage): Jo return new JobWithChildJobs( $executionStorage, self::createJobExecutor($executionStorage, [ - 'prepare' => new class implements JobInterface - { + 'prepare' => new class() implements JobInterface { public function execute(JobExecution $jobExecution): void { throw new \Exception('Critical dummy exception'); } }, - 'do' => new class implements JobInterface - { + 'do' => new class() implements JobInterface { public function execute(JobExecution $jobExecution): void { // this job should not be executed From e98ab0270f66ff395dc4e7dd6decca7af45b9ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Sun, 4 Jun 2023 11:28:48 +0200 Subject: [PATCH 3/7] Add ECS comments set --- ecs.php | 1 + 1 file changed, 1 insertion(+) diff --git a/ecs.php b/ecs.php index df1cae26..6d1d7b93 100644 --- a/ecs.php +++ b/ecs.php @@ -17,6 +17,7 @@ ]); $ecsConfig->sets([ + SetList::COMMENTS, SetList::STRICT, SetList::PSR_12, ]); From 4ec26d2ce8eaf4e2804fcfbde1aa84fa3fb6c0cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Sun, 4 Jun 2023 11:29:14 +0200 Subject: [PATCH 4/7] Add ECS namespaces set --- ecs.php | 1 + src/batch-doctrine-dbal/tests/DoctrineDBALInsertWriterTest.php | 1 - .../tests/DoctrineDBALJobExecutionStorageTest.php | 1 - src/batch-symfony-console/tests/RunJobCommandTest.php | 1 - src/batch/src/Storage/NullJobExecutionStorage.php | 1 - .../tests/Job/Item/Writer/LaunchJobForEachItemWriterTest.php | 1 - src/batch/tests/Serializer/fixtures/minimal.object.php | 1 - tests/convention/Comment/MethodCommentsTest.php | 1 - 8 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ecs.php b/ecs.php index 6d1d7b93..110d98c7 100644 --- a/ecs.php +++ b/ecs.php @@ -17,6 +17,7 @@ ]); $ecsConfig->sets([ + SetList::NAMESPACES, SetList::COMMENTS, SetList::STRICT, SetList::PSR_12, diff --git a/src/batch-doctrine-dbal/tests/DoctrineDBALInsertWriterTest.php b/src/batch-doctrine-dbal/tests/DoctrineDBALInsertWriterTest.php index 70002c96..5ef79659 100644 --- a/src/batch-doctrine-dbal/tests/DoctrineDBALInsertWriterTest.php +++ b/src/batch-doctrine-dbal/tests/DoctrineDBALInsertWriterTest.php @@ -5,7 +5,6 @@ namespace Yokai\Batch\Tests\Bridge\Doctrine\DBAL; use Doctrine\DBAL\Types\Types; -use Generator; use Yokai\Batch\Bridge\Doctrine\DBAL\DoctrineDBALInsertWriter; use Yokai\Batch\Exception\UnexpectedValueException; diff --git a/src/batch-doctrine-dbal/tests/DoctrineDBALJobExecutionStorageTest.php b/src/batch-doctrine-dbal/tests/DoctrineDBALJobExecutionStorageTest.php index b51f38be..7df4359f 100644 --- a/src/batch-doctrine-dbal/tests/DoctrineDBALJobExecutionStorageTest.php +++ b/src/batch-doctrine-dbal/tests/DoctrineDBALJobExecutionStorageTest.php @@ -5,7 +5,6 @@ namespace Yokai\Batch\Tests\Bridge\Doctrine\DBAL; use DateTimeImmutable; -use Exception; use Generator; use RuntimeException; use Throwable; diff --git a/src/batch-symfony-console/tests/RunJobCommandTest.php b/src/batch-symfony-console/tests/RunJobCommandTest.php index 2a270fa2..1e178327 100644 --- a/src/batch-symfony-console/tests/RunJobCommandTest.php +++ b/src/batch-symfony-console/tests/RunJobCommandTest.php @@ -9,7 +9,6 @@ use Prophecy\Argument; use Prophecy\PhpUnit\ProphecyTrait; use Prophecy\Prophecy\ObjectProphecy; -use Psr\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Tester\CommandTester; use Yokai\Batch\Bridge\Symfony\Console\RunJobCommand; diff --git a/src/batch/src/Storage/NullJobExecutionStorage.php b/src/batch/src/Storage/NullJobExecutionStorage.php index fa841cc9..b20fec36 100644 --- a/src/batch/src/Storage/NullJobExecutionStorage.php +++ b/src/batch/src/Storage/NullJobExecutionStorage.php @@ -4,7 +4,6 @@ namespace Yokai\Batch\Storage; -use Yokai\Batch\Exception\CannotRemoveJobExecutionException; use Yokai\Batch\Exception\JobExecutionNotFoundException; use Yokai\Batch\JobExecution; diff --git a/src/batch/tests/Job/Item/Writer/LaunchJobForEachItemWriterTest.php b/src/batch/tests/Job/Item/Writer/LaunchJobForEachItemWriterTest.php index 997257e8..9dc8516f 100644 --- a/src/batch/tests/Job/Item/Writer/LaunchJobForEachItemWriterTest.php +++ b/src/batch/tests/Job/Item/Writer/LaunchJobForEachItemWriterTest.php @@ -6,7 +6,6 @@ use PHPUnit\Framework\TestCase; use Yokai\Batch\Job\Item\Writer\LaunchJobForEachItemWriter; -use Yokai\Batch\Job\Item\Writer\LaunchJobForItemsBatchWriter; use Yokai\Batch\JobExecution; use Yokai\Batch\Test\Factory\SequenceJobExecutionIdGenerator; use Yokai\Batch\Test\Launcher\BufferingJobLauncher; diff --git a/src/batch/tests/Serializer/fixtures/minimal.object.php b/src/batch/tests/Serializer/fixtures/minimal.object.php index fd5c55de..e4b2e532 100644 --- a/src/batch/tests/Serializer/fixtures/minimal.object.php +++ b/src/batch/tests/Serializer/fixtures/minimal.object.php @@ -2,7 +2,6 @@ declare(strict_types=1); -use Yokai\Batch\BatchStatus; use Yokai\Batch\JobExecution; return JobExecution::createRoot('123456789', 'export'); diff --git a/tests/convention/Comment/MethodCommentsTest.php b/tests/convention/Comment/MethodCommentsTest.php index 7f74d699..c34ae738 100644 --- a/tests/convention/Comment/MethodCommentsTest.php +++ b/tests/convention/Comment/MethodCommentsTest.php @@ -4,7 +4,6 @@ namespace Yokai\Batch\Sources\Tests\Convention\Comment; -use PHPUnit\Framework\TestCase; use ReflectionClass; use ReflectionMethod; use Yokai\Batch\Sources\Tests\Convention\Autoload; From 52346b5b334e0f2716307bf2585cf06459ae05b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Sun, 4 Jun 2023 11:33:09 +0200 Subject: [PATCH 5/7] Add ECS dockblock set --- ecs.php | 1 + .../src/Reader/FlatFileReader.php | 4 +--- .../src/Reader/Options/CSVOptions.php | 8 ++------ .../src/Reader/Options/ODSOptions.php | 8 ++------ .../src/Reader/Options/XLSXOptions.php | 8 ++------ .../src/Writer/FlatFileWriter.php | 12 +++-------- .../src/Writer/Options/CSVOptions.php | 4 +--- .../src/Writer/Options/ODSOptions.php | 4 +--- .../src/Writer/Options/XLSXOptions.php | 4 +--- .../src/DoctrineDBALInsertWriter.php | 4 +--- .../src/DoctrineDBALJobExecutionStorage.php | 20 +++++-------------- .../src/DoctrineDBALQueryCursorReader.php | 1 - .../src/DoctrineDBALQueryOffsetReader.php | 1 - .../src/DoctrineDBALUpsertWriter.php | 4 +--- src/batch-doctrine-orm/src/EntityReader.php | 4 +--- .../src/ObjectWriter.php | 4 +--- .../src/RunCommandJobLauncher.php | 4 +--- .../src/RunJobCommand.php | 8 ++------ .../src/ContainerParameterAccessor.php | 4 +--- .../CompilerPass/RegisterJobsCompilerPass.php | 3 --- .../src/DependencyInjection/Configuration.php | 3 --- .../YokaiBatchExtension.php | 1 - .../src/DispatchMessageJobLauncher.php | 4 +--- .../src/DenormalizeItemProcessor.php | 4 +--- .../src/NormalizeItemProcessor.php | 4 +--- .../src/SkipInvalidItemProcessor.php | 4 +--- .../src/SkipItemOnViolations.php | 4 +--- .../Factory/UniqidJobExecutionIdGenerator.php | 3 --- src/batch/src/Finder/CallbackFinder.php | 4 +--- .../src/Job/Item/AbstractElementDecorator.php | 8 ++------ .../Job/Item/Exception/SkipItemOnError.php | 4 +--- .../Item/Exception/SkipItemWithWarning.php | 4 +--- .../src/Job/Item/ExpandProcessedItem.php | 1 - src/batch/src/Job/Item/ItemJob.php | 4 +--- .../Job/Item/Processor/ArrayMapProcessor.php | 1 - .../src/Job/Item/Processor/ChainProcessor.php | 8 ++------ .../Item/Processor/FilterUniqueProcessor.php | 4 +--- .../src/Job/Item/Processor/NullProcessor.php | 3 --- .../Job/Item/Processor/RoutingProcessor.php | 12 +++-------- .../src/Job/Item/Reader/AddMetadataReader.php | 5 +---- .../Filesystem/FixedColumnSizeFileReader.php | 1 - .../Reader/Filesystem/JsonLinesReader.php | 1 - .../src/Job/Item/Reader/IndexWithReader.php | 8 ++------ .../Item/Reader/ParameterAccessorReader.php | 4 +--- .../src/Job/Item/Reader/SequenceReader.php | 8 ++------ .../Job/Item/Reader/StaticIterableReader.php | 4 +--- src/batch/src/Job/Item/Writer/ChainWriter.php | 8 ++------ .../Writer/Filesystem/JsonLinesWriter.php | 12 +++-------- src/batch/src/Job/Item/Writer/NullWriter.php | 3 --- .../src/Job/Item/Writer/RoutingWriter.php | 12 +++-------- .../src/Job/Item/Writer/SummaryWriter.php | 4 +--- src/batch/src/Job/JobExecutionAwareTrait.php | 4 +--- src/batch/src/Job/JobParametersAwareTrait.php | 4 +--- src/batch/src/Job/JobWithChildJobs.php | 4 +--- .../Job/Parameters/ChainParameterAccessor.php | 4 +--- .../ClosestJobExecutionAccessor.php | 4 +--- .../Parameters/DefaultParameterAccessor.php | 4 +--- .../JobExecutionParameterAccessor.php | 4 +--- .../JobExecutionSummaryAccessor.php | 4 +--- .../Parameters/ParentJobExecutionAccessor.php | 4 +--- .../ReplaceWithVariablesParameterAccessor.php | 4 +--- .../Parameters/RootJobExecutionAccessor.php | 4 +--- .../SiblingJobExecutionAccessor.php | 4 +--- .../StaticValueParameterAccessor.php | 4 +--- src/batch/src/Job/SummaryAwareTrait.php | 4 +--- src/batch/src/JobExecutionLogger.php | 1 - src/batch/src/JobParameters.php | 5 +---- src/batch/src/Launcher/SimpleJobLauncher.php | 4 +--- .../Serializer/JsonJobExecutionSerializer.php | 11 ++-------- .../Storage/FilesystemJobExecutionStorage.php | 20 +++++-------------- .../src/Storage/NullJobExecutionStorage.php | 11 ++-------- src/batch/src/Summary.php | 7 ++----- .../SequenceJobExecutionIdGenerator.php | 4 +--- src/batch/src/Test/Finder/DummyFinder.php | 4 +--- .../Test/Job/Item/Reader/TestDebugReader.php | 8 ++------ .../Test/Job/Item/Writer/InMemoryWriter.php | 8 ++------ .../Test/Job/Item/Writer/TestDebugWriter.php | 8 ++------ .../Test/Launcher/BufferingJobLauncher.php | 4 +--- .../Storage/InMemoryJobExecutionStorage.php | 12 +++-------- .../Trigger/Scheduler/CallbackScheduler.php | 1 - .../src/Trigger/TriggerScheduledJobsJob.php | 4 +--- .../Item/Reader/StaticIterableReaderTest.php | 3 --- tests/integration/JobTestCase.php | 4 +--- .../src/Job/Country/CountryJsonFileReader.php | 4 +--- 84 files changed, 102 insertions(+), 337 deletions(-) diff --git a/ecs.php b/ecs.php index 110d98c7..e89461ed 100644 --- a/ecs.php +++ b/ecs.php @@ -17,6 +17,7 @@ ]); $ecsConfig->sets([ + SetList::DOCBLOCK, SetList::NAMESPACES, SetList::COMMENTS, SetList::STRICT, diff --git a/src/batch-box-spout/src/Reader/FlatFileReader.php b/src/batch-box-spout/src/Reader/FlatFileReader.php index 3a3655f0..a109f117 100644 --- a/src/batch-box-spout/src/Reader/FlatFileReader.php +++ b/src/batch-box-spout/src/Reader/FlatFileReader.php @@ -36,9 +36,7 @@ public function __construct( $this->headerStrategy = $headerStrategy ?? HeaderStrategy::skip(); } - /** - * @inheritDoc - */ + public function read(): iterable { /** @var string $path */ diff --git a/src/batch-box-spout/src/Reader/Options/CSVOptions.php b/src/batch-box-spout/src/Reader/Options/CSVOptions.php index 510c072d..fab0584e 100644 --- a/src/batch-box-spout/src/Reader/Options/CSVOptions.php +++ b/src/batch-box-spout/src/Reader/Options/CSVOptions.php @@ -22,9 +22,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function configure(ReaderInterface $reader): void { if (!$reader instanceof CSVReader) { @@ -38,9 +36,7 @@ public function configure(ReaderInterface $reader): void $reader->setShouldPreserveEmptyRows($this->preserveEmptyRows); } - /** - * @inheritdoc - */ + public function getSheets(ReaderInterface $reader): iterable { return $reader->getSheetIterator(); diff --git a/src/batch-box-spout/src/Reader/Options/ODSOptions.php b/src/batch-box-spout/src/Reader/Options/ODSOptions.php index 170e7da8..06313017 100644 --- a/src/batch-box-spout/src/Reader/Options/ODSOptions.php +++ b/src/batch-box-spout/src/Reader/Options/ODSOptions.php @@ -23,9 +23,7 @@ public function __construct( $this->sheetFilter = $sheetFilter ?? SheetFilter::all(); } - /** - * @inheritDoc - */ + public function configure(ReaderInterface $reader): void { if (!$reader instanceof ODSReader) { @@ -36,9 +34,7 @@ public function configure(ReaderInterface $reader): void $reader->setShouldPreserveEmptyRows($this->preserveEmptyRows); } - /** - * @inheritDoc - */ + public function getSheets(ReaderInterface $reader): iterable { yield from $this->sheetFilter->getSheets($reader); diff --git a/src/batch-box-spout/src/Reader/Options/XLSXOptions.php b/src/batch-box-spout/src/Reader/Options/XLSXOptions.php index 78f846fe..6e0c8827 100644 --- a/src/batch-box-spout/src/Reader/Options/XLSXOptions.php +++ b/src/batch-box-spout/src/Reader/Options/XLSXOptions.php @@ -23,9 +23,7 @@ public function __construct( $this->sheetFilter = $sheetFilter ?? SheetFilter::all(); } - /** - * @inheritDoc - */ + public function configure(ReaderInterface $reader): void { if (!$reader instanceof XLSXReader) { @@ -36,9 +34,7 @@ public function configure(ReaderInterface $reader): void $reader->setShouldPreserveEmptyRows($this->preserveEmptyRows); } - /** - * @inheritDoc - */ + public function getSheets(ReaderInterface $reader): iterable { yield from $this->sheetFilter->getSheets($reader); diff --git a/src/batch-box-spout/src/Writer/FlatFileWriter.php b/src/batch-box-spout/src/Writer/FlatFileWriter.php index 4f5a66e4..0a0c28d2 100644 --- a/src/batch-box-spout/src/Writer/FlatFileWriter.php +++ b/src/batch-box-spout/src/Writer/FlatFileWriter.php @@ -46,9 +46,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function initialize(): void { /** @var string $path */ @@ -67,9 +65,7 @@ public function initialize(): void } } - /** - * @inheritDoc - */ + public function write(iterable $items): void { $writer = $this->writer; @@ -102,9 +98,7 @@ public function write(iterable $items): void } } - /** - * @inheritDoc - */ + public function flush(): void { if ($this->writer === null) { diff --git a/src/batch-box-spout/src/Writer/Options/CSVOptions.php b/src/batch-box-spout/src/Writer/Options/CSVOptions.php index 2b52b4da..1470360b 100644 --- a/src/batch-box-spout/src/Writer/Options/CSVOptions.php +++ b/src/batch-box-spout/src/Writer/Options/CSVOptions.php @@ -20,9 +20,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function configure(WriterInterface $writer): void { if (!$writer instanceof CSVWriter) { diff --git a/src/batch-box-spout/src/Writer/Options/ODSOptions.php b/src/batch-box-spout/src/Writer/Options/ODSOptions.php index 41be354e..b42d9d7b 100644 --- a/src/batch-box-spout/src/Writer/Options/ODSOptions.php +++ b/src/batch-box-spout/src/Writer/Options/ODSOptions.php @@ -20,9 +20,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function configure(WriterInterface $writer): void { if (!$writer instanceof ODSWriter) { diff --git a/src/batch-box-spout/src/Writer/Options/XLSXOptions.php b/src/batch-box-spout/src/Writer/Options/XLSXOptions.php index f030efa6..f2e24636 100644 --- a/src/batch-box-spout/src/Writer/Options/XLSXOptions.php +++ b/src/batch-box-spout/src/Writer/Options/XLSXOptions.php @@ -20,9 +20,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function configure(WriterInterface $writer): void { if (!$writer instanceof XLSXWriter) { diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php b/src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php index c18eea10..f564f14d 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php @@ -29,9 +29,7 @@ public function __construct( $this->connection = $connection; } - /** - * @inheritdoc - */ + public function write(iterable $items): void { foreach ($items as $item) { diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php b/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php index 2d4c7b3e..6fb5e831 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php @@ -69,9 +69,7 @@ public function createSchema(): void $this->connection->getConfiguration()->setSchemaAssetsFilter($assetFilter); } - /** - * @inheritDoc - */ + public function store(JobExecution $execution): void { try { @@ -94,9 +92,7 @@ public function store(JobExecution $execution): void } } - /** - * @inheritDoc - */ + public function remove(JobExecution $execution): void { try { @@ -106,9 +102,7 @@ public function remove(JobExecution $execution): void } } - /** - * @inheritDoc - */ + public function retrieve(string $jobName, string $executionId): JobExecution { try { @@ -120,9 +114,7 @@ public function retrieve(string $jobName, string $executionId): JobExecution return $this->fromRow($row); } - /** - * @inheritDoc - */ + public function list(string $jobName): iterable { $qb = $this->connection->createQueryBuilder(); @@ -133,9 +125,7 @@ public function list(string $jobName): iterable yield from $this->queryList($qb->getSQL(), ['jobName' => $jobName], ['jobName' => Types::STRING]); } - /** - * @inheritDoc - */ + public function query(Query $query): iterable { $queryParameters = []; diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALQueryCursorReader.php b/src/batch-doctrine-dbal/src/DoctrineDBALQueryCursorReader.php index ffd28693..efdd16fb 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALQueryCursorReader.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALQueryCursorReader.php @@ -55,7 +55,6 @@ public function __construct( } /** - * @inheritdoc * @phpstan-return Generator> */ public function read(): Generator diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALQueryOffsetReader.php b/src/batch-doctrine-dbal/src/DoctrineDBALQueryOffsetReader.php index d78ca648..55d3c848 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALQueryOffsetReader.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALQueryOffsetReader.php @@ -43,7 +43,6 @@ public function __construct(ConnectionRegistry $doctrine, string $sql, string $c } /** - * @inheritdoc * @phpstan-return Generator> */ public function read(): Generator diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php b/src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php index da8bc9a1..cb404de2 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php @@ -33,9 +33,7 @@ public function __construct(ConnectionRegistry $doctrine, string $connection = n $this->connection = $connection; } - /** - * @inheritdoc - */ + public function write(iterable $items): void { foreach ($items as $item) { diff --git a/src/batch-doctrine-orm/src/EntityReader.php b/src/batch-doctrine-orm/src/EntityReader.php index 71c0b692..7e91b6ba 100644 --- a/src/batch-doctrine-orm/src/EntityReader.php +++ b/src/batch-doctrine-orm/src/EntityReader.php @@ -23,9 +23,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function read(): iterable { $manager = $this->doctrine->getManagerForClass($this->class); diff --git a/src/batch-doctrine-persistence/src/ObjectWriter.php b/src/batch-doctrine-persistence/src/ObjectWriter.php index 274c76b5..5cddbded 100644 --- a/src/batch-doctrine-persistence/src/ObjectWriter.php +++ b/src/batch-doctrine-persistence/src/ObjectWriter.php @@ -30,9 +30,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function write(iterable $items): void { foreach ($items as $item) { diff --git a/src/batch-symfony-console/src/RunCommandJobLauncher.php b/src/batch-symfony-console/src/RunCommandJobLauncher.php index 7a1d6a37..5736e6fd 100644 --- a/src/batch-symfony-console/src/RunCommandJobLauncher.php +++ b/src/batch-symfony-console/src/RunCommandJobLauncher.php @@ -28,9 +28,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function launch(string $name, array $configuration = []): JobExecution { $jobExecution = $this->jobExecutionFactory->create($name, $configuration); diff --git a/src/batch-symfony-console/src/RunJobCommand.php b/src/batch-symfony-console/src/RunJobCommand.php index 22fec183..2b93e040 100644 --- a/src/batch-symfony-console/src/RunJobCommand.php +++ b/src/batch-symfony-console/src/RunJobCommand.php @@ -34,9 +34,7 @@ public function __construct( parent::__construct(); } - /** - * @inheritDoc - */ + protected function configure(): void { $this->setDescription('Execute any job.'); @@ -46,9 +44,7 @@ protected function configure(): void $this->addUsage('export \'{"toFile":"/path/to/file.xml"}\''); } - /** - * @inheritDoc - */ + protected function execute(InputInterface $input, OutputInterface $output): int { /** @var string $jobName */ diff --git a/src/batch-symfony-framework/src/ContainerParameterAccessor.php b/src/batch-symfony-framework/src/ContainerParameterAccessor.php index fbb6e310..50daad88 100644 --- a/src/batch-symfony-framework/src/ContainerParameterAccessor.php +++ b/src/batch-symfony-framework/src/ContainerParameterAccessor.php @@ -21,9 +21,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { try { diff --git a/src/batch-symfony-framework/src/DependencyInjection/CompilerPass/RegisterJobsCompilerPass.php b/src/batch-symfony-framework/src/DependencyInjection/CompilerPass/RegisterJobsCompilerPass.php index ea07453e..24a35ab0 100644 --- a/src/batch-symfony-framework/src/DependencyInjection/CompilerPass/RegisterJobsCompilerPass.php +++ b/src/batch-symfony-framework/src/DependencyInjection/CompilerPass/RegisterJobsCompilerPass.php @@ -18,9 +18,6 @@ */ final class RegisterJobsCompilerPass implements CompilerPassInterface { - /** - * @inheritdoc - */ public function process(ContainerBuilder $container): void { $jobs = []; diff --git a/src/batch-symfony-framework/src/DependencyInjection/Configuration.php b/src/batch-symfony-framework/src/DependencyInjection/Configuration.php index 0441bc8b..aa67158a 100644 --- a/src/batch-symfony-framework/src/DependencyInjection/Configuration.php +++ b/src/batch-symfony-framework/src/DependencyInjection/Configuration.php @@ -13,9 +13,6 @@ */ final class Configuration implements ConfigurationInterface { - /** - * @inheritdoc - */ public function getConfigTreeBuilder(): TreeBuilder { /** @var ArrayNodeDefinition $root */ diff --git a/src/batch-symfony-framework/src/DependencyInjection/YokaiBatchExtension.php b/src/batch-symfony-framework/src/DependencyInjection/YokaiBatchExtension.php index 5df34c9c..27ad2787 100644 --- a/src/batch-symfony-framework/src/DependencyInjection/YokaiBatchExtension.php +++ b/src/batch-symfony-framework/src/DependencyInjection/YokaiBatchExtension.php @@ -26,7 +26,6 @@ final class YokaiBatchExtension extends Extension { /** - * @inheritDoc * @phpstan-param list> $configs */ public function load(array $configs, ContainerBuilder $container): void diff --git a/src/batch-symfony-messenger/src/DispatchMessageJobLauncher.php b/src/batch-symfony-messenger/src/DispatchMessageJobLauncher.php index 5187a99f..a8704400 100644 --- a/src/batch-symfony-messenger/src/DispatchMessageJobLauncher.php +++ b/src/batch-symfony-messenger/src/DispatchMessageJobLauncher.php @@ -24,9 +24,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function launch(string $name, array $configuration = []): JobExecution { // create and store execution before dispatching message diff --git a/src/batch-symfony-serializer/src/DenormalizeItemProcessor.php b/src/batch-symfony-serializer/src/DenormalizeItemProcessor.php index 91160682..1a9c96c5 100644 --- a/src/batch-symfony-serializer/src/DenormalizeItemProcessor.php +++ b/src/batch-symfony-serializer/src/DenormalizeItemProcessor.php @@ -26,9 +26,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function process(mixed $item): mixed { try { diff --git a/src/batch-symfony-serializer/src/NormalizeItemProcessor.php b/src/batch-symfony-serializer/src/NormalizeItemProcessor.php index 0ebd7cab..22149c3e 100644 --- a/src/batch-symfony-serializer/src/NormalizeItemProcessor.php +++ b/src/batch-symfony-serializer/src/NormalizeItemProcessor.php @@ -25,9 +25,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function process(mixed $item): mixed { try { diff --git a/src/batch-symfony-validator/src/SkipInvalidItemProcessor.php b/src/batch-symfony-validator/src/SkipInvalidItemProcessor.php index 41447c33..ac3b9c04 100644 --- a/src/batch-symfony-validator/src/SkipInvalidItemProcessor.php +++ b/src/batch-symfony-validator/src/SkipInvalidItemProcessor.php @@ -29,9 +29,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function process(mixed $item): mixed { $violations = $this->validator->validate($item, $this->contraints, $this->groups); diff --git a/src/batch-symfony-validator/src/SkipItemOnViolations.php b/src/batch-symfony-validator/src/SkipItemOnViolations.php index 5f166617..ff896dd7 100644 --- a/src/batch-symfony-validator/src/SkipItemOnViolations.php +++ b/src/batch-symfony-validator/src/SkipItemOnViolations.php @@ -24,9 +24,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function report(JobExecution $execution, int|string $index, mixed $item): void { $execution->getSummary()->increment('invalid'); diff --git a/src/batch/src/Factory/UniqidJobExecutionIdGenerator.php b/src/batch/src/Factory/UniqidJobExecutionIdGenerator.php index bb8e8c52..925525a0 100644 --- a/src/batch/src/Factory/UniqidJobExecutionIdGenerator.php +++ b/src/batch/src/Factory/UniqidJobExecutionIdGenerator.php @@ -10,9 +10,6 @@ */ final class UniqidJobExecutionIdGenerator implements JobExecutionIdGeneratorInterface { - /** - * @inheritdoc - */ public function generate(): string { return \uniqid(); diff --git a/src/batch/src/Finder/CallbackFinder.php b/src/batch/src/Finder/CallbackFinder.php index dbbecac9..5db7f89d 100644 --- a/src/batch/src/Finder/CallbackFinder.php +++ b/src/batch/src/Finder/CallbackFinder.php @@ -25,9 +25,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function find(mixed $subject): object { foreach ($this->strategies as [$callback, $component]) { diff --git a/src/batch/src/Job/Item/AbstractElementDecorator.php b/src/batch/src/Job/Item/AbstractElementDecorator.php index f1750966..818f72f6 100644 --- a/src/batch/src/Job/Item/AbstractElementDecorator.php +++ b/src/batch/src/Job/Item/AbstractElementDecorator.php @@ -30,9 +30,7 @@ abstract class AbstractElementDecorator implements use ElementConfiguratorTrait; use JobExecutionAwareTrait; - /** - * @inheritdoc - */ + public function initialize(): void { foreach ($this->getDecoratedElements() as $element) { @@ -41,9 +39,7 @@ public function initialize(): void } } - /** - * @inheritdoc - */ + public function flush(): void { foreach ($this->getDecoratedElements() as $element) { diff --git a/src/batch/src/Job/Item/Exception/SkipItemOnError.php b/src/batch/src/Job/Item/Exception/SkipItemOnError.php index 4245213b..f2fc9423 100644 --- a/src/batch/src/Job/Item/Exception/SkipItemOnError.php +++ b/src/batch/src/Job/Item/Exception/SkipItemOnError.php @@ -18,9 +18,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function report(JobExecution $execution, int|string $index, mixed $item): void { $execution->getSummary()->increment('errored'); diff --git a/src/batch/src/Job/Item/Exception/SkipItemWithWarning.php b/src/batch/src/Job/Item/Exception/SkipItemWithWarning.php index 6dbc8bf0..f26304ef 100644 --- a/src/batch/src/Job/Item/Exception/SkipItemWithWarning.php +++ b/src/batch/src/Job/Item/Exception/SkipItemWithWarning.php @@ -17,9 +17,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function report(JobExecution $execution, int|string $index, mixed $item): void { $execution->addWarning(new Warning($this->message, [], ['itemIndex' => $index, 'item' => $item])); diff --git a/src/batch/src/Job/Item/ExpandProcessedItem.php b/src/batch/src/Job/Item/ExpandProcessedItem.php index 2cc804a3..bdb79ab9 100644 --- a/src/batch/src/Job/Item/ExpandProcessedItem.php +++ b/src/batch/src/Job/Item/ExpandProcessedItem.php @@ -35,7 +35,6 @@ public function __construct(iterable $iterator) } /** - * @inheritdoc * @phpstan-return Iterator */ public function getIterator(): Iterator diff --git a/src/batch/src/Job/Item/ItemJob.php b/src/batch/src/Job/Item/ItemJob.php index f2f88434..c5e437f3 100644 --- a/src/batch/src/Job/Item/ItemJob.php +++ b/src/batch/src/Job/Item/ItemJob.php @@ -37,9 +37,7 @@ public function __construct( $this->elements = [$reader, $processor, $writer]; } - /** - * @inheritDoc - */ + final public function execute(JobExecution $jobExecution): void { $rootExecution = $jobExecution->getRootExecution(); diff --git a/src/batch/src/Job/Item/Processor/ArrayMapProcessor.php b/src/batch/src/Job/Item/Processor/ArrayMapProcessor.php index dc074860..df6a3eae 100644 --- a/src/batch/src/Job/Item/Processor/ArrayMapProcessor.php +++ b/src/batch/src/Job/Item/Processor/ArrayMapProcessor.php @@ -21,7 +21,6 @@ public function __construct(Closure $callback) } /** - * @inheritdoc * @phpstan-return array */ public function process(mixed $item): array diff --git a/src/batch/src/Job/Item/Processor/ChainProcessor.php b/src/batch/src/Job/Item/Processor/ChainProcessor.php index 97d7a28f..3b9523c7 100644 --- a/src/batch/src/Job/Item/Processor/ChainProcessor.php +++ b/src/batch/src/Job/Item/Processor/ChainProcessor.php @@ -22,9 +22,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function process(mixed $item): mixed { /** @var ItemProcessorInterface $processor */ @@ -35,9 +33,7 @@ public function process(mixed $item): mixed return $item; } - /** - * @inheritDoc - */ + protected function getDecoratedElements(): iterable { return $this->processors; diff --git a/src/batch/src/Job/Item/Processor/FilterUniqueProcessor.php b/src/batch/src/Job/Item/Processor/FilterUniqueProcessor.php index 651470d8..288b615e 100644 --- a/src/batch/src/Job/Item/Processor/FilterUniqueProcessor.php +++ b/src/batch/src/Job/Item/Processor/FilterUniqueProcessor.php @@ -62,9 +62,7 @@ public static function withGetter(string $getter): self return new self(fn(object $item) => $item->$getter()); } - /** - * @inheritDoc - */ + public function process(mixed $item): mixed { $unique = (string)($this->extractUnique)($item); diff --git a/src/batch/src/Job/Item/Processor/NullProcessor.php b/src/batch/src/Job/Item/Processor/NullProcessor.php index 4f1f86e7..072b98dc 100644 --- a/src/batch/src/Job/Item/Processor/NullProcessor.php +++ b/src/batch/src/Job/Item/Processor/NullProcessor.php @@ -11,9 +11,6 @@ */ final class NullProcessor implements ItemProcessorInterface { - /** - * @inheritDoc - */ public function process(mixed $item): mixed { return $item; diff --git a/src/batch/src/Job/Item/Processor/RoutingProcessor.php b/src/batch/src/Job/Item/Processor/RoutingProcessor.php index b2fd36bc..2a20b3aa 100644 --- a/src/batch/src/Job/Item/Processor/RoutingProcessor.php +++ b/src/batch/src/Job/Item/Processor/RoutingProcessor.php @@ -39,9 +39,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function process(mixed $item): mixed { $processor = $this->finder->find($item); @@ -60,17 +58,13 @@ public function process(mixed $item): mixed return $processor->process($item); } - /** - * @inheritdoc - */ + public function initialize(): void { $this->processors = []; } - /** - * @inheritdoc - */ + public function flush(): void { $processors = $this->processors; diff --git a/src/batch/src/Job/Item/Reader/AddMetadataReader.php b/src/batch/src/Job/Item/Reader/AddMetadataReader.php index cb5a8c56..7238f092 100644 --- a/src/batch/src/Job/Item/Reader/AddMetadataReader.php +++ b/src/batch/src/Job/Item/Reader/AddMetadataReader.php @@ -26,7 +26,6 @@ public function __construct( } /** - * @inheritdoc * @phpstan-return Generator> */ public function read(): Generator @@ -40,9 +39,7 @@ public function read(): Generator } } - /** - * @inheritDoc - */ + protected function getDecoratedElements(): iterable { yield $this->reader; diff --git a/src/batch/src/Job/Item/Reader/Filesystem/FixedColumnSizeFileReader.php b/src/batch/src/Job/Item/Reader/Filesystem/FixedColumnSizeFileReader.php index 5892b81e..8d0a6340 100644 --- a/src/batch/src/Job/Item/Reader/Filesystem/FixedColumnSizeFileReader.php +++ b/src/batch/src/Job/Item/Reader/Filesystem/FixedColumnSizeFileReader.php @@ -46,7 +46,6 @@ public function __construct( } /** - * @inheritdoc * @phpstan-return Generator> */ public function read(): Generator diff --git a/src/batch/src/Job/Item/Reader/Filesystem/JsonLinesReader.php b/src/batch/src/Job/Item/Reader/Filesystem/JsonLinesReader.php index ef384ec6..d95c1051 100644 --- a/src/batch/src/Job/Item/Reader/Filesystem/JsonLinesReader.php +++ b/src/batch/src/Job/Item/Reader/Filesystem/JsonLinesReader.php @@ -28,7 +28,6 @@ public function __construct( } /** - * @inheritdoc * @phpstan-return Generator */ public function read(): Generator diff --git a/src/batch/src/Job/Item/Reader/IndexWithReader.php b/src/batch/src/Job/Item/Reader/IndexWithReader.php index c79e2262..b85a28b3 100644 --- a/src/batch/src/Job/Item/Reader/IndexWithReader.php +++ b/src/batch/src/Job/Item/Reader/IndexWithReader.php @@ -56,9 +56,7 @@ public static function withGetter(ItemReaderInterface $reader, string $getter): return new self($reader, fn(object $item) => $item->$getter()); } - /** - * @inheritdoc - */ + public function read(): iterable { foreach ($this->reader->read() as $item) { @@ -66,9 +64,7 @@ public function read(): iterable } } - /** - * @inheritdoc - */ + protected function getDecoratedElements(): iterable { yield $this->reader; diff --git a/src/batch/src/Job/Item/Reader/ParameterAccessorReader.php b/src/batch/src/Job/Item/Reader/ParameterAccessorReader.php index e367ca39..74573601 100644 --- a/src/batch/src/Job/Item/Reader/ParameterAccessorReader.php +++ b/src/batch/src/Job/Item/Reader/ParameterAccessorReader.php @@ -21,9 +21,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function read(): iterable { $data = $this->data->get($this->jobExecution); diff --git a/src/batch/src/Job/Item/Reader/SequenceReader.php b/src/batch/src/Job/Item/Reader/SequenceReader.php index 4e208835..c7816cba 100644 --- a/src/batch/src/Job/Item/Reader/SequenceReader.php +++ b/src/batch/src/Job/Item/Reader/SequenceReader.php @@ -20,9 +20,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function read(): iterable { /** @var ItemReaderInterface $reader */ @@ -33,9 +31,7 @@ public function read(): iterable } } - /** - * @inheritdoc - */ + protected function getDecoratedElements(): iterable { return $this->readers; diff --git a/src/batch/src/Job/Item/Reader/StaticIterableReader.php b/src/batch/src/Job/Item/Reader/StaticIterableReader.php index be02ab8e..39e52d7c 100644 --- a/src/batch/src/Job/Item/Reader/StaticIterableReader.php +++ b/src/batch/src/Job/Item/Reader/StaticIterableReader.php @@ -19,9 +19,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function read(): iterable { return $this->items; diff --git a/src/batch/src/Job/Item/Writer/ChainWriter.php b/src/batch/src/Job/Item/Writer/ChainWriter.php index 7b2938e7..0096e036 100644 --- a/src/batch/src/Job/Item/Writer/ChainWriter.php +++ b/src/batch/src/Job/Item/Writer/ChainWriter.php @@ -20,9 +20,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function write(iterable $items): void { /** @var ItemWriterInterface $writer */ @@ -31,9 +29,7 @@ public function write(iterable $items): void } } - /** - * @inheritdoc - */ + protected function getDecoratedElements(): iterable { return $this->writers; diff --git a/src/batch/src/Job/Item/Writer/Filesystem/JsonLinesWriter.php b/src/batch/src/Job/Item/Writer/Filesystem/JsonLinesWriter.php index 88bf157a..17f17e10 100644 --- a/src/batch/src/Job/Item/Writer/Filesystem/JsonLinesWriter.php +++ b/src/batch/src/Job/Item/Writer/Filesystem/JsonLinesWriter.php @@ -34,9 +34,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function initialize(): void { /** @var string $path */ @@ -54,9 +52,7 @@ public function initialize(): void $this->file = $file; } - /** - * @inheritdoc - */ + public function write(iterable $items): void { foreach ($items as $json) { @@ -67,9 +63,7 @@ public function write(iterable $items): void } } - /** - * @inheritdoc - */ + public function flush(): void { \fclose($this->file); diff --git a/src/batch/src/Job/Item/Writer/NullWriter.php b/src/batch/src/Job/Item/Writer/NullWriter.php index 8e9e6c00..116e7b38 100644 --- a/src/batch/src/Job/Item/Writer/NullWriter.php +++ b/src/batch/src/Job/Item/Writer/NullWriter.php @@ -11,9 +11,6 @@ */ final class NullWriter implements ItemWriterInterface { - /** - * @inheritdoc - */ public function write(iterable $items): void { } diff --git a/src/batch/src/Job/Item/Writer/RoutingWriter.php b/src/batch/src/Job/Item/Writer/RoutingWriter.php index 3245b83c..e728290b 100644 --- a/src/batch/src/Job/Item/Writer/RoutingWriter.php +++ b/src/batch/src/Job/Item/Writer/RoutingWriter.php @@ -39,9 +39,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function write(iterable $items): void { $writerAndItems = []; @@ -68,17 +66,13 @@ public function write(iterable $items): void } } - /** - * @inheritdoc - */ + public function initialize(): void { $this->writers = []; } - /** - * @inheritdoc - */ + public function flush(): void { $writers = $this->writers; diff --git a/src/batch/src/Job/Item/Writer/SummaryWriter.php b/src/batch/src/Job/Item/Writer/SummaryWriter.php index 8e6a268f..ef262ea1 100644 --- a/src/batch/src/Job/Item/Writer/SummaryWriter.php +++ b/src/batch/src/Job/Item/Writer/SummaryWriter.php @@ -23,9 +23,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function write(iterable $items): void { /** @var string $key */ diff --git a/src/batch/src/Job/JobExecutionAwareTrait.php b/src/batch/src/Job/JobExecutionAwareTrait.php index 870153dc..2ee1eda9 100644 --- a/src/batch/src/Job/JobExecutionAwareTrait.php +++ b/src/batch/src/Job/JobExecutionAwareTrait.php @@ -13,9 +13,7 @@ trait JobExecutionAwareTrait { private JobExecution $jobExecution; - /** - * @inheritdoc - */ + public function setJobExecution(JobExecution $jobExecution): void { $this->jobExecution = $jobExecution; diff --git a/src/batch/src/Job/JobParametersAwareTrait.php b/src/batch/src/Job/JobParametersAwareTrait.php index 92e5d296..037492ee 100644 --- a/src/batch/src/Job/JobParametersAwareTrait.php +++ b/src/batch/src/Job/JobParametersAwareTrait.php @@ -13,9 +13,7 @@ trait JobParametersAwareTrait { private JobParameters $jobParameters; - /** - * @inheritdoc - */ + public function setJobParameters(JobParameters $jobParameters): void { $this->jobParameters = $jobParameters; diff --git a/src/batch/src/Job/JobWithChildJobs.php b/src/batch/src/Job/JobWithChildJobs.php index 6312d674..179522c9 100644 --- a/src/batch/src/Job/JobWithChildJobs.php +++ b/src/batch/src/Job/JobWithChildJobs.php @@ -24,9 +24,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + final public function execute(JobExecution $jobExecution): void { $logger = $jobExecution->getLogger(); diff --git a/src/batch/src/Job/Parameters/ChainParameterAccessor.php b/src/batch/src/Job/Parameters/ChainParameterAccessor.php index e5bb8e92..15b21077 100644 --- a/src/batch/src/Job/Parameters/ChainParameterAccessor.php +++ b/src/batch/src/Job/Parameters/ChainParameterAccessor.php @@ -21,9 +21,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { $tries = []; diff --git a/src/batch/src/Job/Parameters/ClosestJobExecutionAccessor.php b/src/batch/src/Job/Parameters/ClosestJobExecutionAccessor.php index 670da4d4..7d9638d4 100644 --- a/src/batch/src/Job/Parameters/ClosestJobExecutionAccessor.php +++ b/src/batch/src/Job/Parameters/ClosestJobExecutionAccessor.php @@ -18,9 +18,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { $candidateExecution = $execution; diff --git a/src/batch/src/Job/Parameters/DefaultParameterAccessor.php b/src/batch/src/Job/Parameters/DefaultParameterAccessor.php index 61f8c20a..cd624299 100644 --- a/src/batch/src/Job/Parameters/DefaultParameterAccessor.php +++ b/src/batch/src/Job/Parameters/DefaultParameterAccessor.php @@ -19,9 +19,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { try { diff --git a/src/batch/src/Job/Parameters/JobExecutionParameterAccessor.php b/src/batch/src/Job/Parameters/JobExecutionParameterAccessor.php index 0b8fb4c0..7ed3dfab 100644 --- a/src/batch/src/Job/Parameters/JobExecutionParameterAccessor.php +++ b/src/batch/src/Job/Parameters/JobExecutionParameterAccessor.php @@ -19,9 +19,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { try { diff --git a/src/batch/src/Job/Parameters/JobExecutionSummaryAccessor.php b/src/batch/src/Job/Parameters/JobExecutionSummaryAccessor.php index 65f70eaf..96e96424 100644 --- a/src/batch/src/Job/Parameters/JobExecutionSummaryAccessor.php +++ b/src/batch/src/Job/Parameters/JobExecutionSummaryAccessor.php @@ -18,9 +18,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { if (!$execution->getSummary()->has($this->name)) { diff --git a/src/batch/src/Job/Parameters/ParentJobExecutionAccessor.php b/src/batch/src/Job/Parameters/ParentJobExecutionAccessor.php index 59514f1e..baae9eb2 100644 --- a/src/batch/src/Job/Parameters/ParentJobExecutionAccessor.php +++ b/src/batch/src/Job/Parameters/ParentJobExecutionAccessor.php @@ -18,9 +18,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { $parent = $execution->getParentExecution(); diff --git a/src/batch/src/Job/Parameters/ReplaceWithVariablesParameterAccessor.php b/src/batch/src/Job/Parameters/ReplaceWithVariablesParameterAccessor.php index 1ae7da36..7afe1558 100644 --- a/src/batch/src/Job/Parameters/ReplaceWithVariablesParameterAccessor.php +++ b/src/batch/src/Job/Parameters/ReplaceWithVariablesParameterAccessor.php @@ -22,9 +22,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { $parameter = $this->accessor->get($execution); diff --git a/src/batch/src/Job/Parameters/RootJobExecutionAccessor.php b/src/batch/src/Job/Parameters/RootJobExecutionAccessor.php index fd8c37b7..881136f0 100644 --- a/src/batch/src/Job/Parameters/RootJobExecutionAccessor.php +++ b/src/batch/src/Job/Parameters/RootJobExecutionAccessor.php @@ -17,9 +17,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { return $this->accessor->get($execution->getRootExecution()); diff --git a/src/batch/src/Job/Parameters/SiblingJobExecutionAccessor.php b/src/batch/src/Job/Parameters/SiblingJobExecutionAccessor.php index f79c0f71..ae83f5b0 100644 --- a/src/batch/src/Job/Parameters/SiblingJobExecutionAccessor.php +++ b/src/batch/src/Job/Parameters/SiblingJobExecutionAccessor.php @@ -19,9 +19,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { $parent = $execution->getParentExecution(); diff --git a/src/batch/src/Job/Parameters/StaticValueParameterAccessor.php b/src/batch/src/Job/Parameters/StaticValueParameterAccessor.php index 4423773d..ca3500c9 100644 --- a/src/batch/src/Job/Parameters/StaticValueParameterAccessor.php +++ b/src/batch/src/Job/Parameters/StaticValueParameterAccessor.php @@ -16,9 +16,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function get(JobExecution $execution): mixed { return $this->value; diff --git a/src/batch/src/Job/SummaryAwareTrait.php b/src/batch/src/Job/SummaryAwareTrait.php index cec24d1c..8253d742 100644 --- a/src/batch/src/Job/SummaryAwareTrait.php +++ b/src/batch/src/Job/SummaryAwareTrait.php @@ -13,9 +13,7 @@ trait SummaryAwareTrait { private Summary $summary; - /** - * @inheritdoc - */ + public function setSummary(Summary $summary): void { $this->summary = $summary; diff --git a/src/batch/src/JobExecutionLogger.php b/src/batch/src/JobExecutionLogger.php index 466cddf5..0f428b39 100644 --- a/src/batch/src/JobExecutionLogger.php +++ b/src/batch/src/JobExecutionLogger.php @@ -40,7 +40,6 @@ public function __construct( } /** - * @inheritDoc * @param array $context */ public function log($level, $message, array $context = []): void diff --git a/src/batch/src/JobParameters.php b/src/batch/src/JobParameters.php index 7e1bf85a..902ed21d 100644 --- a/src/batch/src/JobParameters.php +++ b/src/batch/src/JobParameters.php @@ -61,16 +61,13 @@ public function get(string $name): mixed return $this->parameters[$name]; } - /** - * @inheritDoc - */ + public function count(): int { return count($this->parameters); } /** - * @inheritDoc * @phpstan-return ArrayIterator */ public function getIterator(): ArrayIterator diff --git a/src/batch/src/Launcher/SimpleJobLauncher.php b/src/batch/src/Launcher/SimpleJobLauncher.php index 30384f28..b8c1bdd8 100644 --- a/src/batch/src/Launcher/SimpleJobLauncher.php +++ b/src/batch/src/Launcher/SimpleJobLauncher.php @@ -20,9 +20,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function launch(string $name, array $configuration = []): JobExecution { $execution = $this->jobExecutionAccessor->get($name, $configuration); diff --git a/src/batch/src/Serializer/JsonJobExecutionSerializer.php b/src/batch/src/Serializer/JsonJobExecutionSerializer.php index 468a6025..edaee921 100644 --- a/src/batch/src/Serializer/JsonJobExecutionSerializer.php +++ b/src/batch/src/Serializer/JsonJobExecutionSerializer.php @@ -25,9 +25,6 @@ */ final class JsonJobExecutionSerializer implements JobExecutionSerializerInterface { - /** - * @inheritdoc - */ public function serialize(JobExecution $jobExecution): string { try { @@ -42,9 +39,7 @@ public function serialize(JobExecution $jobExecution): string return $json; } - /** - * @inheritdoc - */ + public function unserialize(string $serializedJobExecution): JobExecution { try { @@ -62,9 +57,7 @@ public function unserialize(string $serializedJobExecution): JobExecution } } - /** - * @inheritdoc - */ + public function extension(): string { return 'json'; diff --git a/src/batch/src/Storage/FilesystemJobExecutionStorage.php b/src/batch/src/Storage/FilesystemJobExecutionStorage.php index 0f12a12e..95effe09 100644 --- a/src/batch/src/Storage/FilesystemJobExecutionStorage.php +++ b/src/batch/src/Storage/FilesystemJobExecutionStorage.php @@ -35,9 +35,7 @@ public function __construct( ) { } - /** - * @inheritDoc - */ + public function store(JobExecution $execution): void { try { @@ -47,9 +45,7 @@ public function store(JobExecution $execution): void } } - /** - * @inheritDoc - */ + public function remove(JobExecution $execution): void { try { @@ -65,9 +61,7 @@ public function remove(JobExecution $execution): void } } - /** - * @inheritDoc - */ + public function retrieve(string $jobName, string $executionId): JobExecution { try { @@ -79,9 +73,7 @@ public function retrieve(string $jobName, string $executionId): JobExecution } } - /** - * @inheritDoc - */ + public function list(string $jobName): iterable { $glob = new \GlobIterator($this->buildFilePath($jobName, '*')); @@ -95,9 +87,7 @@ public function list(string $jobName): iterable } } - /** - * @inheritDoc - */ + public function query(Query $query): iterable { $candidates = []; diff --git a/src/batch/src/Storage/NullJobExecutionStorage.php b/src/batch/src/Storage/NullJobExecutionStorage.php index b20fec36..eab08a8c 100644 --- a/src/batch/src/Storage/NullJobExecutionStorage.php +++ b/src/batch/src/Storage/NullJobExecutionStorage.php @@ -12,23 +12,16 @@ */ final class NullJobExecutionStorage implements JobExecutionStorageInterface { - /** - * @inheritDoc - */ public function store(JobExecution $execution): void { } - /** - * @inheritDoc - */ + public function remove(JobExecution $execution): void { } - /** - * @inheritDoc - */ + public function retrieve(string $jobName, string $executionId): JobExecution { try { diff --git a/src/batch/src/Summary.php b/src/batch/src/Summary.php index eee26df0..b8865149 100644 --- a/src/batch/src/Summary.php +++ b/src/batch/src/Summary.php @@ -32,7 +32,7 @@ public function __construct( } /** - * Set value. + * Set summary value. */ public function set(string $key, mixed $info): void { @@ -95,7 +95,6 @@ public function clear(): void } /** - * @inheritdoc * @phpstan-return ArrayIterator */ public function getIterator(): ArrayIterator @@ -103,9 +102,7 @@ public function getIterator(): ArrayIterator return new ArrayIterator($this->values); } - /** - * @inheritdoc - */ + public function count(): int { return count($this->values); diff --git a/src/batch/src/Test/Factory/SequenceJobExecutionIdGenerator.php b/src/batch/src/Test/Factory/SequenceJobExecutionIdGenerator.php index 22a016dc..8c3bb8bb 100644 --- a/src/batch/src/Test/Factory/SequenceJobExecutionIdGenerator.php +++ b/src/batch/src/Test/Factory/SequenceJobExecutionIdGenerator.php @@ -26,9 +26,7 @@ public function __construct(array $sequence) $this->sequence = \array_values($sequence); } - /** - * @inheritdoc - */ + public function generate(): string { $current = $this->sequence[$this->current] ?? ''; diff --git a/src/batch/src/Test/Finder/DummyFinder.php b/src/batch/src/Test/Finder/DummyFinder.php index d04747b1..5d7288ec 100644 --- a/src/batch/src/Test/Finder/DummyFinder.php +++ b/src/batch/src/Test/Finder/DummyFinder.php @@ -22,9 +22,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function find(mixed $subject): object { return $this->object; diff --git a/src/batch/src/Test/Job/Item/Reader/TestDebugReader.php b/src/batch/src/Test/Job/Item/Reader/TestDebugReader.php index c1fed391..4a0c6bf3 100644 --- a/src/batch/src/Test/Job/Item/Reader/TestDebugReader.php +++ b/src/batch/src/Test/Job/Item/Reader/TestDebugReader.php @@ -23,18 +23,14 @@ public function __construct(ItemReaderInterface $decorated) $this->decorated = $decorated; } - /** - * @inheritdoc - */ + public function initialize(): void { $this->read = false; parent::initialize(); } - /** - * @inheritdoc - */ + public function read(): iterable { $this->read = true; diff --git a/src/batch/src/Test/Job/Item/Writer/InMemoryWriter.php b/src/batch/src/Test/Job/Item/Writer/InMemoryWriter.php index d4d3ff42..df2f0eaa 100644 --- a/src/batch/src/Test/Job/Item/Writer/InMemoryWriter.php +++ b/src/batch/src/Test/Job/Item/Writer/InMemoryWriter.php @@ -25,17 +25,13 @@ final class InMemoryWriter implements ItemWriterInterface, InitializableInterfac */ private array $batchItems = []; - /** - * @inheritdoc - */ + public function initialize(): void { $this->items = []; } - /** - * @inheritdoc - */ + public function write(iterable $items): void { $batch = []; diff --git a/src/batch/src/Test/Job/Item/Writer/TestDebugWriter.php b/src/batch/src/Test/Job/Item/Writer/TestDebugWriter.php index e8077c2d..ad1bdc8f 100644 --- a/src/batch/src/Test/Job/Item/Writer/TestDebugWriter.php +++ b/src/batch/src/Test/Job/Item/Writer/TestDebugWriter.php @@ -23,18 +23,14 @@ public function __construct(ItemWriterInterface $decorated) $this->decorated = $decorated; } - /** - * @inheritdoc - */ + public function initialize(): void { $this->written = false; parent::initialize(); } - /** - * @inheritdoc - */ + public function write(iterable $items): void { $this->written = true; diff --git a/src/batch/src/Test/Launcher/BufferingJobLauncher.php b/src/batch/src/Test/Launcher/BufferingJobLauncher.php index 61dc100d..f0481afa 100644 --- a/src/batch/src/Test/Launcher/BufferingJobLauncher.php +++ b/src/batch/src/Test/Launcher/BufferingJobLauncher.php @@ -26,9 +26,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function launch(string $name, array $configuration = []): JobExecution { /** @var string $id */ diff --git a/src/batch/src/Test/Storage/InMemoryJobExecutionStorage.php b/src/batch/src/Test/Storage/InMemoryJobExecutionStorage.php index e0b8e2ae..004db297 100644 --- a/src/batch/src/Test/Storage/InMemoryJobExecutionStorage.php +++ b/src/batch/src/Test/Storage/InMemoryJobExecutionStorage.php @@ -28,17 +28,13 @@ public function __construct(JobExecution ...$executions) } } - /** - * @inheritDoc - */ + public function store(JobExecution $execution): void { $this->executions[self::buildKeyFrom($execution)] = $execution; } - /** - * @inheritDoc - */ + public function remove(JobExecution $execution): void { $key = self::buildKeyFrom($execution); @@ -49,9 +45,7 @@ public function remove(JobExecution $execution): void unset($this->executions[$key]); } - /** - * @inheritDoc - */ + public function retrieve(string $jobName, string $executionId): JobExecution { $key = self::buildKey($jobName, $executionId); diff --git a/src/batch/src/Trigger/Scheduler/CallbackScheduler.php b/src/batch/src/Trigger/Scheduler/CallbackScheduler.php index a22c58cd..455e052e 100644 --- a/src/batch/src/Trigger/Scheduler/CallbackScheduler.php +++ b/src/batch/src/Trigger/Scheduler/CallbackScheduler.php @@ -44,7 +44,6 @@ public function __construct(array $config) } /** - * @inheritdoc * @phpstan-return Generator */ public function get(JobExecution $execution): Generator diff --git a/src/batch/src/Trigger/TriggerScheduledJobsJob.php b/src/batch/src/Trigger/TriggerScheduledJobsJob.php index 1e4833ca..779c3dee 100644 --- a/src/batch/src/Trigger/TriggerScheduledJobsJob.php +++ b/src/batch/src/Trigger/TriggerScheduledJobsJob.php @@ -29,9 +29,7 @@ public function __construct( ) { } - /** - * @inheritdoc - */ + public function execute(JobExecution $jobExecution): void { $jobs = []; diff --git a/src/batch/tests/Job/Item/Reader/StaticIterableReaderTest.php b/src/batch/tests/Job/Item/Reader/StaticIterableReaderTest.php index 653e35c0..ff89a3d1 100644 --- a/src/batch/tests/Job/Item/Reader/StaticIterableReaderTest.php +++ b/src/batch/tests/Job/Item/Reader/StaticIterableReaderTest.php @@ -29,9 +29,6 @@ public function items(): \Iterator $items = [1, 2, 3]; $aggregate = new class($items) implements \IteratorAggregate { - /** - * @var array - */ private array $items; public function __construct(array $items) diff --git a/tests/integration/JobTestCase.php b/tests/integration/JobTestCase.php index 6ee4c57e..fb1645a9 100644 --- a/tests/integration/JobTestCase.php +++ b/tests/integration/JobTestCase.php @@ -28,9 +28,7 @@ abstract class JobTestCase extends TestCase private static $run = false; - /** - * @inheritDoc - */ + public static function setUpBeforeClass(): void { if (!self::$run) { diff --git a/tests/symfony/src/Job/Country/CountryJsonFileReader.php b/tests/symfony/src/Job/Country/CountryJsonFileReader.php index bf0cfc53..d0e64283 100644 --- a/tests/symfony/src/Job/Country/CountryJsonFileReader.php +++ b/tests/symfony/src/Job/Country/CountryJsonFileReader.php @@ -20,9 +20,7 @@ public function __construct(JobParameterAccessorInterface $filePath) $this->filePath = $filePath; } - /** - * @inheritDoc - */ + public function read(): iterable { $data = (array)\json_decode( From 089a7466a260b93887d2a0cc6a6472201fbe33e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Sun, 4 Jun 2023 11:35:31 +0200 Subject: [PATCH 6/7] Add ECS array set --- ecs.php | 11 +++++++++++ .../tests/DoctrineDBALJobExecutionStorageTest.php | 10 +++++----- src/batch/tests/FailureTest.php | 4 ++-- src/batch/tests/Job/Item/ItemJobTest.php | 6 +++--- .../Job/Item/Reader/ParameterAccessorReaderTest.php | 4 ++-- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ecs.php b/ecs.php index e89461ed..29e02613 100644 --- a/ecs.php +++ b/ecs.php @@ -4,6 +4,9 @@ use PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\ForbiddenFunctionsSniff; use PhpCsFixer\Fixer\FunctionNotation\FunctionDeclarationFixer; +use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayListItemNewlineFixer; +use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayOpenerAndCloserNewlineFixer; +use Symplify\CodingStandard\Fixer\ArrayNotation\StandaloneLineInMultilineArrayFixer; use Symplify\EasyCodingStandard\Config\ECSConfig; use Symplify\EasyCodingStandard\ValueObject\Set\SetList; @@ -17,6 +20,7 @@ ]); $ecsConfig->sets([ + SetList::ARRAY, SetList::DOCBLOCK, SetList::NAMESPACES, SetList::COMMENTS, @@ -24,6 +28,13 @@ SetList::PSR_12, ]); + $ecsConfig->skip([ + /* Do not force array on multiple lines : ['foo' => $foo, 'bar' => $bar] */ + ArrayOpenerAndCloserNewlineFixer::class, + ArrayListItemNewlineFixer::class, + StandaloneLineInMultilineArrayFixer::class, + ]); + $ecsConfig->ruleWithConfiguration(ForbiddenFunctionsSniff::class, [ 'forbiddenFunctions' => ['dump' => null, 'dd' => null, 'var_dump' => null, 'die' => null], ]); diff --git a/src/batch-doctrine-dbal/tests/DoctrineDBALJobExecutionStorageTest.php b/src/batch-doctrine-dbal/tests/DoctrineDBALJobExecutionStorageTest.php index 7df4359f..ef1e989b 100644 --- a/src/batch-doctrine-dbal/tests/DoctrineDBALJobExecutionStorageTest.php +++ b/src/batch-doctrine-dbal/tests/DoctrineDBALJobExecutionStorageTest.php @@ -226,23 +226,23 @@ public function retrieveInvalid(): \Generator { yield '"parameters" column value is expected to be array' => [ ['parameters' => '"string"'], - UnexpectedValueException::type('array', 'string') + UnexpectedValueException::type('array', 'string'), ]; yield '"summary" column value is expected to be array' => [ ['summary' => '"string"'], - UnexpectedValueException::type('array', 'string') + UnexpectedValueException::type('array', 'string'), ]; yield '"failures" column value is expected to be array' => [ ['failures' => '"string"'], - UnexpectedValueException::type('array', 'string') + UnexpectedValueException::type('array', 'string'), ]; yield '"warnings" column value is expected to be array' => [ ['warnings' => '"string"'], - UnexpectedValueException::type('array', 'string') + UnexpectedValueException::type('array', 'string'), ]; yield '"child_executions" column value is expected to be array' => [ ['child_executions' => '"string"'], - UnexpectedValueException::type('array', 'string') + UnexpectedValueException::type('array', 'string'), ]; } diff --git a/src/batch/tests/FailureTest.php b/src/batch/tests/FailureTest.php index 046678f3..54d166f1 100644 --- a/src/batch/tests/FailureTest.php +++ b/src/batch/tests/FailureTest.php @@ -50,7 +50,7 @@ public function failures(): Generator 'LogicException: I will fail because of {var}', ], ['{var}' => 'test var'], - 'I will fail because of test var' + 'I will fail because of test var', ]; yield [ fn() => Failure::fromException( @@ -64,7 +64,7 @@ public function failures(): Generator 'Caused by: LogicException: Previous exception', ], [], - 'This is a test' + 'This is a test', ]; } } diff --git a/src/batch/tests/Job/Item/ItemJobTest.php b/src/batch/tests/Job/Item/ItemJobTest.php index 51ea9799..45066e4e 100644 --- a/src/batch/tests/Job/Item/ItemJobTest.php +++ b/src/batch/tests/Job/Item/ItemJobTest.php @@ -111,10 +111,10 @@ public function testWithExpandItem(Closure $callback): void public function expand(): \Generator { yield [ - fn($item) => new ExpandProcessedItem(['fruit:' . $item, 'vegetable:' . $item]) + fn($item) => new ExpandProcessedItem(['fruit:' . $item, 'vegetable:' . $item]), ]; yield [ - fn($item) => new ExpandProcessedItem(new ArrayIterator(['fruit:' . $item, 'vegetable:' . $item])) + fn($item) => new ExpandProcessedItem(new ArrayIterator(['fruit:' . $item, 'vegetable:' . $item])), ]; yield [ function ($item) { @@ -124,7 +124,7 @@ function ($item) { }; return new ExpandProcessedItem($generator()); - } + }, ]; } } diff --git a/src/batch/tests/Job/Item/Reader/ParameterAccessorReaderTest.php b/src/batch/tests/Job/Item/Reader/ParameterAccessorReaderTest.php index 1ef6d0df..99445616 100644 --- a/src/batch/tests/Job/Item/Reader/ParameterAccessorReaderTest.php +++ b/src/batch/tests/Job/Item/Reader/ParameterAccessorReaderTest.php @@ -33,12 +33,12 @@ public function provider(): Generator { yield 'Read from preserved iterable' => [ new StaticValueParameterAccessor([1 => 'One', 2 => 'Two', 3 => 'Three']), - [1 => 'One', 2 => 'Two', 3 => 'Three'] + [1 => 'One', 2 => 'Two', 3 => 'Three'], ]; yield 'Read from static' => [ new StaticValueParameterAccessor('Not iterable and converted to array'), - ['Not iterable and converted to array'] + ['Not iterable and converted to array'], ]; } } From 4e135c50f9b8051484878dc19b6613c7f634fa3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Mon, 5 Jun 2023 08:49:49 +0200 Subject: [PATCH 7/7] Fixed multiple blank lines between methods --- src/batch-box-spout/src/Reader/FlatFileReader.php | 1 - src/batch-box-spout/src/Reader/Options/CSVOptions.php | 2 -- src/batch-box-spout/src/Reader/Options/ODSOptions.php | 2 -- src/batch-box-spout/src/Reader/Options/XLSXOptions.php | 2 -- src/batch-box-spout/src/Writer/FlatFileWriter.php | 3 --- src/batch-box-spout/src/Writer/Options/CSVOptions.php | 1 - src/batch-box-spout/src/Writer/Options/ODSOptions.php | 1 - src/batch-box-spout/src/Writer/Options/XLSXOptions.php | 1 - src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php | 1 - .../src/DoctrineDBALJobExecutionStorage.php | 5 ----- src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php | 1 - src/batch-doctrine-orm/src/EntityReader.php | 1 - src/batch-doctrine-persistence/src/ObjectWriter.php | 1 - src/batch-symfony-console/src/RunCommandJobLauncher.php | 1 - src/batch-symfony-console/src/RunJobCommand.php | 2 -- .../src/ContainerParameterAccessor.php | 1 - .../src/DispatchMessageJobLauncher.php | 1 - .../tests/LaunchJobMessageHandlerTest.php | 1 + .../src/DenormalizeItemProcessor.php | 1 - src/batch-symfony-serializer/src/NormalizeItemProcessor.php | 1 - src/batch-symfony-validator/src/SkipInvalidItemProcessor.php | 1 - src/batch-symfony-validator/src/SkipItemOnViolations.php | 1 - src/batch/src/Finder/CallbackFinder.php | 1 - src/batch/src/Job/Item/AbstractElementDecorator.php | 2 -- src/batch/src/Job/Item/Exception/SkipItemOnError.php | 1 - src/batch/src/Job/Item/Exception/SkipItemWithWarning.php | 1 - src/batch/src/Job/Item/ItemJob.php | 1 - src/batch/src/Job/Item/Processor/ChainProcessor.php | 2 -- src/batch/src/Job/Item/Processor/FilterUniqueProcessor.php | 1 - src/batch/src/Job/Item/Processor/RoutingProcessor.php | 3 --- src/batch/src/Job/Item/Reader/AddMetadataReader.php | 1 - src/batch/src/Job/Item/Reader/IndexWithReader.php | 2 -- src/batch/src/Job/Item/Reader/ParameterAccessorReader.php | 1 - src/batch/src/Job/Item/Reader/SequenceReader.php | 2 -- src/batch/src/Job/Item/Reader/StaticIterableReader.php | 1 - src/batch/src/Job/Item/Writer/ChainWriter.php | 2 -- src/batch/src/Job/Item/Writer/Filesystem/JsonLinesWriter.php | 3 --- src/batch/src/Job/Item/Writer/RoutingWriter.php | 3 --- src/batch/src/Job/Item/Writer/SummaryWriter.php | 1 - src/batch/src/Job/JobExecutionAwareTrait.php | 1 - src/batch/src/Job/JobParametersAwareTrait.php | 1 - src/batch/src/Job/JobWithChildJobs.php | 1 - src/batch/src/Job/Parameters/ChainParameterAccessor.php | 1 - src/batch/src/Job/Parameters/ClosestJobExecutionAccessor.php | 1 - src/batch/src/Job/Parameters/DefaultParameterAccessor.php | 1 - .../src/Job/Parameters/JobExecutionParameterAccessor.php | 1 - src/batch/src/Job/Parameters/JobExecutionSummaryAccessor.php | 1 - src/batch/src/Job/Parameters/ParentJobExecutionAccessor.php | 1 - .../Job/Parameters/ReplaceWithVariablesParameterAccessor.php | 1 - src/batch/src/Job/Parameters/RootJobExecutionAccessor.php | 1 - src/batch/src/Job/Parameters/SiblingJobExecutionAccessor.php | 1 - .../src/Job/Parameters/StaticValueParameterAccessor.php | 1 - src/batch/src/Job/SummaryAwareTrait.php | 1 - src/batch/src/JobParameters.php | 1 - src/batch/src/Launcher/SimpleJobLauncher.php | 1 - src/batch/src/Serializer/JsonJobExecutionSerializer.php | 2 -- src/batch/src/Storage/FilesystemJobExecutionStorage.php | 5 ----- src/batch/src/Storage/NullJobExecutionStorage.php | 2 -- src/batch/src/Summary.php | 1 - .../src/Test/Factory/SequenceJobExecutionIdGenerator.php | 1 - src/batch/src/Test/Finder/DummyFinder.php | 1 - src/batch/src/Test/Job/Item/Reader/TestDebugReader.php | 2 -- src/batch/src/Test/Job/Item/Writer/InMemoryWriter.php | 2 -- src/batch/src/Test/Job/Item/Writer/TestDebugWriter.php | 2 -- src/batch/src/Test/Launcher/BufferingJobLauncher.php | 1 - src/batch/src/Test/Storage/InMemoryJobExecutionStorage.php | 3 --- src/batch/src/Trigger/TriggerScheduledJobsJob.php | 1 - tests/integration/JobTestCase.php | 1 - tests/symfony/src/Job/Country/CountryJsonFileReader.php | 1 - 69 files changed, 1 insertion(+), 100 deletions(-) diff --git a/src/batch-box-spout/src/Reader/FlatFileReader.php b/src/batch-box-spout/src/Reader/FlatFileReader.php index a109f117..eb09dc55 100644 --- a/src/batch-box-spout/src/Reader/FlatFileReader.php +++ b/src/batch-box-spout/src/Reader/FlatFileReader.php @@ -36,7 +36,6 @@ public function __construct( $this->headerStrategy = $headerStrategy ?? HeaderStrategy::skip(); } - public function read(): iterable { /** @var string $path */ diff --git a/src/batch-box-spout/src/Reader/Options/CSVOptions.php b/src/batch-box-spout/src/Reader/Options/CSVOptions.php index fab0584e..32ff2dcf 100644 --- a/src/batch-box-spout/src/Reader/Options/CSVOptions.php +++ b/src/batch-box-spout/src/Reader/Options/CSVOptions.php @@ -22,7 +22,6 @@ public function __construct( ) { } - public function configure(ReaderInterface $reader): void { if (!$reader instanceof CSVReader) { @@ -36,7 +35,6 @@ public function configure(ReaderInterface $reader): void $reader->setShouldPreserveEmptyRows($this->preserveEmptyRows); } - public function getSheets(ReaderInterface $reader): iterable { return $reader->getSheetIterator(); diff --git a/src/batch-box-spout/src/Reader/Options/ODSOptions.php b/src/batch-box-spout/src/Reader/Options/ODSOptions.php index 06313017..44ea3dc5 100644 --- a/src/batch-box-spout/src/Reader/Options/ODSOptions.php +++ b/src/batch-box-spout/src/Reader/Options/ODSOptions.php @@ -23,7 +23,6 @@ public function __construct( $this->sheetFilter = $sheetFilter ?? SheetFilter::all(); } - public function configure(ReaderInterface $reader): void { if (!$reader instanceof ODSReader) { @@ -34,7 +33,6 @@ public function configure(ReaderInterface $reader): void $reader->setShouldPreserveEmptyRows($this->preserveEmptyRows); } - public function getSheets(ReaderInterface $reader): iterable { yield from $this->sheetFilter->getSheets($reader); diff --git a/src/batch-box-spout/src/Reader/Options/XLSXOptions.php b/src/batch-box-spout/src/Reader/Options/XLSXOptions.php index 6e0c8827..9912ac6f 100644 --- a/src/batch-box-spout/src/Reader/Options/XLSXOptions.php +++ b/src/batch-box-spout/src/Reader/Options/XLSXOptions.php @@ -23,7 +23,6 @@ public function __construct( $this->sheetFilter = $sheetFilter ?? SheetFilter::all(); } - public function configure(ReaderInterface $reader): void { if (!$reader instanceof XLSXReader) { @@ -34,7 +33,6 @@ public function configure(ReaderInterface $reader): void $reader->setShouldPreserveEmptyRows($this->preserveEmptyRows); } - public function getSheets(ReaderInterface $reader): iterable { yield from $this->sheetFilter->getSheets($reader); diff --git a/src/batch-box-spout/src/Writer/FlatFileWriter.php b/src/batch-box-spout/src/Writer/FlatFileWriter.php index 0a0c28d2..af352dfb 100644 --- a/src/batch-box-spout/src/Writer/FlatFileWriter.php +++ b/src/batch-box-spout/src/Writer/FlatFileWriter.php @@ -46,7 +46,6 @@ public function __construct( ) { } - public function initialize(): void { /** @var string $path */ @@ -65,7 +64,6 @@ public function initialize(): void } } - public function write(iterable $items): void { $writer = $this->writer; @@ -98,7 +96,6 @@ public function write(iterable $items): void } } - public function flush(): void { if ($this->writer === null) { diff --git a/src/batch-box-spout/src/Writer/Options/CSVOptions.php b/src/batch-box-spout/src/Writer/Options/CSVOptions.php index 1470360b..fd878686 100644 --- a/src/batch-box-spout/src/Writer/Options/CSVOptions.php +++ b/src/batch-box-spout/src/Writer/Options/CSVOptions.php @@ -20,7 +20,6 @@ public function __construct( ) { } - public function configure(WriterInterface $writer): void { if (!$writer instanceof CSVWriter) { diff --git a/src/batch-box-spout/src/Writer/Options/ODSOptions.php b/src/batch-box-spout/src/Writer/Options/ODSOptions.php index b42d9d7b..d2fab9f4 100644 --- a/src/batch-box-spout/src/Writer/Options/ODSOptions.php +++ b/src/batch-box-spout/src/Writer/Options/ODSOptions.php @@ -20,7 +20,6 @@ public function __construct( ) { } - public function configure(WriterInterface $writer): void { if (!$writer instanceof ODSWriter) { diff --git a/src/batch-box-spout/src/Writer/Options/XLSXOptions.php b/src/batch-box-spout/src/Writer/Options/XLSXOptions.php index f2e24636..293c41ca 100644 --- a/src/batch-box-spout/src/Writer/Options/XLSXOptions.php +++ b/src/batch-box-spout/src/Writer/Options/XLSXOptions.php @@ -20,7 +20,6 @@ public function __construct( ) { } - public function configure(WriterInterface $writer): void { if (!$writer instanceof XLSXWriter) { diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php b/src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php index f564f14d..0a0b7803 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php @@ -29,7 +29,6 @@ public function __construct( $this->connection = $connection; } - public function write(iterable $items): void { foreach ($items as $item) { diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php b/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php index 6fb5e831..6a3a9738 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php @@ -69,7 +69,6 @@ public function createSchema(): void $this->connection->getConfiguration()->setSchemaAssetsFilter($assetFilter); } - public function store(JobExecution $execution): void { try { @@ -92,7 +91,6 @@ public function store(JobExecution $execution): void } } - public function remove(JobExecution $execution): void { try { @@ -102,7 +100,6 @@ public function remove(JobExecution $execution): void } } - public function retrieve(string $jobName, string $executionId): JobExecution { try { @@ -114,7 +111,6 @@ public function retrieve(string $jobName, string $executionId): JobExecution return $this->fromRow($row); } - public function list(string $jobName): iterable { $qb = $this->connection->createQueryBuilder(); @@ -125,7 +121,6 @@ public function list(string $jobName): iterable yield from $this->queryList($qb->getSQL(), ['jobName' => $jobName], ['jobName' => Types::STRING]); } - public function query(Query $query): iterable { $queryParameters = []; diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php b/src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php index cb404de2..3f0a0759 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php @@ -33,7 +33,6 @@ public function __construct(ConnectionRegistry $doctrine, string $connection = n $this->connection = $connection; } - public function write(iterable $items): void { foreach ($items as $item) { diff --git a/src/batch-doctrine-orm/src/EntityReader.php b/src/batch-doctrine-orm/src/EntityReader.php index 7e91b6ba..6ac7374d 100644 --- a/src/batch-doctrine-orm/src/EntityReader.php +++ b/src/batch-doctrine-orm/src/EntityReader.php @@ -23,7 +23,6 @@ public function __construct( ) { } - public function read(): iterable { $manager = $this->doctrine->getManagerForClass($this->class); diff --git a/src/batch-doctrine-persistence/src/ObjectWriter.php b/src/batch-doctrine-persistence/src/ObjectWriter.php index 5cddbded..697dadd8 100644 --- a/src/batch-doctrine-persistence/src/ObjectWriter.php +++ b/src/batch-doctrine-persistence/src/ObjectWriter.php @@ -30,7 +30,6 @@ public function __construct( ) { } - public function write(iterable $items): void { foreach ($items as $item) { diff --git a/src/batch-symfony-console/src/RunCommandJobLauncher.php b/src/batch-symfony-console/src/RunCommandJobLauncher.php index 5736e6fd..59d6963c 100644 --- a/src/batch-symfony-console/src/RunCommandJobLauncher.php +++ b/src/batch-symfony-console/src/RunCommandJobLauncher.php @@ -28,7 +28,6 @@ public function __construct( ) { } - public function launch(string $name, array $configuration = []): JobExecution { $jobExecution = $this->jobExecutionFactory->create($name, $configuration); diff --git a/src/batch-symfony-console/src/RunJobCommand.php b/src/batch-symfony-console/src/RunJobCommand.php index 2b93e040..87b3d2ac 100644 --- a/src/batch-symfony-console/src/RunJobCommand.php +++ b/src/batch-symfony-console/src/RunJobCommand.php @@ -34,7 +34,6 @@ public function __construct( parent::__construct(); } - protected function configure(): void { $this->setDescription('Execute any job.'); @@ -44,7 +43,6 @@ protected function configure(): void $this->addUsage('export \'{"toFile":"/path/to/file.xml"}\''); } - protected function execute(InputInterface $input, OutputInterface $output): int { /** @var string $jobName */ diff --git a/src/batch-symfony-framework/src/ContainerParameterAccessor.php b/src/batch-symfony-framework/src/ContainerParameterAccessor.php index 50daad88..30ef25f3 100644 --- a/src/batch-symfony-framework/src/ContainerParameterAccessor.php +++ b/src/batch-symfony-framework/src/ContainerParameterAccessor.php @@ -21,7 +21,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { try { diff --git a/src/batch-symfony-messenger/src/DispatchMessageJobLauncher.php b/src/batch-symfony-messenger/src/DispatchMessageJobLauncher.php index a8704400..43969a37 100644 --- a/src/batch-symfony-messenger/src/DispatchMessageJobLauncher.php +++ b/src/batch-symfony-messenger/src/DispatchMessageJobLauncher.php @@ -24,7 +24,6 @@ public function __construct( ) { } - public function launch(string $name, array $configuration = []): JobExecution { // create and store execution before dispatching message diff --git a/src/batch-symfony-messenger/tests/LaunchJobMessageHandlerTest.php b/src/batch-symfony-messenger/tests/LaunchJobMessageHandlerTest.php index 344d9457..7da6449e 100644 --- a/src/batch-symfony-messenger/tests/LaunchJobMessageHandlerTest.php +++ b/src/batch-symfony-messenger/tests/LaunchJobMessageHandlerTest.php @@ -25,6 +25,7 @@ public function testInvoke(): void { $job = new class() implements JobInterface { public JobExecution $execution; + public function execute(JobExecution $jobExecution): void { $this->execution = $jobExecution; diff --git a/src/batch-symfony-serializer/src/DenormalizeItemProcessor.php b/src/batch-symfony-serializer/src/DenormalizeItemProcessor.php index 1a9c96c5..fa68c753 100644 --- a/src/batch-symfony-serializer/src/DenormalizeItemProcessor.php +++ b/src/batch-symfony-serializer/src/DenormalizeItemProcessor.php @@ -26,7 +26,6 @@ public function __construct( ) { } - public function process(mixed $item): mixed { try { diff --git a/src/batch-symfony-serializer/src/NormalizeItemProcessor.php b/src/batch-symfony-serializer/src/NormalizeItemProcessor.php index 22149c3e..67bca62b 100644 --- a/src/batch-symfony-serializer/src/NormalizeItemProcessor.php +++ b/src/batch-symfony-serializer/src/NormalizeItemProcessor.php @@ -25,7 +25,6 @@ public function __construct( ) { } - public function process(mixed $item): mixed { try { diff --git a/src/batch-symfony-validator/src/SkipInvalidItemProcessor.php b/src/batch-symfony-validator/src/SkipInvalidItemProcessor.php index ac3b9c04..7542aa36 100644 --- a/src/batch-symfony-validator/src/SkipInvalidItemProcessor.php +++ b/src/batch-symfony-validator/src/SkipInvalidItemProcessor.php @@ -29,7 +29,6 @@ public function __construct( ) { } - public function process(mixed $item): mixed { $violations = $this->validator->validate($item, $this->contraints, $this->groups); diff --git a/src/batch-symfony-validator/src/SkipItemOnViolations.php b/src/batch-symfony-validator/src/SkipItemOnViolations.php index ff896dd7..6bc4393d 100644 --- a/src/batch-symfony-validator/src/SkipItemOnViolations.php +++ b/src/batch-symfony-validator/src/SkipItemOnViolations.php @@ -24,7 +24,6 @@ public function __construct( ) { } - public function report(JobExecution $execution, int|string $index, mixed $item): void { $execution->getSummary()->increment('invalid'); diff --git a/src/batch/src/Finder/CallbackFinder.php b/src/batch/src/Finder/CallbackFinder.php index 5db7f89d..17c8b11f 100644 --- a/src/batch/src/Finder/CallbackFinder.php +++ b/src/batch/src/Finder/CallbackFinder.php @@ -25,7 +25,6 @@ public function __construct( ) { } - public function find(mixed $subject): object { foreach ($this->strategies as [$callback, $component]) { diff --git a/src/batch/src/Job/Item/AbstractElementDecorator.php b/src/batch/src/Job/Item/AbstractElementDecorator.php index 818f72f6..256a6045 100644 --- a/src/batch/src/Job/Item/AbstractElementDecorator.php +++ b/src/batch/src/Job/Item/AbstractElementDecorator.php @@ -30,7 +30,6 @@ abstract class AbstractElementDecorator implements use ElementConfiguratorTrait; use JobExecutionAwareTrait; - public function initialize(): void { foreach ($this->getDecoratedElements() as $element) { @@ -39,7 +38,6 @@ public function initialize(): void } } - public function flush(): void { foreach ($this->getDecoratedElements() as $element) { diff --git a/src/batch/src/Job/Item/Exception/SkipItemOnError.php b/src/batch/src/Job/Item/Exception/SkipItemOnError.php index f2fc9423..ee642149 100644 --- a/src/batch/src/Job/Item/Exception/SkipItemOnError.php +++ b/src/batch/src/Job/Item/Exception/SkipItemOnError.php @@ -18,7 +18,6 @@ public function __construct( ) { } - public function report(JobExecution $execution, int|string $index, mixed $item): void { $execution->getSummary()->increment('errored'); diff --git a/src/batch/src/Job/Item/Exception/SkipItemWithWarning.php b/src/batch/src/Job/Item/Exception/SkipItemWithWarning.php index f26304ef..5f4e2826 100644 --- a/src/batch/src/Job/Item/Exception/SkipItemWithWarning.php +++ b/src/batch/src/Job/Item/Exception/SkipItemWithWarning.php @@ -17,7 +17,6 @@ public function __construct( ) { } - public function report(JobExecution $execution, int|string $index, mixed $item): void { $execution->addWarning(new Warning($this->message, [], ['itemIndex' => $index, 'item' => $item])); diff --git a/src/batch/src/Job/Item/ItemJob.php b/src/batch/src/Job/Item/ItemJob.php index c5e437f3..67b65866 100644 --- a/src/batch/src/Job/Item/ItemJob.php +++ b/src/batch/src/Job/Item/ItemJob.php @@ -37,7 +37,6 @@ public function __construct( $this->elements = [$reader, $processor, $writer]; } - final public function execute(JobExecution $jobExecution): void { $rootExecution = $jobExecution->getRootExecution(); diff --git a/src/batch/src/Job/Item/Processor/ChainProcessor.php b/src/batch/src/Job/Item/Processor/ChainProcessor.php index 3b9523c7..02aaee72 100644 --- a/src/batch/src/Job/Item/Processor/ChainProcessor.php +++ b/src/batch/src/Job/Item/Processor/ChainProcessor.php @@ -22,7 +22,6 @@ public function __construct( ) { } - public function process(mixed $item): mixed { /** @var ItemProcessorInterface $processor */ @@ -33,7 +32,6 @@ public function process(mixed $item): mixed return $item; } - protected function getDecoratedElements(): iterable { return $this->processors; diff --git a/src/batch/src/Job/Item/Processor/FilterUniqueProcessor.php b/src/batch/src/Job/Item/Processor/FilterUniqueProcessor.php index 288b615e..a567633b 100644 --- a/src/batch/src/Job/Item/Processor/FilterUniqueProcessor.php +++ b/src/batch/src/Job/Item/Processor/FilterUniqueProcessor.php @@ -62,7 +62,6 @@ public static function withGetter(string $getter): self return new self(fn(object $item) => $item->$getter()); } - public function process(mixed $item): mixed { $unique = (string)($this->extractUnique)($item); diff --git a/src/batch/src/Job/Item/Processor/RoutingProcessor.php b/src/batch/src/Job/Item/Processor/RoutingProcessor.php index 2a20b3aa..d57fc496 100644 --- a/src/batch/src/Job/Item/Processor/RoutingProcessor.php +++ b/src/batch/src/Job/Item/Processor/RoutingProcessor.php @@ -39,7 +39,6 @@ public function __construct( ) { } - public function process(mixed $item): mixed { $processor = $this->finder->find($item); @@ -58,13 +57,11 @@ public function process(mixed $item): mixed return $processor->process($item); } - public function initialize(): void { $this->processors = []; } - public function flush(): void { $processors = $this->processors; diff --git a/src/batch/src/Job/Item/Reader/AddMetadataReader.php b/src/batch/src/Job/Item/Reader/AddMetadataReader.php index 7238f092..78f8d47b 100644 --- a/src/batch/src/Job/Item/Reader/AddMetadataReader.php +++ b/src/batch/src/Job/Item/Reader/AddMetadataReader.php @@ -39,7 +39,6 @@ public function read(): Generator } } - protected function getDecoratedElements(): iterable { yield $this->reader; diff --git a/src/batch/src/Job/Item/Reader/IndexWithReader.php b/src/batch/src/Job/Item/Reader/IndexWithReader.php index b85a28b3..4226de97 100644 --- a/src/batch/src/Job/Item/Reader/IndexWithReader.php +++ b/src/batch/src/Job/Item/Reader/IndexWithReader.php @@ -56,7 +56,6 @@ public static function withGetter(ItemReaderInterface $reader, string $getter): return new self($reader, fn(object $item) => $item->$getter()); } - public function read(): iterable { foreach ($this->reader->read() as $item) { @@ -64,7 +63,6 @@ public function read(): iterable } } - protected function getDecoratedElements(): iterable { yield $this->reader; diff --git a/src/batch/src/Job/Item/Reader/ParameterAccessorReader.php b/src/batch/src/Job/Item/Reader/ParameterAccessorReader.php index 74573601..2e62af9b 100644 --- a/src/batch/src/Job/Item/Reader/ParameterAccessorReader.php +++ b/src/batch/src/Job/Item/Reader/ParameterAccessorReader.php @@ -21,7 +21,6 @@ public function __construct( ) { } - public function read(): iterable { $data = $this->data->get($this->jobExecution); diff --git a/src/batch/src/Job/Item/Reader/SequenceReader.php b/src/batch/src/Job/Item/Reader/SequenceReader.php index c7816cba..67229ffe 100644 --- a/src/batch/src/Job/Item/Reader/SequenceReader.php +++ b/src/batch/src/Job/Item/Reader/SequenceReader.php @@ -20,7 +20,6 @@ public function __construct( ) { } - public function read(): iterable { /** @var ItemReaderInterface $reader */ @@ -31,7 +30,6 @@ public function read(): iterable } } - protected function getDecoratedElements(): iterable { return $this->readers; diff --git a/src/batch/src/Job/Item/Reader/StaticIterableReader.php b/src/batch/src/Job/Item/Reader/StaticIterableReader.php index 39e52d7c..4301af70 100644 --- a/src/batch/src/Job/Item/Reader/StaticIterableReader.php +++ b/src/batch/src/Job/Item/Reader/StaticIterableReader.php @@ -19,7 +19,6 @@ public function __construct( ) { } - public function read(): iterable { return $this->items; diff --git a/src/batch/src/Job/Item/Writer/ChainWriter.php b/src/batch/src/Job/Item/Writer/ChainWriter.php index 0096e036..ed94a1df 100644 --- a/src/batch/src/Job/Item/Writer/ChainWriter.php +++ b/src/batch/src/Job/Item/Writer/ChainWriter.php @@ -20,7 +20,6 @@ public function __construct( ) { } - public function write(iterable $items): void { /** @var ItemWriterInterface $writer */ @@ -29,7 +28,6 @@ public function write(iterable $items): void } } - protected function getDecoratedElements(): iterable { return $this->writers; diff --git a/src/batch/src/Job/Item/Writer/Filesystem/JsonLinesWriter.php b/src/batch/src/Job/Item/Writer/Filesystem/JsonLinesWriter.php index 17f17e10..9a6b02c7 100644 --- a/src/batch/src/Job/Item/Writer/Filesystem/JsonLinesWriter.php +++ b/src/batch/src/Job/Item/Writer/Filesystem/JsonLinesWriter.php @@ -34,7 +34,6 @@ public function __construct( ) { } - public function initialize(): void { /** @var string $path */ @@ -52,7 +51,6 @@ public function initialize(): void $this->file = $file; } - public function write(iterable $items): void { foreach ($items as $json) { @@ -63,7 +61,6 @@ public function write(iterable $items): void } } - public function flush(): void { \fclose($this->file); diff --git a/src/batch/src/Job/Item/Writer/RoutingWriter.php b/src/batch/src/Job/Item/Writer/RoutingWriter.php index e728290b..ee852d2f 100644 --- a/src/batch/src/Job/Item/Writer/RoutingWriter.php +++ b/src/batch/src/Job/Item/Writer/RoutingWriter.php @@ -39,7 +39,6 @@ public function __construct( ) { } - public function write(iterable $items): void { $writerAndItems = []; @@ -66,13 +65,11 @@ public function write(iterable $items): void } } - public function initialize(): void { $this->writers = []; } - public function flush(): void { $writers = $this->writers; diff --git a/src/batch/src/Job/Item/Writer/SummaryWriter.php b/src/batch/src/Job/Item/Writer/SummaryWriter.php index ef262ea1..a9b3cb3b 100644 --- a/src/batch/src/Job/Item/Writer/SummaryWriter.php +++ b/src/batch/src/Job/Item/Writer/SummaryWriter.php @@ -23,7 +23,6 @@ public function __construct( ) { } - public function write(iterable $items): void { /** @var string $key */ diff --git a/src/batch/src/Job/JobExecutionAwareTrait.php b/src/batch/src/Job/JobExecutionAwareTrait.php index 2ee1eda9..7cf501f4 100644 --- a/src/batch/src/Job/JobExecutionAwareTrait.php +++ b/src/batch/src/Job/JobExecutionAwareTrait.php @@ -13,7 +13,6 @@ trait JobExecutionAwareTrait { private JobExecution $jobExecution; - public function setJobExecution(JobExecution $jobExecution): void { $this->jobExecution = $jobExecution; diff --git a/src/batch/src/Job/JobParametersAwareTrait.php b/src/batch/src/Job/JobParametersAwareTrait.php index 037492ee..14db420e 100644 --- a/src/batch/src/Job/JobParametersAwareTrait.php +++ b/src/batch/src/Job/JobParametersAwareTrait.php @@ -13,7 +13,6 @@ trait JobParametersAwareTrait { private JobParameters $jobParameters; - public function setJobParameters(JobParameters $jobParameters): void { $this->jobParameters = $jobParameters; diff --git a/src/batch/src/Job/JobWithChildJobs.php b/src/batch/src/Job/JobWithChildJobs.php index 179522c9..865806a0 100644 --- a/src/batch/src/Job/JobWithChildJobs.php +++ b/src/batch/src/Job/JobWithChildJobs.php @@ -24,7 +24,6 @@ public function __construct( ) { } - final public function execute(JobExecution $jobExecution): void { $logger = $jobExecution->getLogger(); diff --git a/src/batch/src/Job/Parameters/ChainParameterAccessor.php b/src/batch/src/Job/Parameters/ChainParameterAccessor.php index 15b21077..ca6d5641 100644 --- a/src/batch/src/Job/Parameters/ChainParameterAccessor.php +++ b/src/batch/src/Job/Parameters/ChainParameterAccessor.php @@ -21,7 +21,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { $tries = []; diff --git a/src/batch/src/Job/Parameters/ClosestJobExecutionAccessor.php b/src/batch/src/Job/Parameters/ClosestJobExecutionAccessor.php index 7d9638d4..ce051999 100644 --- a/src/batch/src/Job/Parameters/ClosestJobExecutionAccessor.php +++ b/src/batch/src/Job/Parameters/ClosestJobExecutionAccessor.php @@ -18,7 +18,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { $candidateExecution = $execution; diff --git a/src/batch/src/Job/Parameters/DefaultParameterAccessor.php b/src/batch/src/Job/Parameters/DefaultParameterAccessor.php index cd624299..7abf2037 100644 --- a/src/batch/src/Job/Parameters/DefaultParameterAccessor.php +++ b/src/batch/src/Job/Parameters/DefaultParameterAccessor.php @@ -19,7 +19,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { try { diff --git a/src/batch/src/Job/Parameters/JobExecutionParameterAccessor.php b/src/batch/src/Job/Parameters/JobExecutionParameterAccessor.php index 7ed3dfab..935d5cec 100644 --- a/src/batch/src/Job/Parameters/JobExecutionParameterAccessor.php +++ b/src/batch/src/Job/Parameters/JobExecutionParameterAccessor.php @@ -19,7 +19,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { try { diff --git a/src/batch/src/Job/Parameters/JobExecutionSummaryAccessor.php b/src/batch/src/Job/Parameters/JobExecutionSummaryAccessor.php index 96e96424..fc4d7661 100644 --- a/src/batch/src/Job/Parameters/JobExecutionSummaryAccessor.php +++ b/src/batch/src/Job/Parameters/JobExecutionSummaryAccessor.php @@ -18,7 +18,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { if (!$execution->getSummary()->has($this->name)) { diff --git a/src/batch/src/Job/Parameters/ParentJobExecutionAccessor.php b/src/batch/src/Job/Parameters/ParentJobExecutionAccessor.php index baae9eb2..edcd1cda 100644 --- a/src/batch/src/Job/Parameters/ParentJobExecutionAccessor.php +++ b/src/batch/src/Job/Parameters/ParentJobExecutionAccessor.php @@ -18,7 +18,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { $parent = $execution->getParentExecution(); diff --git a/src/batch/src/Job/Parameters/ReplaceWithVariablesParameterAccessor.php b/src/batch/src/Job/Parameters/ReplaceWithVariablesParameterAccessor.php index 7afe1558..8f540dd7 100644 --- a/src/batch/src/Job/Parameters/ReplaceWithVariablesParameterAccessor.php +++ b/src/batch/src/Job/Parameters/ReplaceWithVariablesParameterAccessor.php @@ -22,7 +22,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { $parameter = $this->accessor->get($execution); diff --git a/src/batch/src/Job/Parameters/RootJobExecutionAccessor.php b/src/batch/src/Job/Parameters/RootJobExecutionAccessor.php index 881136f0..c54e8586 100644 --- a/src/batch/src/Job/Parameters/RootJobExecutionAccessor.php +++ b/src/batch/src/Job/Parameters/RootJobExecutionAccessor.php @@ -17,7 +17,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { return $this->accessor->get($execution->getRootExecution()); diff --git a/src/batch/src/Job/Parameters/SiblingJobExecutionAccessor.php b/src/batch/src/Job/Parameters/SiblingJobExecutionAccessor.php index ae83f5b0..a73552be 100644 --- a/src/batch/src/Job/Parameters/SiblingJobExecutionAccessor.php +++ b/src/batch/src/Job/Parameters/SiblingJobExecutionAccessor.php @@ -19,7 +19,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { $parent = $execution->getParentExecution(); diff --git a/src/batch/src/Job/Parameters/StaticValueParameterAccessor.php b/src/batch/src/Job/Parameters/StaticValueParameterAccessor.php index ca3500c9..9b2984cd 100644 --- a/src/batch/src/Job/Parameters/StaticValueParameterAccessor.php +++ b/src/batch/src/Job/Parameters/StaticValueParameterAccessor.php @@ -16,7 +16,6 @@ public function __construct( ) { } - public function get(JobExecution $execution): mixed { return $this->value; diff --git a/src/batch/src/Job/SummaryAwareTrait.php b/src/batch/src/Job/SummaryAwareTrait.php index 8253d742..3cf6c8cf 100644 --- a/src/batch/src/Job/SummaryAwareTrait.php +++ b/src/batch/src/Job/SummaryAwareTrait.php @@ -13,7 +13,6 @@ trait SummaryAwareTrait { private Summary $summary; - public function setSummary(Summary $summary): void { $this->summary = $summary; diff --git a/src/batch/src/JobParameters.php b/src/batch/src/JobParameters.php index 902ed21d..a1f5168b 100644 --- a/src/batch/src/JobParameters.php +++ b/src/batch/src/JobParameters.php @@ -61,7 +61,6 @@ public function get(string $name): mixed return $this->parameters[$name]; } - public function count(): int { return count($this->parameters); diff --git a/src/batch/src/Launcher/SimpleJobLauncher.php b/src/batch/src/Launcher/SimpleJobLauncher.php index b8c1bdd8..fc4019c7 100644 --- a/src/batch/src/Launcher/SimpleJobLauncher.php +++ b/src/batch/src/Launcher/SimpleJobLauncher.php @@ -20,7 +20,6 @@ public function __construct( ) { } - public function launch(string $name, array $configuration = []): JobExecution { $execution = $this->jobExecutionAccessor->get($name, $configuration); diff --git a/src/batch/src/Serializer/JsonJobExecutionSerializer.php b/src/batch/src/Serializer/JsonJobExecutionSerializer.php index edaee921..7ecee368 100644 --- a/src/batch/src/Serializer/JsonJobExecutionSerializer.php +++ b/src/batch/src/Serializer/JsonJobExecutionSerializer.php @@ -39,7 +39,6 @@ public function serialize(JobExecution $jobExecution): string return $json; } - public function unserialize(string $serializedJobExecution): JobExecution { try { @@ -57,7 +56,6 @@ public function unserialize(string $serializedJobExecution): JobExecution } } - public function extension(): string { return 'json'; diff --git a/src/batch/src/Storage/FilesystemJobExecutionStorage.php b/src/batch/src/Storage/FilesystemJobExecutionStorage.php index 95effe09..02505682 100644 --- a/src/batch/src/Storage/FilesystemJobExecutionStorage.php +++ b/src/batch/src/Storage/FilesystemJobExecutionStorage.php @@ -35,7 +35,6 @@ public function __construct( ) { } - public function store(JobExecution $execution): void { try { @@ -45,7 +44,6 @@ public function store(JobExecution $execution): void } } - public function remove(JobExecution $execution): void { try { @@ -61,7 +59,6 @@ public function remove(JobExecution $execution): void } } - public function retrieve(string $jobName, string $executionId): JobExecution { try { @@ -73,7 +70,6 @@ public function retrieve(string $jobName, string $executionId): JobExecution } } - public function list(string $jobName): iterable { $glob = new \GlobIterator($this->buildFilePath($jobName, '*')); @@ -87,7 +83,6 @@ public function list(string $jobName): iterable } } - public function query(Query $query): iterable { $candidates = []; diff --git a/src/batch/src/Storage/NullJobExecutionStorage.php b/src/batch/src/Storage/NullJobExecutionStorage.php index eab08a8c..9589ba3e 100644 --- a/src/batch/src/Storage/NullJobExecutionStorage.php +++ b/src/batch/src/Storage/NullJobExecutionStorage.php @@ -16,12 +16,10 @@ public function store(JobExecution $execution): void { } - public function remove(JobExecution $execution): void { } - public function retrieve(string $jobName, string $executionId): JobExecution { try { diff --git a/src/batch/src/Summary.php b/src/batch/src/Summary.php index b8865149..d881aaa4 100644 --- a/src/batch/src/Summary.php +++ b/src/batch/src/Summary.php @@ -102,7 +102,6 @@ public function getIterator(): ArrayIterator return new ArrayIterator($this->values); } - public function count(): int { return count($this->values); diff --git a/src/batch/src/Test/Factory/SequenceJobExecutionIdGenerator.php b/src/batch/src/Test/Factory/SequenceJobExecutionIdGenerator.php index 8c3bb8bb..ad19984f 100644 --- a/src/batch/src/Test/Factory/SequenceJobExecutionIdGenerator.php +++ b/src/batch/src/Test/Factory/SequenceJobExecutionIdGenerator.php @@ -26,7 +26,6 @@ public function __construct(array $sequence) $this->sequence = \array_values($sequence); } - public function generate(): string { $current = $this->sequence[$this->current] ?? ''; diff --git a/src/batch/src/Test/Finder/DummyFinder.php b/src/batch/src/Test/Finder/DummyFinder.php index 5d7288ec..759901c8 100644 --- a/src/batch/src/Test/Finder/DummyFinder.php +++ b/src/batch/src/Test/Finder/DummyFinder.php @@ -22,7 +22,6 @@ public function __construct( ) { } - public function find(mixed $subject): object { return $this->object; diff --git a/src/batch/src/Test/Job/Item/Reader/TestDebugReader.php b/src/batch/src/Test/Job/Item/Reader/TestDebugReader.php index 4a0c6bf3..ee3c6dc3 100644 --- a/src/batch/src/Test/Job/Item/Reader/TestDebugReader.php +++ b/src/batch/src/Test/Job/Item/Reader/TestDebugReader.php @@ -23,14 +23,12 @@ public function __construct(ItemReaderInterface $decorated) $this->decorated = $decorated; } - public function initialize(): void { $this->read = false; parent::initialize(); } - public function read(): iterable { $this->read = true; diff --git a/src/batch/src/Test/Job/Item/Writer/InMemoryWriter.php b/src/batch/src/Test/Job/Item/Writer/InMemoryWriter.php index df2f0eaa..dd00f8f1 100644 --- a/src/batch/src/Test/Job/Item/Writer/InMemoryWriter.php +++ b/src/batch/src/Test/Job/Item/Writer/InMemoryWriter.php @@ -25,13 +25,11 @@ final class InMemoryWriter implements ItemWriterInterface, InitializableInterfac */ private array $batchItems = []; - public function initialize(): void { $this->items = []; } - public function write(iterable $items): void { $batch = []; diff --git a/src/batch/src/Test/Job/Item/Writer/TestDebugWriter.php b/src/batch/src/Test/Job/Item/Writer/TestDebugWriter.php index ad1bdc8f..b359d195 100644 --- a/src/batch/src/Test/Job/Item/Writer/TestDebugWriter.php +++ b/src/batch/src/Test/Job/Item/Writer/TestDebugWriter.php @@ -23,14 +23,12 @@ public function __construct(ItemWriterInterface $decorated) $this->decorated = $decorated; } - public function initialize(): void { $this->written = false; parent::initialize(); } - public function write(iterable $items): void { $this->written = true; diff --git a/src/batch/src/Test/Launcher/BufferingJobLauncher.php b/src/batch/src/Test/Launcher/BufferingJobLauncher.php index f0481afa..4606e0ed 100644 --- a/src/batch/src/Test/Launcher/BufferingJobLauncher.php +++ b/src/batch/src/Test/Launcher/BufferingJobLauncher.php @@ -26,7 +26,6 @@ public function __construct( ) { } - public function launch(string $name, array $configuration = []): JobExecution { /** @var string $id */ diff --git a/src/batch/src/Test/Storage/InMemoryJobExecutionStorage.php b/src/batch/src/Test/Storage/InMemoryJobExecutionStorage.php index 004db297..bc08347b 100644 --- a/src/batch/src/Test/Storage/InMemoryJobExecutionStorage.php +++ b/src/batch/src/Test/Storage/InMemoryJobExecutionStorage.php @@ -28,13 +28,11 @@ public function __construct(JobExecution ...$executions) } } - public function store(JobExecution $execution): void { $this->executions[self::buildKeyFrom($execution)] = $execution; } - public function remove(JobExecution $execution): void { $key = self::buildKeyFrom($execution); @@ -45,7 +43,6 @@ public function remove(JobExecution $execution): void unset($this->executions[$key]); } - public function retrieve(string $jobName, string $executionId): JobExecution { $key = self::buildKey($jobName, $executionId); diff --git a/src/batch/src/Trigger/TriggerScheduledJobsJob.php b/src/batch/src/Trigger/TriggerScheduledJobsJob.php index 779c3dee..84bf3e3f 100644 --- a/src/batch/src/Trigger/TriggerScheduledJobsJob.php +++ b/src/batch/src/Trigger/TriggerScheduledJobsJob.php @@ -29,7 +29,6 @@ public function __construct( ) { } - public function execute(JobExecution $jobExecution): void { $jobs = []; diff --git a/tests/integration/JobTestCase.php b/tests/integration/JobTestCase.php index fb1645a9..16a572df 100644 --- a/tests/integration/JobTestCase.php +++ b/tests/integration/JobTestCase.php @@ -28,7 +28,6 @@ abstract class JobTestCase extends TestCase private static $run = false; - public static function setUpBeforeClass(): void { if (!self::$run) { diff --git a/tests/symfony/src/Job/Country/CountryJsonFileReader.php b/tests/symfony/src/Job/Country/CountryJsonFileReader.php index d0e64283..b4594ee7 100644 --- a/tests/symfony/src/Job/Country/CountryJsonFileReader.php +++ b/tests/symfony/src/Job/Country/CountryJsonFileReader.php @@ -20,7 +20,6 @@ public function __construct(JobParameterAccessorInterface $filePath) $this->filePath = $filePath; } - public function read(): iterable { $data = (array)\json_decode(