Merge branch 'master' into 8.x

dmitry-ivanov · Dec 21, 2020 · 7dacb1c · 7dacb1c
2 parents e392eea + 578efb8
commit 7dacb1c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,12 @@ language: php
 php:
   - 7.3
   - 7.4
+  - 8.0
+
+env:
+  global:
+    - COMPOSER_MEMORY_LIMIT=-1
+    - XDEBUG_MODE=coverage
 
 cache:
   directories:
@@ -12,8 +18,8 @@ services:
   - mysql
 
 install:
-  - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --no-interaction --prefer-dist
-  - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require --no-interaction --prefer-dist --dev php-coveralls/php-coveralls
+  - travis_retry composer install --no-interaction --prefer-dist
+  - travis_retry composer require --no-interaction --prefer-dist --dev php-coveralls/php-coveralls
 
 script: vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml
 

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "email": "dmitry.g.ivanov@gmail.com"
     }],
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "ext-json": "*",
         "illuminate/console": "^8.0",
         "illuminate/support": "^8.0",