Merge pull request #1 from dodedodo33/v6-support

Laravel V6 Support
helpscout · Sep 24, 2019 · cf7e665 · cf7e665
2 parents 91627d1 + 1179b2f
commit cf7e665
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,7 @@
 env:
+  matrix:
+    - ILLUMINATE_VERSION="^5.8"
+#    Add other versions here to test against multiple framework versions
   global:
     - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
 
@@ -10,8 +13,7 @@ php:
 
 before_script:
   - composer self-update
-  - composer install --no-interaction
-  - travis_retry composer require laravel/framework laravel/lumen-framework;
+  - travis_retry composer require laravel/framework:${ILLUMINATE_VERSION} laravel/lumen-framework:${ILLUMINATE_VERSION} --no-interaction;
 
 script:
   - composer test:travis
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
   "require": {
     "php": "^7.1",
     "helpscout/api": "~2.0",
-    "illuminate/support": "^5.6"
+    "illuminate/support": "^5.6|^6.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0",