Merge pull request #2061 from roots/laravel-5.6

Bump to Laravel 5.6
This commit is contained in:
Ben Word
2018-04-25 12:05:01 -06:00
committed by GitHub
4 changed files with 383 additions and 337 deletions

View File

@@ -1,4 +1,5 @@
### HEAD
* Bump to Laravel 5.6 ([#2061](https://github.com/roots/sage/pull/2061))
* Update to Boostrap 4.1.0 ([#2056](https://github.com/roots/sage/pull/2056))
* Change inline `@php` directive to full form ([#2042](https://github.com/roots/sage/pull/2042))
* PHP 7.1.3+ is now required ([#2037](https://github.com/roots/sage/pull/2037))

View File

@@ -34,8 +34,8 @@
"require": {
"php": ">=7.1",
"composer/installers": "~1.0",
"illuminate/support": "5.4.*",
"roots/sage-lib": "~9.0.0-beta.4",
"illuminate/support": "~5.6",
"roots/sage-lib": "~9.0.1",
"soberwp/controller": "~9.0.0-beta.4"
},
"require-dev": {

711
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -23,8 +23,8 @@ $sage_error = function ($message, $subtitle = '', $title = '') {
/**
* Ensure compatible version of PHP is used
*/
if (version_compare('7', phpversion(), '>=')) {
$sage_error(__('You must be using PHP 7 or greater.', 'sage'), __('Invalid PHP version', 'sage'));
if (version_compare('7.1', phpversion(), '>=')) {
$sage_error(__('You must be using PHP 7.1 or greater.', 'sage'), __('Invalid PHP version', 'sage'));
}
/**