Merge branch '2.0.x'

* 2.0.x: Allow installing on PHP 8
doctrine · May 25, 2020 · 0fb5138 · 0fb5138
2 parents 903c248 + 47c7102
commit 0fb5138
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -28,6 +28,9 @@ script:
   - ./vendor/bin/phpunit -v
 
 jobs:
+  allow_failures:
+    - php: nightly
+
   include:
     # Tests the lowest set of dependencies
     - php: 7.1
@@ -63,6 +66,13 @@ jobs:
       install:
         - travis_retry composer update -n --prefer-dist
 
+    # Test against PHP 8
+    - php: nightly
+      before_install:
+        - composer config platform.php 7.4.99
+      install:
+        - travis_retry composer update -n --prefer-dist
+
     - stage: Code Quality
       env: CODING_STANDARDS
       php: 7.3

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1 || ^8.0",
         "doctrine/dbal": "^2.9.0",
         "doctrine/persistence": "^1.3.3",
         "doctrine/sql-formatter": "^1.0.1",