Merge branch 'release/2.5.0'

corcel · Sep 11, 2017 · 0c4d33b · 0c4d33b
2 parents 33e66c5 + 8a26ffd
commit 0c4d33b
Show file tree

Hide file tree

Showing 17 changed files with 1,143 additions and 403 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
+  - 7.1
 
 dist: trusty
 sudo: required

diff --git a/README.md b/README.md
@@ -54,6 +54,7 @@ This make possible to use WordPress as your CMS of choice and using Laravel in t
  5.2.x    | 2.2.x
  5.3.x    | 2.3.x
  5.4.x    | 2.4.x
+ 5.5.x    | 2.5.x
 
 # <a id="install"></a> Installing Corcel
 

diff --git a/composer.json b/composer.json
@@ -12,19 +12,19 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4",
-        "illuminate/database": "~5.4.0",
-        "illuminate/filesystem": "~5.4.0",
-        "illuminate/support": "~5.4.0",
+        "php": ">=7.0.0",
+        "illuminate/database": "5.5.*",
+        "illuminate/filesystem": "5.5.*",
+        "illuminate/support": "5.5.*",
         "fzaninotto/faker": "^1.6",
         "hautelook/phpass": "0.3.4",
         "thunderer/shortcode": "^0.6.2"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.4.0",
-        "orchestra/database": "~3.4.0",
+        "orchestra/testbench": "3.5.*",
+        "orchestra/database": "3.5.*",
         "satooshi/php-coveralls": "dev-master",
-        "phpunit/phpunit": "~4.8"
+        "phpunit/phpunit": "~6.0"
     },
     "autoload": {
         "psr-4": {