Skip to content

Commit

Permalink
Add ORM 3.x compat
Browse files Browse the repository at this point in the history
  • Loading branch information
mbabker committed Oct 12, 2023
1 parent 2630234 commit 60d3e1a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,19 +189,26 @@ jobs:
fail-fast: true
matrix:
php: ['8.1', '8.2']
orm: ['']
composer-flags: ['--prefer-stable --prefer-dist']
next-php: [false]
patch-packages: [false]
include:
- php: '8.1'
orm: ''
composer-flags: '--prefer-stable --prefer-dist --prefer-lowest'
next-php: false
- php: '8.2'
orm: '^3.0@beta'
composer-flags: '--prefer-stable --prefer-dist'
next-php: false
- php: '8.2'
orm: ''
composer-flags: '--prefer-stable --prefer-dist'
next-php: false
patch-packages: true

name: Doctrine ORM - PHP ${{ matrix.php }} - Composer ${{ matrix.composer-flags }}${{ matrix.patch-packages && ' (Patched Packages)' || '' }}
name: Doctrine ORM{{ matrix.orm != '' && format(' {0}', matrix.orm) || '' }} - PHP ${{ matrix.php }} - Composer ${{ matrix.composer-flags }}${{ matrix.patch-packages && ' (Patched Packages)' || '' }}

steps:
- name: Checkout code
Expand All @@ -219,6 +226,10 @@ jobs:
if: ${{ matrix.patch-packages }}
run: php .github/patch-packages.php

- name: Restrict ORM version
if: ${{ matrix.orm }}
run: (cd lib/Adapter/Doctrine/ORM && composer require --no-update doctrine/orm:${{ matrix.orm }})

- name: Install dependencies
run: (cd lib/Adapter/Doctrine/ORM && composer update ${{ matrix.composer-flags }})

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"doctrine/collections": "^1.8 || ^2.0",
"doctrine/dbal": "^3.5",
"doctrine/mongodb-odm": "^2.4",
"doctrine/orm": "^2.14",
"doctrine/orm": "^2.14 || ^3.0",
"doctrine/phpcr-odm": "^1.7",
"dg/bypass-finals": "^1.5.1",
"jackalope/jackalope-doctrine-dbal": "^1.9",
Expand Down
2 changes: 1 addition & 1 deletion lib/Adapter/Doctrine/ORM/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"license": "MIT",
"require": {
"php": "^8.1",
"doctrine/orm": "^2.14",
"doctrine/orm": "^2.14 || ^3.0",
"pagerfanta/core": "^3.7 || ^4.0"
},
"require-dev": {
Expand Down

0 comments on commit 60d3e1a

Please sign in to comment.