Skip to content

Commit

Permalink
Merge pull request #857 from driehle/feat/php84
Browse files Browse the repository at this point in the history
Allow PHP 8.4
  • Loading branch information
driehle authored Jan 23, 2025
2 parents febcbec + e14e98e commit bac2ff8
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: "8.3"
php-version: "8.4"
2 changes: 1 addition & 1 deletion .github/workflows/composer-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ jobs:
name: "Composer Lint"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: "8.3"
php-version: "8.4"
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
name: "PHPUnit"
uses: "doctrine/.github/.github/workflows/[email protected]"
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 }}
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: "8.3"
php-version: "8.4"
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit bac2ff8

Please sign in to comment.