From 77e7ce0c645f48cfd4940fe43b78fa812bad71ec Mon Sep 17 00:00:00 2001 From: Ben Word Date: Wed, 25 Apr 2018 11:50:58 -0600 Subject: [PATCH 1/2] Close #1962 - Bump to Laravel 5.6 --- CHANGELOG.md | 1 + composer.json | 2 +- composer.lock | 710 +++++++++++++++++++++------------------- resources/functions.php | 4 +- 4 files changed, 382 insertions(+), 335 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46c59db..2863191 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) diff --git a/composer.json b/composer.json index 616389a..53a9057 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "require": { "php": ">=7.1", "composer/installers": "~1.0", - "illuminate/support": "5.4.*", + "illuminate/support": "~5.6", "roots/sage-lib": "~9.0.0-beta.4", "soberwp/controller": "~9.0.0-beta.4" }, diff --git a/composer.lock b/composer.lock index 9391f1f..2180295 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "1362ee4cc0fbe465df47aeb15838a178", + "content-hash": "fa23aa33e6dd0ad71e1959f0e01a1ec3", "packages": [ { "name": "brain/hierarchy", @@ -308,27 +308,27 @@ }, { "name": "illuminate/config", - "version": "v5.4.36", + "version": "v5.6.17", "source": { "type": "git", "url": "https://github.com/illuminate/config.git", - "reference": "8fe700aa596bc623d347e4578041fbda7a44c3d9" + "reference": "e8158dff3189deed846c84c66c60fa68c21ee579" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/config/zipball/8fe700aa596bc623d347e4578041fbda7a44c3d9", - "reference": "8fe700aa596bc623d347e4578041fbda7a44c3d9", + "url": "https://api.github.com/repos/illuminate/config/zipball/e8158dff3189deed846c84c66c60fa68c21ee579", + "reference": "e8158dff3189deed846c84c66c60fa68c21ee579", "shasum": "" }, "require": { - "illuminate/contracts": "5.4.*", - "illuminate/support": "5.4.*", - "php": ">=5.6.4" + "illuminate/contracts": "5.6.*", + "illuminate/support": "5.6.*", + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -348,30 +348,31 @@ ], "description": "The Illuminate Config package.", "homepage": "https://laravel.com", - "time": "2017-02-04T20:27:32+00:00" + "time": "2017-11-07T20:23:51+00:00" }, { "name": "illuminate/container", - "version": "v5.4.36", + "version": "v5.6.17", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", - "reference": "c5b8a02a34a52c307f16922334c355c5eef725a6" + "reference": "4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/container/zipball/c5b8a02a34a52c307f16922334c355c5eef725a6", - "reference": "c5b8a02a34a52c307f16922334c355c5eef725a6", + "url": "https://api.github.com/repos/illuminate/container/zipball/4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a", + "reference": "4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a", "shasum": "" }, "require": { - "illuminate/contracts": "5.4.*", - "php": ">=5.6.4" + "illuminate/contracts": "5.6.*", + "php": "^7.1.3", + "psr/container": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -391,29 +392,31 @@ ], "description": "The Illuminate Container package.", "homepage": "https://laravel.com", - "time": "2017-05-24T14:15:53+00:00" + "time": "2018-01-21T02:13:38+00:00" }, { "name": "illuminate/contracts", - "version": "v5.4.36", + "version": "v5.6.17", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "67f642e018f3e95fb0b2ebffc206c3200391b1ab" + "reference": "322ec80498b3bf85bc4025d028e130a9b50242b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/67f642e018f3e95fb0b2ebffc206c3200391b1ab", - "reference": "67f642e018f3e95fb0b2ebffc206c3200391b1ab", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/322ec80498b3bf85bc4025d028e130a9b50242b9", + "reference": "322ec80498b3bf85bc4025d028e130a9b50242b9", "shasum": "" }, "require": { - "php": ">=5.6.4" + "php": "^7.1.3", + "psr/container": "~1.0", + "psr/simple-cache": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -433,32 +436,32 @@ ], "description": "The Illuminate Contracts package.", "homepage": "https://laravel.com", - "time": "2017-08-26T23:56:53+00:00" + "time": "2018-04-07T17:05:26+00:00" }, { "name": "illuminate/events", - "version": "v5.4.36", + "version": "v5.6.17", "source": { "type": "git", "url": "https://github.com/illuminate/events.git", - "reference": "ebdca3b0305e9fc954afb9e422c4559482cd11e6" + "reference": "b6e73ed40478cef2ef98d5ddb27f333291606cea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/events/zipball/ebdca3b0305e9fc954afb9e422c4559482cd11e6", - "reference": "ebdca3b0305e9fc954afb9e422c4559482cd11e6", + "url": "https://api.github.com/repos/illuminate/events/zipball/b6e73ed40478cef2ef98d5ddb27f333291606cea", + "reference": "b6e73ed40478cef2ef98d5ddb27f333291606cea", "shasum": "" }, "require": { - "illuminate/container": "5.4.*", - "illuminate/contracts": "5.4.*", - "illuminate/support": "5.4.*", - "php": ">=5.6.4" + "illuminate/container": "5.6.*", + "illuminate/contracts": "5.6.*", + "illuminate/support": "5.6.*", + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -478,37 +481,39 @@ ], "description": "The Illuminate Events package.", "homepage": "https://laravel.com", - "time": "2017-05-02T12:57:00+00:00" + "time": "2018-02-26T19:00:55+00:00" }, { "name": "illuminate/filesystem", - "version": "v5.4.36", + "version": "v5.6.17", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "b800a1423d06869ee5c2768eee123917f12b693e" + "reference": "c9ab9376076cedd88a374d7281d62b619634d578" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/b800a1423d06869ee5c2768eee123917f12b693e", - "reference": "b800a1423d06869ee5c2768eee123917f12b693e", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/c9ab9376076cedd88a374d7281d62b619634d578", + "reference": "c9ab9376076cedd88a374d7281d62b619634d578", "shasum": "" }, "require": { - "illuminate/contracts": "5.4.*", - "illuminate/support": "5.4.*", - "php": ">=5.6.4", - "symfony/finder": "~3.2" + "illuminate/contracts": "5.6.*", + "illuminate/support": "5.6.*", + "php": "^7.1.3", + "symfony/finder": "~4.0" }, "suggest": { "league/flysystem": "Required to use the Flysystem local and FTP drivers (~1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0)." + "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).", + "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", + "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -528,41 +533,41 @@ ], "description": "The Illuminate Filesystem package.", "homepage": "https://laravel.com", - "time": "2017-08-02T21:58:00+00:00" + "time": "2018-04-06T13:15:37+00:00" }, { "name": "illuminate/support", - "version": "v5.4.36", + "version": "v5.6.17", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "feab1d1495fd6d38970bd6c83586ba2ace8f299a" + "reference": "cc8d6f5cef3a901de6bb7d1b362102a6db001085" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/feab1d1495fd6d38970bd6c83586ba2ace8f299a", - "reference": "feab1d1495fd6d38970bd6c83586ba2ace8f299a", + "url": "https://api.github.com/repos/illuminate/support/zipball/cc8d6f5cef3a901de6bb7d1b362102a6db001085", + "reference": "cc8d6f5cef3a901de6bb7d1b362102a6db001085", "shasum": "" }, "require": { "doctrine/inflector": "~1.1", "ext-mbstring": "*", - "illuminate/contracts": "5.4.*", - "paragonie/random_compat": "~1.4|~2.0", - "php": ">=5.6.4" + "illuminate/contracts": "5.6.*", + "nesbot/carbon": "^1.24.1", + "php": "^7.1.3" }, - "replace": { - "tightenco/collect": "self.version" + "conflict": { + "tightenco/collect": "<5.5.33" }, "suggest": { - "illuminate/filesystem": "Required to use the composer class (5.2.*).", - "symfony/process": "Required to use the composer class (~3.2).", - "symfony/var-dumper": "Required to use the dd function (~3.2)." + "illuminate/filesystem": "Required to use the composer class (5.6.*).", + "symfony/process": "Required to use the composer class (~4.0).", + "symfony/var-dumper": "Required to use the dd function (~4.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -585,35 +590,35 @@ ], "description": "The Illuminate Support package.", "homepage": "https://laravel.com", - "time": "2017-08-15T13:25:41+00:00" + "time": "2018-04-17T12:26:47+00:00" }, { "name": "illuminate/view", - "version": "v5.4.36", + "version": "v5.6.17", "source": { "type": "git", "url": "https://github.com/illuminate/view.git", - "reference": "785f41f8f01653dc830c5c89eb0f25c311af7615" + "reference": "54eaf45ee7946d8f8cde13d5e89c5ea2e997040d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/view/zipball/785f41f8f01653dc830c5c89eb0f25c311af7615", - "reference": "785f41f8f01653dc830c5c89eb0f25c311af7615", + "url": "https://api.github.com/repos/illuminate/view/zipball/54eaf45ee7946d8f8cde13d5e89c5ea2e997040d", + "reference": "54eaf45ee7946d8f8cde13d5e89c5ea2e997040d", "shasum": "" }, "require": { - "illuminate/container": "5.4.*", - "illuminate/contracts": "5.4.*", - "illuminate/events": "5.4.*", - "illuminate/filesystem": "5.4.*", - "illuminate/support": "5.4.*", - "php": ">=5.6.4", - "symfony/debug": "~3.2" + "illuminate/container": "5.6.*", + "illuminate/contracts": "5.6.*", + "illuminate/events": "5.6.*", + "illuminate/filesystem": "5.6.*", + "illuminate/support": "5.6.*", + "php": "^7.1.3", + "symfony/debug": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -633,36 +638,35 @@ ], "description": "The Illuminate View package.", "homepage": "https://laravel.com", - "time": "2017-08-05T12:41:58+00:00" + "time": "2018-04-03T12:56:35+00:00" }, { - "name": "paragonie/random_compat", - "version": "v2.0.12", + "name": "nesbot/carbon", + "version": "1.27.0", "source": { "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb" + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "ef81c39b67200dcd7401c24363dcac05ac3a4fe9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb", - "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ef81c39b67200dcd7401c24363dcac05ac3a4fe9", + "reference": "ef81c39b67200dcd7401c24363dcac05ac3a4fe9", "shasum": "" }, "require": { - "php": ">=5.2.0" + "php": ">=5.3.9", + "symfony/translation": "~2.6 || ~3.0 || ~4.0" }, "require-dev": { - "phpunit/phpunit": "4.*|5.*" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + "friendsofphp/php-cs-fixer": "~2", + "phpunit/phpunit": "^4.8.35 || ^5.7" }, "type": "library", "autoload": { - "files": [ - "lib/random.php" - ] + "psr-4": { + "": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -670,18 +674,68 @@ ], "authors": [ { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" + "name": "Brian Nesbitt", + "email": "brian@nesbot.com", + "homepage": "http://nesbot.com" } ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "description": "A simple API extension for DateTime.", + "homepage": "http://carbon.nesbot.com", "keywords": [ - "csprng", - "pseudorandom", - "random" + "date", + "datetime", + "time" ], - "time": "2018-04-04T21:24:14+00:00" + "time": "2018-04-23T09:02:57+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" }, { "name": "psr/log", @@ -731,23 +785,71 @@ "time": "2016-10-10T12:19:37+00:00" }, { - "name": "roots/sage-lib", - "version": "9.0.0-beta.4", + "name": "psr/simple-cache", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/roots/sage-lib.git", - "reference": "71ed6e54e831fd1ced5bae028f0515d277e8c1c1" + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/roots/sage-lib/zipball/71ed6e54e831fd1ced5bae028f0515d277e8c1c1", - "reference": "71ed6e54e831fd1ced5bae028f0515d277e8c1c1", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-10-23T01:57:42+00:00" + }, + { + "name": "roots/sage-lib", + "version": "9.0.1", + "source": { + "type": "git", + "url": "https://github.com/roots/sage-lib.git", + "reference": "36573cd93b8109633c953e3f05b9f7d654bad885" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/roots/sage-lib/zipball/36573cd93b8109633c953e3f05b9f7d654bad885", + "reference": "36573cd93b8109633c953e3f05b9f7d654bad885", "shasum": "" }, "require": { "composer/installers": "~1.0", - "illuminate/config": "~5.4", - "illuminate/view": "~5.4", + "illuminate/config": "~5.6", + "illuminate/view": "~5.6", "php": ">=7" }, "require-dev": { @@ -780,7 +882,7 @@ "keywords": [ "wordpress" ], - "time": "2017-08-11T23:38:23+00:00" + "time": "2018-04-25T17:24:31+00:00" }, { "name": "soberwp/controller", @@ -836,32 +938,32 @@ }, { "name": "symfony/debug", - "version": "v3.4.8", + "version": "v4.0.8", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "9cf7c2271cfb89ef9727db1b740ca77be57bf9d7" + "reference": "5961d02d48828671f5d8a7805e06579d692f6ede" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/9cf7c2271cfb89ef9727db1b740ca77be57bf9d7", - "reference": "9cf7c2271cfb89ef9727db1b740ca77be57bf9d7", + "url": "https://api.github.com/repos/symfony/debug/zipball/5961d02d48828671f5d8a7805e06579d692f6ede", + "reference": "5961d02d48828671f5d8a7805e06579d692f6ede", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "psr/log": "~1.0" }, "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + "symfony/http-kernel": "<3.4" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0" + "symfony/http-kernel": "~3.4|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -888,29 +990,29 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:22:50+00:00" + "time": "2018-04-03T05:24:00+00:00" }, { "name": "symfony/finder", - "version": "v3.4.8", + "version": "v4.0.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433" + "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433", - "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433", + "url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", + "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -937,7 +1039,134 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-04-04T05:07:11+00:00" + "time": "2018-04-04T05:10:37+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-30T19:27:44+00:00" + }, + { + "name": "symfony/translation", + "version": "v4.0.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/e20a9b7f9f62cb33a11638b345c248e7d510c938", + "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/config": "<3.4", + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/intl": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" + }, + "suggest": { + "psr/log": "To use logging capability in translator", + "symfony/config": "", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Translation Component", + "homepage": "https://symfony.com", + "time": "2018-02-22T10:50:29+00:00" }, { "name": "symfony/yaml", @@ -1001,34 +1230,33 @@ "packages-dev": [ { "name": "illuminate/console", - "version": "v5.4.36", + "version": "v5.6.17", "source": { "type": "git", "url": "https://github.com/illuminate/console.git", - "reference": "4f0413ffd240d2004c3e9e4cd8f63df249939a15" + "reference": "8e276273dd518d83e229488b358ddf3a0b47acff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/console/zipball/4f0413ffd240d2004c3e9e4cd8f63df249939a15", - "reference": "4f0413ffd240d2004c3e9e4cd8f63df249939a15", + "url": "https://api.github.com/repos/illuminate/console/zipball/8e276273dd518d83e229488b358ddf3a0b47acff", + "reference": "8e276273dd518d83e229488b358ddf3a0b47acff", "shasum": "" }, "require": { - "illuminate/contracts": "5.4.*", - "illuminate/support": "5.4.*", - "nesbot/carbon": "~1.20", - "php": ">=5.6.4", - "symfony/console": "~3.2" + "illuminate/contracts": "5.6.*", + "illuminate/support": "5.6.*", + "php": "^7.1.3", + "symfony/console": "~4.0" }, "suggest": { + "dragonmantank/cron-expression": "Required to use scheduling component (~2.0).", "guzzlehttp/guzzle": "Required to use the ping methods on schedules (~6.0).", - "mtdowling/cron-expression": "Required to use scheduling component (~1.0).", - "symfony/process": "Required to use scheduling component (~3.2)." + "symfony/process": "Required to use scheduling component (~4.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -1048,78 +1276,25 @@ ], "description": "The Illuminate Console package.", "homepage": "https://laravel.com", - "time": "2017-08-24T22:31:32+00:00" - }, - { - "name": "nesbot/carbon", - "version": "1.25.0", - "source": { - "type": "git", - "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cbcf13da0b531767e39eb86e9687f5deba9857b4", - "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4", - "shasum": "" - }, - "require": { - "php": ">=5.3.9", - "symfony/translation": "~2.6 || ~3.0 || ~4.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2", - "phpunit/phpunit": "^4.8.35 || ^5.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.23-dev" - } - }, - "autoload": { - "psr-4": { - "Carbon\\": "src/Carbon/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Brian Nesbitt", - "email": "brian@nesbot.com", - "homepage": "http://nesbot.com" - } - ], - "description": "A simple API extension for DateTime.", - "homepage": "http://carbon.nesbot.com", - "keywords": [ - "date", - "datetime", - "time" - ], - "time": "2018-03-19T15:50:49+00:00" + "time": "2018-04-07T17:05:26+00:00" }, { "name": "roots/sage-installer", - "version": "1.3.4", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/roots/sage-installer.git", - "reference": "5966e0ea56b46f50f183f7ad0e526ddf065265fb" + "reference": "e811ab937a36b321ea88ec6000ab3d5019b8f2b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/roots/sage-installer/zipball/5966e0ea56b46f50f183f7ad0e526ddf065265fb", - "reference": "5966e0ea56b46f50f183f7ad0e526ddf065265fb", + "url": "https://api.github.com/repos/roots/sage-installer/zipball/e811ab937a36b321ea88ec6000ab3d5019b8f2b1", + "reference": "e811ab937a36b321ea88ec6000ab3d5019b8f2b1", "shasum": "" }, "require": { - "illuminate/console": "~5.4", - "illuminate/filesystem": "~5.4", + "illuminate/console": "~5.6", + "illuminate/filesystem": "~5.6", "symfony/process": "~3.3" }, "require-dev": { @@ -1152,7 +1327,6 @@ ], "description": "Sage starter theme installer", "keywords": [ - "FontAwesome", "bootstrap", "foundation", "sage", @@ -1160,7 +1334,7 @@ "theme", "wordpress" ], - "time": "2018-04-13T01:32:58+00:00" + "time": "2018-04-25T17:45:56+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -1242,21 +1416,20 @@ }, { "name": "symfony/console", - "version": "v3.4.8", + "version": "v4.0.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf" + "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf", - "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf", + "url": "https://api.github.com/repos/symfony/console/zipball/aad9a6fe47319f22748fd764f52d3a7ca6fa6b64", + "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.0", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -1265,11 +1438,11 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3|~4.0", + "symfony/config": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/event-dispatcher": "~3.4|~4.0", "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.3|~4.0" + "symfony/process": "~3.4|~4.0" }, "suggest": { "psr/log": "For using the console logger", @@ -1280,7 +1453,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1307,66 +1480,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:22:50+00:00" - }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-04-03T05:24:00+00:00" }, { "name": "symfony/process", @@ -1416,74 +1530,6 @@ "description": "Symfony Process Component", "homepage": "https://symfony.com", "time": "2018-04-03T05:22:50+00:00" - }, - { - "name": "symfony/translation", - "version": "v4.0.8", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/e20a9b7f9f62cb33a11638b345c248e7d510c938", - "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938", - "shasum": "" - }, - "require": { - "php": "^7.1.3", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/config": "<3.4", - "symfony/dependency-injection": "<3.4", - "symfony/yaml": "<3.4" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/intl": "~3.4|~4.0", - "symfony/yaml": "~3.4|~4.0" - }, - "suggest": { - "psr/log": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Translation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Translation Component", - "homepage": "https://symfony.com", - "time": "2018-02-22T10:50:29+00:00" } ], "aliases": [], diff --git a/resources/functions.php b/resources/functions.php index de55853..53b094f 100644 --- a/resources/functions.php +++ b/resources/functions.php @@ -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')); } /** From 5103f511c69b6eefca078a62c90caeaca911acbc Mon Sep 17 00:00:00 2001 From: Ben Word Date: Wed, 25 Apr 2018 11:54:08 -0600 Subject: [PATCH 2/2] Bump sage-lib --- composer.json | 2 +- composer.lock | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 53a9057..17ed12f 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "php": ">=7.1", "composer/installers": "~1.0", "illuminate/support": "~5.6", - "roots/sage-lib": "~9.0.0-beta.4", + "roots/sage-lib": "~9.0.1", "soberwp/controller": "~9.0.0-beta.4" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 2180295..8834b99 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "fa23aa33e6dd0ad71e1959f0e01a1ec3", + "content-hash": "1387af18b4df853db96edd5d561c8545", "packages": [ { "name": "brain/hierarchy", @@ -1535,7 +1535,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "roots/sage-lib": 10, "soberwp/controller": 10 }, "prefer-stable": false,