Merge pull request #1748 from gtjamesa/master

Allow Laravel 8
dingo · Sep 13, 2020 · 660fd77 · 660fd77
2 parents 3813eb9 + ad75d2e
commit 660fd77
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -15,24 +15,24 @@
     "require": {
         "php": "^7.2.5",
         "dingo/blueprint": "^0.4",
-        "illuminate/routing": "^7.0",
-        "illuminate/support": "^7.0",
+        "illuminate/routing": "^7.0|^8.0",
+        "illuminate/support": "^7.0|^8.0",
         "league/fractal": "^0.19"
     },
     "require-dev": {
         "phpdocumentor/reflection-docblock": "3.3.2",
         "friendsofphp/php-cs-fixer": "~2",
-        "illuminate/auth": "^7.0",
-        "illuminate/cache": "^7.0",
-        "illuminate/console": "^7.0",
-        "illuminate/database": "^7.0",
-        "illuminate/events": "^7.0",
-        "illuminate/filesystem": "^7.0",
-        "illuminate/log": "^7.0",
-        "illuminate/pagination": "^7.0",
-        "laravel/lumen-framework": "^7.0",
+        "illuminate/auth": "^7.0|^8.0",
+        "illuminate/cache": "^7.0|^8.0",
+        "illuminate/console": "^7.0|^8.0",
+        "illuminate/database": "^7.0|^8.0",
+        "illuminate/events": "^7.0|^8.0",
+        "illuminate/filesystem": "^7.0|^8.0",
+        "illuminate/log": "^7.0|^8.0",
+        "illuminate/pagination": "^7.0|^8.0",
+        "laravel/lumen-framework": "^7.0|^8.0",
         "mockery/mockery": "~1.0",
-        "phpunit/phpunit": "^8.5",
+        "phpunit/phpunit": "^8.5|^9.0",
         "squizlabs/php_codesniffer": "~2.0",
         "tymon/jwt-auth": "1.0.*"
     },