Adding PHP 8 support

laravel-doctrine · Mar 17, 2021 · 5f1cc12 · 5f1cc12
1 parent 97e0ddd
commit 5f1cc12
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,8 +6,13 @@ jobs:
     name: PHP ${{ matrix.php }} - doctrine/orm ${{ matrix.orm }}
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4']
-        orm: ['2.6.0', '2.7.0']
+        php: ['7.2', '7.3', '7.4', '8.0']
+        orm: ['2.6.0', '2.7.0', '2.8.0']
+      exclude:
+        - php: '8.0'
+          orm: '2.6.0'
+        - php: '8.0'
+          orm: '2.7.0'
     steps:
       - uses: actions/checkout@v2
       - name: Setup PHP

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -6,7 +6,7 @@ build:
     tests:
         override:
             -
-                command: 'phpunit --coverage-clover=phpunit-coverage.xml'
+                command: 'vendor/bin/phpunit --coverage-clover=phpunit-coverage.xml'
                 coverage:
                     file: 'phpunit-coverage.xml'
                     format: 'php-clover'
diff --git a/composer.json b/composer.json
@@ -23,13 +23,13 @@
     }
   ],
   "require": {
-    "php": ">=7",
-    "doctrine/orm": "~2.6.0|~2.7.0",
+    "php": "^7.2|^8.0",
+    "doctrine/orm": "~2.6.0|~2.7.0|~2.8.0",
     "doctrine/inflector": "^1.1",
     "doctrine/persistence": "^1.3.5|^2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~8.0|~9.0",
+    "phpunit/phpunit": "^9.5",
     "mockery/mockery": "~1.0",
     "beberlei/doctrineextensions": "~1.0",
     "zf1/zend-date": "~1.12",