Revert "Revert "Update to L7.x""

mehranabi · Mar 4, 2020 · e4a09a0 · e4a09a0
1 parent 86f7b2b
commit e4a09a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,10 @@ matrix:
       env: ILLUMINATE_VERSION=6.0
     - php: 7.2
       env: ILLUMINATE_VERSION=6.*
+    - php: 7.2 
+      env: ILLUMINATE_VERSION=7.0 
+    - php: 7.2 
+      env: ILLUMINATE_VERSION=7.* 
 php:
   - 7.2
 
@@ -16,4 +20,4 @@ before_install:
 
 install: composer update --prefer-source --no-interaction --dev
 
-script: vendor/bin/phpunit --testdox
+script: vendor/bin/phpunit --testdox
diff --git a/composer.json b/composer.json
@@ -10,8 +10,8 @@
     ],
     "require": {
         "php": "^7.2",
-        "laravel/framework": "^6.0",
-        "spatie/laravel-fractal": "^5.6"
+        "laravel/framework": "^6.0|^7.0",
+        "spatie/laravel-fractal": "^5.7"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0",