Skip to content
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

Jump to bottom

Finalize ORM 3 Support #2814

Merged
merged 9 commits into from
Jun 10, 2024
Merged

Finalize ORM 3 Support #2814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
06ad716
Allow ORM 3 to be installed
mbabker Jun 9, 2024
db383ea
Skip tests not executable with ORM 3
mbabker Jun 9, 2024
0306f7f
Adapt SoftDeleteableFilter::addFilterConstraint() signature for cross…
mbabker Jun 9, 2024
5079e66
Add compat layer for the translatable ORM adapter
mbabker Jun 9, 2024
70def73
Add a check to the testing bootstrap to ignore the ORM mapping namesp…
mbabker Jun 9, 2024
74cc0ce
Change the hydrator compat trait to match the object hydrators which …
mbabker Jun 9, 2024
69e3666
Short-circuit the event compat check with ORM 3
mbabker Jun 9, 2024
8b87ae4
Refresh PHPStan
mbabker Jun 9, 2024
067365a
Ensure there are builds for both ORM versions on latest PHP
mbabker Jun 9, 2024
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
19 changes: 17 additions & 2 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:

jobs:
phpunit:
name: "PHPUnit ${{ matrix.php-version }} (${{ matrix.deps }})${{ matrix.no-annotations == true && ' - Without Annotations' || '' }}"
name: "PHPUnit ${{ matrix.php-version }} (${{ matrix.deps }})${{ matrix.no-annotations == true && ' - Without Annotations' || '' }}${{ matrix.orm != '' && format(' - ORM {0}', matrix.orm) || '' }}"
runs-on: "ubuntu-20.04"

services:
Expand All @@ -33,17 +33,27 @@ jobs:
- "highest"
no-annotations:
- false
orm:
- ""
include:
- deps: "lowest"
php-version: "7.4"
- deps: "highest"
php-version: "8.3"
# Run builds on low and high PHP versions with `doctrine/annotations` removed
- deps: "highest"
php-version: "7.4"
no-annotations: true
- deps: "highest"
php-version: "8.3"
no-annotations: true
# Run builds on high PHP version with `doctrine/orm` version pinned
- deps: "highest"
php-version: "8.3"
orm: "^2.14"
- deps: "highest"
php-version: "8.3"
orm: "^3.0"

steps:
- name: "Checkout"
Expand All @@ -67,6 +77,11 @@ jobs:
if: "${{ matrix.no-annotations }}"
run: "composer remove --dev --no-update doctrine/annotations"

# Pin doctrine/orm if configured to do so
- name: "Pin doctrine/orm"
if: "${{ matrix.orm }}"
run: "composer require --dev --no-update doctrine/orm:${{ matrix.orm }}"

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v3"
with:
Expand All @@ -78,7 +93,7 @@ jobs:
- name: "Upload coverage file"
uses: "actions/upload-artifact@v4"
with:
name: "${{ github.job }}-${{ matrix.php-version }}-${{ matrix.deps }}-${{ matrix.no-annotations == true && 'no-annotations' || 'with-annotations' }}-coverage"
name: "${{ github.job }}-${{ matrix.php-version }}-${{ matrix.deps }}-${{ matrix.no-annotations == true && 'no-annotations' || 'with-annotations' }}${{ matrix.orm != '' && format('-orm-{0}', matrix.orm) || '' }}-coverage"
path: "coverage.xml"

lint-doctrine-xml-schema:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"doctrine/dbal": "^3.2",
"doctrine/doctrine-bundle": "^2.3",
"doctrine/mongodb-odm": "^2.3",
"doctrine/orm": "^2.14.0",
"doctrine/orm": "^2.14.0 || ^3.0",
"friendsofphp/php-cs-fixer": "^3.14.0",
"nesbot/carbon": "^2.71 || ^3.0",
"phpstan/phpstan": "^1.11",
Expand All @@ -75,7 +75,7 @@
"doctrine/annotations": "<1.13 || >=3.0",
"doctrine/dbal": "<3.2 || >=4.0",
"doctrine/mongodb-odm": "<2.3 || >=3.0",
"doctrine/orm": "<2.14.0 || 2.16.0 || 2.16.1 || >=3.0"
"doctrine/orm": "<2.14.0 || 2.16.0 || 2.16.1 || >=4.0"
},
"suggest": {
"doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",
Expand Down
Loading