From bd863570a52c80884a15ceab1497ca9d5d5f438c Mon Sep 17 00:00:00 2001 From: Dennis Riehle Date: Thu, 23 Jan 2025 18:51:55 +0100 Subject: [PATCH 1/2] allow PHP 8.4 --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/composer-lint.yml | 2 +- .github/workflows/continuous-integration.yml | 2 +- .github/workflows/phpstan.yml | 2 +- composer.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 1e78392d..0e55e906 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -25,4 +25,4 @@ jobs: name: "Coding Standards" uses: "doctrine/.github/.github/workflows/coding-standards.yml@6.0.0" with: - php-version: "8.3" + php-version: "8.4" diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml index 39e14e0c..0b791ea1 100644 --- a/.github/workflows/composer-lint.yml +++ b/.github/workflows/composer-lint.yml @@ -19,4 +19,4 @@ jobs: name: "Composer Lint" uses: "doctrine/.github/.github/workflows/composer-lint.yml@6.0.0" with: - php-version: "8.3" + php-version: "8.4" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6e4b5e05..8ab1b788 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -25,6 +25,6 @@ jobs: name: "PHPUnit" uses: "doctrine/.github/.github/workflows/continuous-integration.yml@6.0.0" with: - php-versions: '["8.1", "8.2", "8.3"]' + php-versions: '["8.1", "8.2", "8.3", "8.4"]' secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index f1e6edc2..17457e45 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -25,4 +25,4 @@ jobs: name: "Static Analysis" uses: "doctrine/.github/.github/workflows/phpstan.yml@6.0.0" with: - php-version: "8.3" + php-version: "8.4" diff --git a/composer.json b/composer.json index ed5bbd68..e17a62c6 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ ], "homepage": "https://www.doctrine-project.org/", "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "composer-runtime-api": "^2.0.0", "composer/semver": "^3.0.0", "doctrine/annotations": "^2.0.0", From e14e98ea69467f828a172a2476e521961646efa9 Mon Sep 17 00:00:00 2001 From: Dennis Riehle Date: Thu, 23 Jan 2025 19:54:22 +0100 Subject: [PATCH 2/2] adjust conflicts --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e17a62c6..7d8f22a8 100644 --- a/composer.json +++ b/composer.json @@ -47,8 +47,8 @@ "phpunit/phpunit": "^10.5.40" }, "conflict": { - "doctrine/doctrine-mongo-odm-module": "<5.2.0", - "doctrine/doctrine-orm-module": "<6.2.0" + "doctrine/doctrine-mongo-odm-module": "<5.3.0", + "doctrine/doctrine-orm-module": "<6.3.0" }, "suggest": { "doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments",