Merge branch 'master' into master

UniSharp · Nov 21, 2019 · 8053925 · 8053925
2 parents 7db51b5 + 88fb9b7
commit 8053925
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -22,18 +22,18 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.0",
         "illuminate/config": ">=5.5.0",
         "illuminate/database": ">=5.5.0",
         "illuminate/support": ">=5.5.0",
         "kalnoy/nestedset": "^5.0"
     },
     "require-dev": {
-        "codedungeon/phpunit-result-printer": "^0.4.4",
-        "friendsofphp/php-cs-fixer": "^1.11",
-        "mockery/mockery": "^0.9.4",
-        "orchestra/database": "~3.5.0",
-        "orchestra/testbench": "~3.5.0|~4.0",
+        "codedungeon/phpunit-result-printer": "^0.4.4 || ^0.26.0",
+        "friendsofphp/php-cs-fixer": "^1.11 || ^2.0.0",
+        "mockery/mockery": "^0.9.4 || ^1.0.0",
+        "orchestra/database": "~3.5.0 || ~4.0.0",
+        "orchestra/testbench": "~3.5.0 || ~4.0.0",
         "phpunit/phpunit": "^6.2 || ^7.0|^8.0",
         "squizlabs/php_codesniffer": "3.*",
         "scrutinizer/ocular": "^1.3"