Merge branch 'master' of https://github.com/thejawker/laravel-deployer

thejawker · Jul 1, 2018 · 84fd217 · 84fd217
2 parents dcc0da8 + 2221e52
commit 84fd217
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -21,16 +21,16 @@
     "require": {
         "php": ">=7.0.0",
         "guzzlehttp/guzzle": "^6.3",
-        "illuminate/pagination": "~5.5.0",
-        "illuminate/support": "~5.5.0",
-        "illuminate/validation": "~5.5.0",
-        "illuminate/view": "~5.5.0"
+        "illuminate/pagination": "~5.5.0|~5.6.0",
+        "illuminate/support": "~5.5.0|~5.6.0",
+        "illuminate/validation": "~5.5.0|~5.6.0",
+        "illuminate/view": "~5.5.0|~5.6.0"
     },
     "require-dev": {
         "mockery/mockery": "^0.9.5",
         "orchestra/database": "~3.5.0",
         "orchestra/testbench": "~3.5.0",
-        "phpunit/phpunit": "^6.2"
+        "phpunit/phpunit": "^6.0|^7.0"
     },
     "autoload": {
         "psr-4": {