Merge remote-tracking branch 'origin/develop'

* origin/develop: [update] composer.lock [update] composer.json support php8
chanshige · Jan 6, 2021 · 09e5db4 · 09e5db4
2 parents 96bd859 + 08f19d3
commit 09e5db4
Show file tree

Hide file tree

Showing 4 changed files with 787 additions and 554 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,13 @@ git:
 php:
   - 7.3
   - 7.4
+  - 8.0
 
 before_script:
-  - composer install --dev --prefer-source
+  - composer self-update
+
+install:
+  - composer install
 
 script:
-  - composer test
+  - ./vendor/bin/phpunit --coverage-clover=coverage.clover tests
diff --git a/composer.json b/composer.json
@@ -20,15 +20,15 @@
         }
     },
     "require": {
-        "php": "^7.3.11",
+        "php": "^7.3|^8.0",
         "psr/log": "^1.1",
-        "illuminate/contracts": "^7.0 || ^8.0",
-        "illuminate/database": "^7.0 || ^8.0",
-        "illuminate/log": "^7.0 || ^8.0",
-        "illuminate/support": "^7.0 || ^8.0",
-        "illuminate/config": "^7.0 || ^8.0",
-        "illuminate/events": "^7.0 || ^8.0",
-        "illuminate/filesystem": "^7.0 || ^8.0"
+        "illuminate/contracts": "^7.0|^8.0",
+        "illuminate/database": "^7.0|^8.0",
+        "illuminate/log": "^7.0|^8.0",
+        "illuminate/support": "^7.0|^8.0",
+        "illuminate/config": "^7.0|^8.0",
+        "illuminate/events": "^7.0|^8.0",
+        "illuminate/filesystem": "^7.0|^8.0"
     },
     "require-dev": {
         "doctrine/coding-standard": "^8.1",