From 4ce492d01d3e4c839d03a97319c5046077a4e7bf Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 6 May 2020 10:18:53 +0200 Subject: [PATCH 1/4] Fix detection of gitlab URLs, fixes #8402, closes #8868 --- src/Composer/Util/Git.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Util/Git.php b/src/Composer/Util/Git.php index 27bfe766f..70f62bde2 100644 --- a/src/Composer/Util/Git.php +++ b/src/Composer/Util/Git.php @@ -165,7 +165,7 @@ class Git $errorMsg = $this->process->getErrorOutput(); } } elseif ( - preg_match('{^(git)@' . self::getGitLabDomainsRegex($this->config) . ':(.+?)\.git$}i', $url, $match) + preg_match('{^(git)@' . self::getGitLabDomainsRegex($this->config) . ':(.+?\.git)$}i', $url, $match) || preg_match('{^(https?)://' . self::getGitLabDomainsRegex($this->config) . '/(.*)}', $url, $match) ) { if ($match[1] === 'git') { From 73b9a3960f2942f60f12cffc55cfc17bd2673c60 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 6 May 2020 10:21:58 +0200 Subject: [PATCH 2/4] Fix 5.3 build --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 97b271de8..e70058719 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,7 @@ }, "conflict": { "symfony/console": "2.8.38" + "symfony/phpunit-bridge": "3.4.40" }, "require-dev": { "symfony/phpunit-bridge": "^3.4", From 7d87688032740a7081d41390b518a3183e84fd3e Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 6 May 2020 10:22:44 +0200 Subject: [PATCH 3/4] Fix 5.3 build --- composer.json | 2 +- composer.lock | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index e70058719..e588cb71e 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0" }, "conflict": { - "symfony/console": "2.8.38" + "symfony/console": "2.8.38", "symfony/phpunit-bridge": "3.4.40" }, "require-dev": { diff --git a/composer.lock b/composer.lock index abe4aafea..aa67fc010 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": "cc6f9640996dfad00a5b03a8be01a571", + "content-hash": "cb76dc8e228d462d248c09f0051da364", "packages": [ { "name": "composer/ca-bundle", @@ -365,20 +365,20 @@ }, { "name": "seld/jsonlint", - "version": "1.7.2", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19" + "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19", - "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", + "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", "shasum": "" }, "require": { - "php": "^5.3 || ^7.0" + "php": "^5.3 || ^7.0 || ^8.0" }, "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" @@ -412,9 +412,19 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.7.2" + "source": "https://github.com/Seldaek/jsonlint/tree/master" }, - "time": "2019-10-24T14:27:39+00:00" + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" + } + ], + "time": "2020-04-30T19:05:18+00:00" }, { "name": "seld/phar-utils", @@ -946,6 +956,10 @@ "constructor", "instantiate" ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/master" + }, "time": "2015-06-14T21:17:01+00:00" }, { @@ -995,6 +1009,10 @@ "email": "mike.vanriel@naenius.com" } ], + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/2.x" + }, "time": "2016-01-25T08:17:30+00:00" }, { @@ -1126,6 +1144,10 @@ "compare", "equality" ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/1.2" + }, "time": "2017-01-29T09:50:25+00:00" }, { @@ -1178,6 +1200,10 @@ "keywords": [ "diff" ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/1.4" + }, "time": "2017-05-22T07:24:03+00:00" }, { @@ -1245,6 +1271,10 @@ "export", "exporter" ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/master" + }, "time": "2016-11-19T08:54:04+00:00" }, { @@ -1298,6 +1328,10 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/master" + }, "time": "2016-11-19T07:33:16+00:00" }, { From ff27fdf4eaafc1d0cd201f725bf70ced870bbbae Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 6 May 2020 10:25:25 +0200 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d41be6a1..ab1d3bba9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +### [1.10.6] 2020-05-06 + + * Fixed version guessing to take composer-runtime-api and composer-plugin-api requirements into account to avoid selecting packages which require Composer 2 + * Fixed package name validation to allow several dashes following each other + * Fixed post-status-cmd script not firing when there were no changes to be displayed + * Fixed composer-runtime-api support on Composer 1.x, the package is now present as 1.0.0 + * Fixed support for composer show --name-only --self + * Fixed detection of GitLab URLs when handling authentication in some cases + ### [1.10.5] 2020-04-10 * Fixed self-update on PHP <5.6, seriously please upgrade people, it's time @@ -846,6 +855,7 @@ * Initial release +[1.10.6]: https://github.com/composer/composer/compare/1.10.5...1.10.6 [1.10.5]: https://github.com/composer/composer/compare/1.10.4...1.10.5 [1.10.4]: https://github.com/composer/composer/compare/1.10.3...1.10.4 [1.10.3]: https://github.com/composer/composer/compare/1.10.2...1.10.3