Merge pull request livkiss#125 from felixkiss/php-8

Add support for PHP 8
robbielove · Apr 4, 2021 · 4fe108b · 4fe108b
2 parents e666db5 + 9ed911f
commit 4fe108b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
 
 env:
   - LARAVEL=5.5.*
@@ -17,8 +18,6 @@ env:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - php: 7.4
   exclude:
     - php: 7.1
       env: LARAVEL=^6.0
@@ -28,6 +27,14 @@ matrix:
       env: LARAVEL=^8.0
     - php: 7.2
       env: LARAVEL=^8.0
+    - php: 8.0
+      env: LARAVEL=5.5.*
+    - php: 8.0
+      env: LARAVEL=5.6.*
+    - php: 8.0
+      env: LARAVEL=5.7.*
+    - php: 8.0
+      env: LARAVEL=5.8.*
 
 cache:
   directories:

diff --git a/composer.json b/composer.json
@@ -11,13 +11,13 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.1.3|^8.0",
         "illuminate/support": "^5.5|^6.0|^7.0|^8.0",
         "illuminate/validation": "^5.5|^6.0|^7.0|^8.0"
     },
     "require-dev": {
-        "phpspec/phpspec": "^5.0|^6.0",
-        "bossa/phpspec2-expect": "^3.0"
+        "phpspec/phpspec": "^5.0|^6.0|^7.0",
+        "friends-of-phpspec/phpspec-expect": "^3.0|^4.0"
     },
     "autoload": {
         "psr-0": {