From d0aa05409746e988b21178484fd335043dc8b806 Mon Sep 17 00:00:00 2001 From: Nico Haase Date: Thu, 25 Jun 2026 20:47:44 +0200 Subject: [PATCH 1/8] updated dependencies --- .github/workflows/tests.yml | 3 ++- composer.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e96f339..7304f72 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,8 @@ jobs: symfony-version: - "5.4.x" - "6.4.x" - - "7.0.x" + - "7.4.x" + - "8.0.x" monolog-version: - "^2.9" exclude: diff --git a/composer.json b/composer.json index 3063eb9..c945f58 100644 --- a/composer.json +++ b/composer.json @@ -11,8 +11,8 @@ "require": { "php": "^7.4|^8.1", "symfony/deprecation-contracts": "^2.5|^3.4", - "symfony/framework-bundle": "^5.4|^6.4|^7.0", - "symfony/console": "^5.3|^6.4|^7.0", + "symfony/framework-bundle": "^5.4|^6.4|^7.4|^8.0", + "symfony/console": "^5.4|^6.4|^7.4|^8.0", "dragonmantank/cron-expression": "^3.3" }, "require-dev": { From 23695fe4769123b6e5ab7ce911b2264753c431ef Mon Sep 17 00:00:00 2001 From: Nico Haase Date: Thu, 25 Jun 2026 20:57:26 +0200 Subject: [PATCH 2/8] updated dependencies --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7304f72..9a33333 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ env: jobs: phpunit: name: "PHPUnit" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-24.04" strategy: matrix: From 7b478ab95c0683e4a2d3ab5d538b0a2f84af223f Mon Sep 17 00:00:00 2001 From: Nico Haase Date: Thu, 25 Jun 2026 21:01:35 +0200 Subject: [PATCH 3/8] updated dependencies --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9a33333..0aa2481 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,7 +36,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" with: fetch-depth: 2 From 33a6561fa3104b8448d5ec05ef8388e6c993b0aa Mon Sep 17 00:00:00 2001 From: Nico Haase Date: Thu, 25 Jun 2026 21:03:51 +0200 Subject: [PATCH 4/8] updated dependencies --- .github/workflows/tests.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0aa2481..c93f1b8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,6 +19,7 @@ jobs: - "8.1" - "8.2" - "8.3" + - "8.4" symfony-version: - "5.4.x" - "6.4.x" @@ -30,9 +31,15 @@ jobs: - php-version: "7.4" symfony-version: "6.4.x" - php-version: "7.4" - symfony-version: "7.0.x" + symfony-version: "7.4.x" + - php-version: "7.4" + symfony-version: "8.0.x" - php-version: "8.1" - symfony-version: "7.0.x" + symfony-version: "7.4.x" + - php-version: "8.2" + symfony-version: "8.0.x" + - php-version: "8.3" + symfony-version: "8.0.x" steps: - name: "Checkout" From e0eda4faa4462cb347caf648ffd57ff118507264 Mon Sep 17 00:00:00 2001 From: Nico Haase Date: Thu, 25 Jun 2026 21:04:43 +0200 Subject: [PATCH 5/8] updated dependencies --- .github/workflows/tests.yml | 10 ---------- composer.json | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c93f1b8..1816056 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,8 +15,6 @@ jobs: strategy: matrix: php-version: - - "7.4" - - "8.1" - "8.2" - "8.3" - "8.4" @@ -28,14 +26,6 @@ jobs: monolog-version: - "^2.9" exclude: - - php-version: "7.4" - symfony-version: "6.4.x" - - php-version: "7.4" - symfony-version: "7.4.x" - - php-version: "7.4" - symfony-version: "8.0.x" - - php-version: "8.1" - symfony-version: "7.4.x" - php-version: "8.2" symfony-version: "8.0.x" - php-version: "8.3" diff --git a/composer.json b/composer.json index c945f58..3058a93 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ }, "keywords": ["cron", "task", "scheduler", "symfony", "bundle"], "require": { - "php": "^7.4|^8.1", + "php": "^8.2", "symfony/deprecation-contracts": "^2.5|^3.4", "symfony/framework-bundle": "^5.4|^6.4|^7.4|^8.0", "symfony/console": "^5.4|^6.4|^7.4|^8.0", From eca8c0637c17e521878c2c0201249555a6cbafbe Mon Sep 17 00:00:00 2001 From: Nico Haase Date: Thu, 25 Jun 2026 21:11:32 +0200 Subject: [PATCH 6/8] updated dependencies --- .../RewieerTaskSchedulerExtension.php | 4 +-- Resources/config/services.xml | 32 ----------------- Resources/config/services.yaml | 35 +++++++++++++++++++ Task/Scheduler.php | 2 +- Tests/Command/ListCommandTest.php | 4 +-- Tests/Command/RunCommandTest.php | 6 ++-- Tests/allowedDeprecationNotices.json | 12 +++++++ composer.json | 1 + phpunit.xml.dist | 2 +- 9 files changed, 57 insertions(+), 41 deletions(-) delete mode 100644 Resources/config/services.xml create mode 100644 Resources/config/services.yaml create mode 100644 Tests/allowedDeprecationNotices.json diff --git a/DependencyInjection/RewieerTaskSchedulerExtension.php b/DependencyInjection/RewieerTaskSchedulerExtension.php index e1d5260..788d1a0 100644 --- a/DependencyInjection/RewieerTaskSchedulerExtension.php +++ b/DependencyInjection/RewieerTaskSchedulerExtension.php @@ -25,7 +25,7 @@ public function load(array $configs, ContainerBuilder $container): void $configuration = new Configuration(); $this->processConfiguration($configuration, $configs); - $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); - $loader->load('services.xml'); + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); + $loader->load('services.yaml'); } } diff --git a/Resources/config/services.xml b/Resources/config/services.xml deleted file mode 100644 index ab8c900..0000000 --- a/Resources/config/services.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml new file mode 100644 index 0000000..2e1bbc8 --- /dev/null +++ b/Resources/config/services.yaml @@ -0,0 +1,35 @@ +services: + ts.event_dispatcher: + class: Rewieer\TaskSchedulerBundle\Event\EventDispatcher + public: true + + ts.scheduler: + class: Rewieer\TaskSchedulerBundle\Task\Scheduler + public: true + arguments: + - '@ts.event_dispatcher' + + ts.scheduler_logger: + class: Rewieer\TaskSchedulerBundle\Services\SchedulerLogger + public: true + arguments: + - '@logger' + tags: + - { name: 'ts.event_subscriber' } + - { name: 'monolog.logger', channel: 'scheduler' } + + ts.list_command: + class: Rewieer\TaskSchedulerBundle\Command\ListCommand + public: true + arguments: + - '@ts.scheduler' + tags: + - { name: 'console.command' } + + ts.run_command: + class: Rewieer\TaskSchedulerBundle\Command\RunCommand + public: true + arguments: + - '@ts.scheduler' + tags: + - { name: 'console.command' } diff --git a/Task/Scheduler.php b/Task/Scheduler.php index eaebb14..db054d3 100644 --- a/Task/Scheduler.php +++ b/Task/Scheduler.php @@ -17,7 +17,7 @@ class Scheduler { private EventDispatcher $dispatcher; - public function __construct(EventDispatcher $dispatcher = null) + public function __construct(?EventDispatcher $dispatcher = null) { if ($dispatcher === null) { $dispatcher = new EventDispatcher(); diff --git a/Tests/Command/ListCommandTest.php b/Tests/Command/ListCommandTest.php index f0c6707..73233e9 100644 --- a/Tests/Command/ListCommandTest.php +++ b/Tests/Command/ListCommandTest.php @@ -33,7 +33,7 @@ public function testListCommand(): void $scheduler->addTask(new TaskMock()); $application = new Application(); - $application->add(new ListCommand($scheduler)); + $application->addCommands([new ListCommand($scheduler)]); $command = $application->find('ts:list'); @@ -55,7 +55,7 @@ public function testListCommandWithOption(): void $application = new Application(); /** @var Scheduler $scheduler */ - $application->add(new ListCommand($scheduler)); + $application->addCommands([new ListCommand($scheduler)]); $command = $application->find('ts:list'); diff --git a/Tests/Command/RunCommandTest.php b/Tests/Command/RunCommandTest.php index 216c854..3d351bd 100644 --- a/Tests/Command/RunCommandTest.php +++ b/Tests/Command/RunCommandTest.php @@ -32,7 +32,7 @@ public function testRunCommand(): void $scheduler->addTask(new TaskMock()); $application = new Application(); - $application->add(new RunCommand($scheduler)); + $application->addCommands([new RunCommand($scheduler)]); $command = $application->find('ts:run'); $commandTester = new CommandTester($command); @@ -57,7 +57,7 @@ public function testRunCommandWithId(): void $scheduler->addTask($t2); $application = new Application(); - $application->add(new RunCommand($scheduler)); + $application->addCommands([new RunCommand($scheduler)]); $command = $application->find('ts:run'); $commandTester = new CommandTester($command); @@ -85,7 +85,7 @@ public function testRunCommandWithClassName(): void $scheduler->addTask($t2); $application = new Application(); - $application->add(new RunCommand($scheduler)); + $application->addCommands([new RunCommand($scheduler)]); $command = $application->find('ts:run'); $commandTester = new CommandTester($command); diff --git a/Tests/allowedDeprecationNotices.json b/Tests/allowedDeprecationNotices.json new file mode 100644 index 0000000..83a15a1 --- /dev/null +++ b/Tests/allowedDeprecationNotices.json @@ -0,0 +1,12 @@ +[ + { + "location": "Rewieer\\TaskSchedulerBundle\\DependencyInjection\\RewieerTaskSchedulerExtension", + "message": "The \"Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension\" class is considered internal since Symfony 7.1, to be deprecated in 8.1; use Symfony\\Component\\DependencyInjection\\Extension\\Extension instead. It may change without further notice. You should not use it from \"Rewieer\\TaskSchedulerBundle\\DependencyInjection\\RewieerTaskSchedulerExtension\".", + "count": 1 + }, + { + "location": "Rewieer\\TaskSchedulerBundle\\DependencyInjection\\RewieerTaskSchedulerExtension", + "message": "The \"Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension\" class is considered internal to be deprecated in 8.1; use Symfony\\Component\\DependencyInjection\\Extension\\Extension instead. It may change without further notice. You should not use it from \"Rewieer\\TaskSchedulerBundle\\DependencyInjection\\RewieerTaskSchedulerExtension\".", + "count": 1 + } +] diff --git a/composer.json b/composer.json index 3058a93..8e54387 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,7 @@ "symfony/deprecation-contracts": "^2.5|^3.4", "symfony/framework-bundle": "^5.4|^6.4|^7.4|^8.0", "symfony/console": "^5.4|^6.4|^7.4|^8.0", + "symfony/yaml": "^5.4|^6.4|^7.4|^8.0", "dragonmantank/cron-expression": "^3.3" }, "require-dev": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6fdf589..7869021 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -25,6 +25,6 @@ - + From 4a0ea88de786ca68ceb8198b267a063c64005b8d Mon Sep 17 00:00:00 2001 From: Nico Haase Date: Thu, 25 Jun 2026 21:46:12 +0200 Subject: [PATCH 7/8] updated dependencies --- .../RewieerTaskSchedulerExtension.php | 2 +- Tests/allowedDeprecationNotices.json | 12 ------------ phpunit.xml.dist | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 Tests/allowedDeprecationNotices.json diff --git a/DependencyInjection/RewieerTaskSchedulerExtension.php b/DependencyInjection/RewieerTaskSchedulerExtension.php index 788d1a0..783ccb2 100644 --- a/DependencyInjection/RewieerTaskSchedulerExtension.php +++ b/DependencyInjection/RewieerTaskSchedulerExtension.php @@ -13,7 +13,7 @@ use Rewieer\TaskSchedulerBundle\Task\TaskInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\Extension\Extension; use Symfony\Component\DependencyInjection\Loader; class RewieerTaskSchedulerExtension extends Extension diff --git a/Tests/allowedDeprecationNotices.json b/Tests/allowedDeprecationNotices.json deleted file mode 100644 index 83a15a1..0000000 --- a/Tests/allowedDeprecationNotices.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "location": "Rewieer\\TaskSchedulerBundle\\DependencyInjection\\RewieerTaskSchedulerExtension", - "message": "The \"Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension\" class is considered internal since Symfony 7.1, to be deprecated in 8.1; use Symfony\\Component\\DependencyInjection\\Extension\\Extension instead. It may change without further notice. You should not use it from \"Rewieer\\TaskSchedulerBundle\\DependencyInjection\\RewieerTaskSchedulerExtension\".", - "count": 1 - }, - { - "location": "Rewieer\\TaskSchedulerBundle\\DependencyInjection\\RewieerTaskSchedulerExtension", - "message": "The \"Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension\" class is considered internal to be deprecated in 8.1; use Symfony\\Component\\DependencyInjection\\Extension\\Extension instead. It may change without further notice. You should not use it from \"Rewieer\\TaskSchedulerBundle\\DependencyInjection\\RewieerTaskSchedulerExtension\".", - "count": 1 - } -] diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 7869021..6fdf589 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -25,6 +25,6 @@ - + From cb455fe3bca3fd5a770ee17283206c6cc4f94212 Mon Sep 17 00:00:00 2001 From: Nico Haase Date: Thu, 25 Jun 2026 21:51:26 +0200 Subject: [PATCH 8/8] updated dependencies --- .github/workflows/phpcs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml index f05ad4b..5ae5e5f 100644 --- a/.github/workflows/phpcs.yml +++ b/.github/workflows/phpcs.yml @@ -9,7 +9,7 @@ jobs: name: PHPCS runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Setup PHP uses: shivammathur/setup-php@v2 with: