Browse Source

Merge branch '1.10'

Jordi Boggiano 4 years ago
parent
commit
3134466b42
2 changed files with 11 additions and 1 deletions
  1. 10 0
      CHANGELOG.md
  2. 1 1
      src/Composer/Util/Git.php

+ 10 - 0
CHANGELOG.md

@@ -28,6 +28,15 @@
   * Fixed suggest output being very spammy, it now is only one line long and shows more rarely
   * Fixed conflict rules like e.g. >=5 from matching dev-master, as it is not normalized to 9999999-dev internally anymore
 
+### [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
@@ -876,6 +885,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

+ 1 - 1
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') {