From 7a4067748d68fdb2912c9a66596029bfecac0f70 Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Tue, 18 Nov 2025 15:49:58 +0200 Subject: [PATCH 1/2] Issue #298: Bump to PHP 8.4 Signed-off-by: alexmerlin --- .github/workflows/codecov.yml | 3 ++- .github/workflows/qodana_code_quality.yml | 4 ++-- .github/workflows/static-analysis.yml | 2 +- composer.json | 6 +++--- config/autoload/cli.global.php | 4 ++-- src/Core/src/App/src/Command/RouteListCommand.php | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 59c4b08d..55cb2065 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -17,10 +17,11 @@ jobs: php: - "8.2" - "8.3" + - "8.4" steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml index 481ae73b..19cc0146 100644 --- a/.github/workflows/qodana_code_quality.yml +++ b/.github/workflows/qodana_code_quality.yml @@ -16,9 +16,9 @@ jobs: checks: write strategy: matrix: - php-versions: [ '8.2', '8.3' ] + php-versions: [ '8.2', '8.3', '8.4' ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit fetch-depth: 0 # a full history is required for pull request analysis diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index ee7251d0..b2fe6283 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install PHP uses: shivammathur/setup-php@v2 diff --git a/composer.json b/composer.json index 2a836a45..8c80fbf7 100644 --- a/composer.json +++ b/composer.json @@ -28,14 +28,14 @@ "process-timeout": 0 }, "require": { - "php": "~8.2.0 || ~8.3.0", + "php": "~8.2.0 || ~8.3.0 || ~8.4.0", "dotkernel/dot-cache": "^4.3.0", "dotkernel/dot-cli": "^3.9.0", "dotkernel/dot-data-fixtures": "^1.4.0", "dotkernel/dot-dependency-injection": "^1.2.0", "dotkernel/dot-errorhandler": "^4.0.0", "dotkernel/dot-flashmessenger": "^3.6.1", - "dotkernel/dot-geoip": "^3.9.0", + "dotkernel/dot-geoip": "^3.10.1", "dotkernel/dot-helpers": "^3.8.0", "dotkernel/dot-mail": "^5.1.5", "dotkernel/dot-navigation": "^3.5.1", @@ -53,7 +53,7 @@ "mezzio/mezzio-fastroute": "^3.13.0", "ramsey/uuid": "^4.5.0", "ramsey/uuid-doctrine": "^2.1.0", - "roave/psr-container-doctrine": "^5.2.2" + "roave/psr-container-doctrine": "^5.2.2 || ^6.0.0" }, "require-dev": { "dotkernel/dot-maker": "^1.0.2", diff --git a/config/autoload/cli.global.php b/config/autoload/cli.global.php index d9ece9a0..55da6f3f 100644 --- a/config/autoload/cli.global.php +++ b/config/autoload/cli.global.php @@ -14,8 +14,8 @@ 'version' => '1.0.0', 'name' => 'Dotkernel CLI', 'commands' => [ - RouteListCommand::getDefaultName() => RouteListCommand::class, - GeoIpCommand::getDefaultName() => GeoIpCommand::class, + GeoIpCommand::$defaultName => GeoIpCommand::class, + RouteListCommand::$defaultName => RouteListCommand::class, ], ], FileLockerInterface::class => [ diff --git a/src/Core/src/App/src/Command/RouteListCommand.php b/src/Core/src/App/src/Command/RouteListCommand.php index e9326573..d399ed50 100644 --- a/src/Core/src/App/src/Command/RouteListCommand.php +++ b/src/Core/src/App/src/Command/RouteListCommand.php @@ -31,7 +31,7 @@ class RouteListCommand extends Command { /** @var string $defaultName */ - protected static $defaultName = 'route:list'; + public static $defaultName = 'route:list'; #[Inject( Application::class, From c2cfddfbaf68012fc125ed03fd3e57a2653b4e65 Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Tue, 18 Nov 2025 15:51:29 +0200 Subject: [PATCH 2/2] Issue #298: Bump to PHP 8.4 Signed-off-by: alexmerlin --- .github/workflows/static-analysis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index b2fe6283..dd89fbf9 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -17,6 +17,7 @@ jobs: php: - "8.2" - "8.3" + - "8.4" steps: - name: Checkout