Merge branch 'tristansnowsill-laravel55'

anindya-dhruba · Sep 13, 2017 · 0c75aaa · 0c75aaa
2 parents 0c3555b + 574137a
commit 0c75aaa
Show file tree

Hide file tree

Showing 20 changed files with 23,345 additions and 23,512 deletions.
diff --git a/composer.json b/composer.json
@@ -5,15 +5,15 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=5.6.4",
-        "laravel/framework": "5.4.*",
+        "php": ">=7.0.0",
+        "laravel/framework": "5.5.*",
         "laravel/tinker": "~1.0",
         "tymon/jwt-auth": "^0.5.9"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~5.7"
+        "phpunit/phpunit": "~6.0"
     },
     "autoload": {
         "classmap": [