Skip to content

Commit bac2ff8

Browse files
authored
Merge pull request #857 from driehle/feat/php84
Allow PHP 8.4
2 parents febcbec + e14e98e commit bac2ff8

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
name: "Coding Standards"
2626
uses: "doctrine/.github/.github/workflows/[email protected]"
2727
with:
28-
php-version: "8.3"
28+
php-version: "8.4"

.github/workflows/composer-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
name: "Composer Lint"
2020
uses: "doctrine/.github/.github/workflows/[email protected]"
2121
with:
22-
php-version: "8.3"
22+
php-version: "8.4"

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
name: "PHPUnit"
2626
uses: "doctrine/.github/.github/workflows/[email protected]"
2727
with:
28-
php-versions: '["8.1", "8.2", "8.3"]'
28+
php-versions: '["8.1", "8.2", "8.3", "8.4"]'
2929
secrets:
3030
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/phpstan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
name: "Static Analysis"
2626
uses: "doctrine/.github/.github/workflows/[email protected]"
2727
with:
28-
php-version: "8.3"
28+
php-version: "8.4"

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
],
1111
"homepage": "https://www.doctrine-project.org/",
1212
"require": {
13-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
13+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
1414
"composer-runtime-api": "^2.0.0",
1515
"composer/semver": "^3.0.0",
1616
"doctrine/annotations": "^2.0.0",
@@ -47,8 +47,8 @@
4747
"phpunit/phpunit": "^10.5.40"
4848
},
4949
"conflict": {
50-
"doctrine/doctrine-mongo-odm-module": "<5.2.0",
51-
"doctrine/doctrine-orm-module": "<6.2.0"
50+
"doctrine/doctrine-mongo-odm-module": "<5.3.0",
51+
"doctrine/doctrine-orm-module": "<6.3.0"
5252
},
5353
"suggest": {
5454
"doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments",

0 commit comments

Comments
 (0)