add 2.x and 3.x matrix

Firehed · Aug 30, 2024 · 1a9a73b · 1a9a73b
1 parent e358993
commit 1a9a73b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,8 +25,8 @@ jobs:
           - '8.3'
           - '8.4-dev'
         orm:
-          - '2.*'
-          - '3.0.0'
+          - '^2.9'
+          - '^3.0'
 
     steps:
       - name: Check out code
@@ -51,26 +51,20 @@ jobs:
             ${{ runner.os }}-php-${{ matrix.dependencies }}-
             ${{ runner.os }}-php-
 
-      - name: Install highest dependencies
-        if: ${{ matrix.dependencies == 'high' }}
+      - name: Install dependencies
         run: composer update
           --no-ansi
           --no-interaction
           --no-progress
           --no-suggest
           --prefer-dist
-
-      - name: Install lowest dependencies
-        if: ${{ matrix.dependencies == 'low' }}
-        run: composer update
-          --no-ansi
-          --no-interaction
-          --no-progress
-          --no-suggest
-          --prefer-dist
-          --prefer-lowest
+          ${{ matrix.dependencies == 'low' && '--prefer-lowest' || '' }}
 
       - name: Get specific ORM version
+        run: composer update
+          doctrine/orm:'${{ matrix.orm }}'
+          --with-all-dependencies
+          ${{ matrix.dependencies == 'low' && '--prefer-lowest' || '' }}
 
       - name: PHPUnit
         run: vendor/bin/phpunit

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
         "php": "^8.1",
         "doctrine/annotations": "^1.10 || ^2.0",
         "doctrine/collections": "^1.6.8 || ^2.0",
-        "doctrine/orm": "^2.9 || ^3.0",
+        "doctrine/orm": "^2.9 | ^3.0",
         "doctrine/persistence": "^1.3 || ^2.0 || ^3.0"
     },
     "require-dev": {