Merge pull request #245 from musonza/revert-244-revert-242-patch-1

Revert "Revert "Update to L7.x""
musonza · Mar 4, 2020 · a6435d4 · a6435d4
2 parents 86f7b2b + 36fba84
commit a6435d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,4 +16,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",