Add ORM 3.x compat

BabDev · Oct 12, 2023 · 9e603de · 9e603de
1 parent 2630234
commit 9e603de
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -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
@@ -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 }})
 

diff --git a/composer.json b/composer.json
@@ -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",

diff --git a/lib/Adapter/Doctrine/ORM/composer.json b/lib/Adapter/Doctrine/ORM/composer.json
@@ -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": {