Merge branch 'release/2.1.0'

reliqarts · Sep 8, 2019 · 0d4bcc4 · 0d4bcc4
2 parents d339372 + 35290f8
commit 0d4bcc4
Show file tree

Hide file tree

Showing 6 changed files with 3,149 additions and 2,822 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,20 +4,27 @@ php:
   - 7.2
   - 7.3
 
+env:
+  - LARAVEL='^5.7' COMPOSER_FLAGS='--prefer-stable'
+  - LARAVEL='^5.8' COMPOSER_FLAGS='--prefer-stable'
+  - LARAVEL='^6.0' COMPOSER_FLAGS='--prefer-stable'
+  - LARAVEL='6.x-dev'
+
 matrix:
   fast_finish: true
   allow_failures:
-    - php: 7.3
+    - env: LARAVEL='6.x-dev'
 
 cache:
   directories:
     - $HOME/.composer/cache
 
 before_install:
   - travis_retry composer self-update
+  - travis_retry composer require --no-update --no-interaction "illuminate/support:${LARAVEL}"
 
 install:
-  - travis_retry composer install --no-interaction --prefer-dist
+  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist --no-suggest
 
 script: ./vendor/bin/phpunit --verbose --coverage-clover=coverage.xml
 

diff --git a/composer.json b/composer.json
@@ -23,19 +23,19 @@
     },
     "require": {
         "php": ">=7.1.3",
-        "illuminate/support": "^5.7",
+        "illuminate/support": "^5.7|^6.0",
         "erusev/parsedown": "1.7.1",
         "erusev/parsedown-extra": "0.7.1",
         "monolog/monolog": "~1.11",
-        "nesbot/carbon": "^1.22.1",
-        "symfony/browser-kit": "^3.3",
+        "nesbot/carbon": "^1.22.1|^2.0",
+        "symfony/browser-kit": "^3.3|^4.3",
         "symfony/process": "^3.3|~4.0",
         "symfony/yaml": "^3.3",
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.0",
-        "orchestra/testbench-browser-kit": "~3.1",
+        "phpunit/phpunit": "^8.3",
+        "orchestra/testbench-browser-kit": "~3.1|^4.0",
         "goaop/framework": "2.2.0",
         "codeception/aspect-mock": "^3.0"
     },