framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close #1962 - Bump to Laravel 5.6

Browse Source
This commit is contained in:
Ben Word
2018-04-25 11:50:58 -06:00
parent fb7dabe369
commit 77e7ce0c64
4 changed files with 382 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,4 +1,5 @@
### HEAD ### 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)) * 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)) * 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)) * PHP 7.1.3+ is now required ([#2037](https://github.com/roots/sage/pull/2037))

2
composer.json
View File

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

710
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

4
resources/functions.php
View File

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