Merge pull request #4 from someline/1.4

Update to Laravel 5.4.*
someline · Jan 26, 2017 · 3d3b20f · 3d3b20f
2 parents bad9d42 + 0072f7f
commit 3d3b20f
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 2 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/starter-framework.iml b/.idea/starter-framework.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/composer.json b/composer.json
@@ -17,9 +17,10 @@
     }
   ],
   "require": {
-    "php": ">=5.5.9",
+    "php": ">=5.6.4",
     "ext-pdo_sqlite": "*",
-    "laravel/framework": "5.3.*",
+    "laravel/framework": "5.4.*",
+    "laravel/tinker": "~1.0",
     "predis/predis": "~1.0",
     "doctrine/dbal": "~2.3",
     "itsgoingd/clockwork": "~1.10",