Merge pull request chrisbjr#150 from chrisbjr/develop

Merge for v4
expanse · May 27, 2017 · d88194a · d88194a
2 parents 04a3bf2 + ffc19e3
commit d88194a
Show file tree

Hide file tree

Showing 27 changed files with 519 additions and 1,717 deletions.
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
@@ -21,22 +21,12 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9",
-        "illuminate/auth": "~5.0",
-        "illuminate/contracts": "~5.0",
-        "illuminate/http": "~5.0",
-        "illuminate/support": "~5.0",
-        "nesbot/carbon": "^1.0",
-        "illuminate/database": "~5.0",
+        "php": ">=5.6.4",
+        "illuminate/support": "^5.3.0",
+        "illuminate/database": "^5.3.0",
         "ellipsesynergie/api-response": "*"
     },
     "require-dev": {
-        "cartalyst/sentinel": "2.0.*",
-        "illuminate/console": "~5.0",
-        "illuminate/database": "~5.0",
-        "illuminate/routing": "~5.0",
-        "mockery/mockery": "0.9.*",
-        "october/rain": "dev-stable",
         "phpunit/phpunit": "^4.0 || ^5.0"
     },
     "autoload": {

diff --git a/composer.lock b/composer.lock