From 0e114716d27c4fef38ba8995e6f6755ebba6d902 Mon Sep 17 00:00:00 2001 From: Kelly Mears Date: Mon, 9 Dec 2019 09:49:06 -0800 Subject: [PATCH 1/3] Upgrades vlucas/phpdotenv to ^4.0.1 and implements new initialization method --- composer.json | 2 +- composer.lock | 83 ++++++++++++++++++++++-------------------- config/application.php | 2 +- 3 files changed, 46 insertions(+), 41 deletions(-) diff --git a/composer.json b/composer.json index c235fec67e..bed7eefec4 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "require": { "php": ">=7.1", "composer/installers": "^1.7", - "vlucas/phpdotenv": "^3.6.0", + "vlucas/phpdotenv": "^4.0.1", "oscarotero/env": "^1.2.0", "roots/wordpress": "5.3", "roots/wp-config": "1.0.0", diff --git a/composer.lock b/composer.lock index 586b7b6c19..d0d07a4269 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3972217759ca6a56956a296c8c6171e6", + "content-hash": "ef0bf27a569252072b218110877b338e", "packages": [ { "name": "composer/installers", @@ -173,43 +173,47 @@ }, { "name": "phpoption/phpoption", - "version": "1.5.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed" + "reference": "f4e7a6a1382183412246f0d361078c29fb85089e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed", - "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/f4e7a6a1382183412246f0d361078c29fb85089e", + "reference": "f4e7a6a1382183412246f0d361078c29fb85089e", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^5.5.9 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "4.7.*" + "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.6-dev" } }, "autoload": { - "psr-0": { - "PhpOption\\": "src/" + "psr-4": { + "PhpOption\\": "src/PhpOption/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache2" + "Apache-2.0" ], "authors": [ { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com" } ], "description": "Option Type for PHP", @@ -219,7 +223,7 @@ "php", "type" ], - "time": "2015-07-25T16:39:46+00:00" + "time": "2019-11-30T20:20:49+00:00" }, { "name": "roots/wordpress", @@ -231,7 +235,8 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress/WordPress/zipball/5.3" + "url": "https://api.github.com/repos/WordPress/WordPress/zipball/5.3", + "reference": "5.3" }, "require": { "php": ">=5.3.2", @@ -414,16 +419,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4" + "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", "shasum": "" }, "require": { @@ -435,7 +440,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -468,25 +473,25 @@ "polyfill", "portable" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v3.6.0", + "version": "v4.0.1", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156" + "reference": "55dc9010920405c6fcf440667ab70a6a6f9a2ac7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1bdf24f065975594f6a117f0f1f6cabf1333b156", - "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/55dc9010920405c6fcf440667ab70a6a6f9a2ac7", + "reference": "55dc9010920405c6fcf440667ab70a6a6f9a2ac7", "shasum": "" }, "require": { - "php": "^5.4 || ^7.0", - "phpoption/phpoption": "^1.5", + "php": "^5.5.9 || ^7.0", + "phpoption/phpoption": "^1.6", "symfony/polyfill-ctype": "^1.9" }, "require-dev": { @@ -495,7 +500,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -525,7 +530,7 @@ "env", "environment" ], - "time": "2019-09-10T21:37:39+00:00" + "time": "2019-12-08T15:09:05+00:00" } ], "packages-dev": [ @@ -535,12 +540,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "e3e6456e753326a096303e96b0f759fe789e63e8" + "reference": "e4ee2c8e4ccd908debc64069faf023c684a76760" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e3e6456e753326a096303e96b0f759fe789e63e8", - "reference": "e3e6456e753326a096303e96b0f759fe789e63e8", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e4ee2c8e4ccd908debc64069faf023c684a76760", + "reference": "e4ee2c8e4ccd908debc64069faf023c684a76760", "shasum": "" }, "conflict": { @@ -608,7 +613,7 @@ "league/commonmark": "<0.18.3", "magento/magento1ce": "<1.9.4.3", "magento/magento1ee": ">=1,<1.14.4.3", - "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.3", + "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2", "monolog/monolog": ">=1.8,<1.12", "namshi/jose": "<2.2", "onelogin/php-saml": "<2.10.4", @@ -643,7 +648,7 @@ "silverstripe/userforms": "<3", "simple-updates/phpwhois": "<=1", "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", - "simplesamlphp/simplesamlphp": "<1.17.3", + "simplesamlphp/simplesamlphp": "<1.17.8", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "slim/slim": "<2.6", "smarty/smarty": "<3.1.33", @@ -677,7 +682,7 @@ "symfony/security-guard": ">=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8", "symfony/serializer": ">=2,<2.0.11", - "symfony/symfony": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/symfony": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8", "symfony/translation": ">=2,<2.0.17", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", @@ -745,20 +750,20 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2019-11-13T10:25:51+00:00" + "time": "2019-12-02T13:03:15+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.4.2", + "version": "3.5.3", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8" + "reference": "557a1fc7ac702c66b0bbfe16ab3d55839ef724cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8", - "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/557a1fc7ac702c66b0bbfe16ab3d55839ef724cb", + "reference": "557a1fc7ac702c66b0bbfe16ab3d55839ef724cb", "shasum": "" }, "require": { @@ -796,7 +801,7 @@ "phpcs", "standards" ], - "time": "2019-04-10T23:49:02+00:00" + "time": "2019-12-04T04:46:47+00:00" } ], "aliases": [], diff --git a/config/application.php b/config/application.php index 0162206a53..aac78e2b3d 100644 --- a/config/application.php +++ b/config/application.php @@ -24,7 +24,7 @@ /** * Use Dotenv to set required environment variables and load .env file in root */ -$dotenv = Dotenv\Dotenv::create($root_dir); +$dotenv = Dotenv\Dotenv::createMutable($root_dir); if (file_exists($root_dir . '/.env')) { $dotenv->load(); $dotenv->required(['WP_HOME', 'WP_SITEURL']); From f53202d63cc5d39b25fdf7bb1372a4d6651d95ac Mon Sep 17 00:00:00 2001 From: Kelly Mears Date: Mon, 9 Dec 2019 09:59:58 -0800 Subject: [PATCH 2/3] use createImmutable --- config/application.php | 2 +- web/app/themes/sage | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 160000 web/app/themes/sage diff --git a/config/application.php b/config/application.php index aac78e2b3d..2f6a1e2159 100644 --- a/config/application.php +++ b/config/application.php @@ -24,7 +24,7 @@ /** * Use Dotenv to set required environment variables and load .env file in root */ -$dotenv = Dotenv\Dotenv::createMutable($root_dir); +$dotenv = Dotenv\Dotenv::createImmutable($root_dir); if (file_exists($root_dir . '/.env')) { $dotenv->load(); $dotenv->required(['WP_HOME', 'WP_SITEURL']); diff --git a/web/app/themes/sage b/web/app/themes/sage new file mode 160000 index 0000000000..bd38502616 --- /dev/null +++ b/web/app/themes/sage @@ -0,0 +1 @@ +Subproject commit bd38502616188be973f60b75717eea95c1fc69d2 From 1362046a32289bb8f000da2ae007803c8c5001f4 Mon Sep 17 00:00:00 2001 From: Kelly Mears Date: Mon, 9 Dec 2019 10:00:47 -0800 Subject: [PATCH 3/3] remove cached sage embedded git repo --- web/app/themes/sage | 1 - 1 file changed, 1 deletion(-) delete mode 160000 web/app/themes/sage diff --git a/web/app/themes/sage b/web/app/themes/sage deleted file mode 160000 index bd38502616..0000000000 --- a/web/app/themes/sage +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd38502616188be973f60b75717eea95c1fc69d2