Add newer PHP and ORM versions to test suite

Orbitale · Jun 10, 2024 · 8b6c672 · 8b6c672
1 parent 112270c
commit 8b6c672
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -8,14 +8,19 @@ jobs:
 
         strategy:
             matrix:
-                php-version:
-                    - '7.3'
-                    - '7.4'
-                    - '8.0'
-                    - '8.1'
-                    - '8.2'
-
-        name: PHP ${{ matrix.php-version }}
+                include:
+                    - { php-version: '7.3', orm-version: '2.7' }
+                    - { php-version: '7.4', orm-version: '2.7' }
+                    - { php-version: '8.0', orm-version: '2.7' }
+                    - { php-version: '8.1', orm-version: '2.7' }
+                    - { php-version: '8.2', orm-version: '2.7' }
+                    - { php-version: '8.3', orm-version: '2.7' }
+
+                    - { php-version: '8.1', orm-version: '3.0' }
+                    - { php-version: '8.2', orm-version: '3.0' }
+                    - { php-version: '8.3', orm-version: '3.0' }
+
+        name: PHP ${{ matrix.php-version }} / ORM ${{ matrix.orm-version }}
         steps:
             - uses: actions/checkout@v2
 
@@ -35,6 +40,8 @@ jobs:
                   key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
                   restore-keys: ${{ runner.os }}-composer-
 
+            - run: composer require --dev "doctrine/orm:^${{ matrix.orm-version }}" --no-update
+
             - run: composer install
 
             - run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -19,14 +19,14 @@
         "doctrine/persistence": "^1.3|^2.0|^3.0"
     },
     "require-dev": {
-        "doctrine/orm": "^2.7",
+        "doctrine/orm": "^2.7|^3.0",
         "doctrine/mongodb-odm": "^2.2",
         "phpunit/phpunit": "^9.5",
-        "phpstan/phpstan": "^1.0",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-doctrine": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-symfony": "^1.0"
+        "phpstan/phpstan": "^1.11",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "phpstan/phpstan-doctrine": "^1.4",
+        "phpstan/phpstan-phpunit": "^1.4",
+        "phpstan/phpstan-symfony": "^1.4"
     },
     "suggest": {
         "doctrine/doctrine-fixtures-bundle": "To use with ORMFixtureInterface and register fixtures automatically in the Dependency Injection container."