Skip to content

Allow PHP 8.4 #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
driehle merged 2 commits into from
Jan 23, 2025
+7 −7
Merged

Allow PHP 8.4 #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd86357
allow PHP 8.4
driehle Jan 23, 2025
e14e98e
adjust conflicts
driehle Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
View file
Open in desktop
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/coding-standards.yml@6.0.0"
with:
php-version: "8.3"
php-version: "8.4"
2 changes: 1 addition & 1 deletion .github/workflows/composer-lint.yml
View file
Open in desktop
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/composer-lint.yml@6.0.0"
with:
php-version: "8.3"
php-version: "8.4"
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
View file
Open in desktop
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/phpstan.yml@6.0.0"
with:
php-version: "8.3"
php-version: "8.4"
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
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