From 909d1c430eb439a91cab7fc6373be97f9396cba1 Mon Sep 17 00:00:00 2001 From: johnstevenson Date: Mon, 28 Jan 2019 20:52:02 +0000 Subject: [PATCH 1/6] Update xdebug-handler, fixes #7921 --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index fa0ed41fd..05df052f8 100644 --- a/composer.lock +++ b/composer.lock @@ -187,16 +187,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.3.1", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "dc523135366eb68f22268d069ea7749486458562" + "reference": "d17708133b6c276d6e42ef887a877866b909d892" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/dc523135366eb68f22268d069ea7749486458562", - "reference": "dc523135366eb68f22268d069ea7749486458562", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892", + "reference": "d17708133b6c276d6e42ef887a877866b909d892", "shasum": "" }, "require": { @@ -227,7 +227,7 @@ "Xdebug", "performance" ], - "time": "2018-11-29T10:59:02+00:00" + "time": "2019-01-28T20:25:53+00:00" }, { "name": "justinrainbow/json-schema", From 585535a01d04afae84e00e7f46905a3291575da4 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 29 Jan 2019 14:58:37 +0100 Subject: [PATCH 2/6] Fix platform package regex --- src/Composer/Repository/PlatformRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Repository/PlatformRepository.php b/src/Composer/Repository/PlatformRepository.php index 4d74d8ed2..221f2eb97 100644 --- a/src/Composer/Repository/PlatformRepository.php +++ b/src/Composer/Repository/PlatformRepository.php @@ -24,7 +24,7 @@ use Composer\XdebugHandler\XdebugHandler; */ class PlatformRepository extends ArrayRepository { - const PLATFORM_PACKAGE_REGEX = '{^(?:php(?:-64bit|-ipv6|-zts|-debug)?|hhvm|(?:ext|lib)-[a-z0-9](?:-?[a-z0-9]+)*)$}iD'; + const PLATFORM_PACKAGE_REGEX = '{^(?:php(?:-64bit|-ipv6|-zts|-debug)?|hhvm|(?:ext|lib)-[a-z0-9](?:[_.-]?[a-z0-9]+)*)$}iD'; private $versionParser; From 5e35464044ac7eb623028f13276c1ff4caf58b30 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 29 Jan 2019 15:00:48 +0100 Subject: [PATCH 3/6] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b022d2bc..27eaacc67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### [1.8.2] 2019-01-29 + + * Fixed invalid deprecation warning for ext-pdo_mysql and similar + * Updated to latest xdebug-handler + ### [1.8.1] 2019-01-29 * Deprecated support for non-standard package names (anything with uppercase, or no / in it). Make sure to follow the warnings if you see any to avoid problems in 2.0. From 85617aa74061000bb474b44f629bf8c3be337ee4 Mon Sep 17 00:00:00 2001 From: Hans-Christian Otto Date: Tue, 29 Jan 2019 17:18:58 +0100 Subject: [PATCH 4/6] Installer: Initialize $nameMatchesRequiredPackage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We had a case where we got `Undefined variable: nameMatchesRequiredPackage` — I think it should be initialized with false, right? --- src/Composer/Installer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index f38086611..8573f3695 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -1317,6 +1317,7 @@ class Installer foreach ($this->updateWhitelist as $packageName => $void) { $packageQueue = new \SplQueue; + $nameMatchesRequiredPackage = false; $depPackages = $pool->whatProvides($packageName); $matchesByPattern = array(); From 6d58b13ee4aef653529d455f2e0f416f72261c28 Mon Sep 17 00:00:00 2001 From: Will Otterburn Date: Tue, 29 Jan 2019 18:03:03 +0000 Subject: [PATCH 5/6] Update installer commit to fix SHA384 bug Installer linked is affected by #7669 --- doc/faqs/how-to-install-composer-programmatically.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/faqs/how-to-install-composer-programmatically.md b/doc/faqs/how-to-install-composer-programmatically.md index 8a35e34d7..ba6536e54 100644 --- a/doc/faqs/how-to-install-composer-programmatically.md +++ b/doc/faqs/how-to-install-composer-programmatically.md @@ -35,7 +35,7 @@ give it uniqueness and authenticity as long as you can trust the GitHub servers. For example: ```bash -wget https://raw.githubusercontent.com/composer/getcomposer.org/1b137f8bf6db3e79a38a5bc45324414a6b1f9df2/web/installer -O - -q | php -- --quiet +wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --quiet ``` You may replace the commit hash by whatever the last commit hash is on From b3182b0f7dd84f36e7d8e57dc6316bb8a937871c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 30 Jan 2019 08:31:28 +0100 Subject: [PATCH 6/6] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27eaacc67..db9890bda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### [1.8.3] 2019-01-30 + + * Fixed regression when executing partial updates + ### [1.8.2] 2019-01-29 * Fixed invalid deprecation warning for ext-pdo_mysql and similar