public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

VersionGuesser: Analyze remote origin and upstream branches too

pull/9270/head
Nils Adermann 2020-10-07 14:17:49 +02:00
parent 23d42c6717
commit ad643d9957
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Composer/Package/Version/VersionGuesser.php
View File

@ -118,7 +118,7 @@ class VersionGuesser
$isDetached = false; $isDetached = false;
// try to fetch current version from git branch // try to fetch current version from git branch
if (0 === $this->process->execute('git branch --no-color --no-abbrev -v', $output, $path)) { if (0 === $this->process->execute('git branch -a --no-color --no-abbrev -v', $output, $path)) {
$branches = array(); $branches = array();
$isFeatureBranch = false; $isFeatureBranch = false;
@ -141,8 +141,8 @@ class VersionGuesser
} }
} }
if ($branch && !preg_match('{^ *[^/]+/HEAD }', $branch)) { if ($branch && !preg_match('{^ *.+/HEAD }', $branch)) {
if (preg_match('{^(?:\* )? *(\S+) *([a-f0-9]+) .*$}', $branch, $match)) { if (preg_match('{^(?:\* )? *((?:remotes/(?:origin|upstream)/)[^\s/]+) *([a-f0-9]+) .*$}', $branch, $match)) {
$branches[] = $match[1]; $branches[] = $match[1];
} }
} }
@ -245,13 +245,14 @@ class VersionGuesser
} }
foreach ($branches as $candidate) { foreach ($branches as $candidate) {
$candidateVersion = preg_replace('{^remotes/\S+/}', '', $candidate);
// return directly, if branch is configured to be non-feature branch // return directly, if branch is configured to be non-feature branch
if ($candidate === $branch && preg_match('{^(' . $nonFeatureBranches . ')$}', $candidate)) { if ($candidate === $branch && preg_match('{^(' . $nonFeatureBranches . ')$}', $candidateVersion)) {
break; break;
} }
// do not compare against itself or other feature branches // do not compare against itself or other feature branches
if ($candidate === $branch || !preg_match('{^(' . $nonFeatureBranches . '|master|trunk|default|develop|\d+\..+)$}', $candidate, $match)) { if ($candidate === $branch || !preg_match('{^(' . $nonFeatureBranches . '|master|trunk|default|develop|\d+\..+)$}', $candidateVersion, $match)) {
continue; continue;
} }
@ -262,8 +263,11 @@ class VersionGuesser
if (strlen($output) < $length) { if (strlen($output) < $length) {
$length = strlen($output); $length = strlen($output);
$version = $this->versionParser->normalizeBranch($candidate); $version = $this->versionParser->normalizeBranch($candidateVersion);
$prettyVersion = 'dev-' . $match[1]; $prettyVersion = 'dev-' . $candidateVersion;
if ($length === 0) {
break;
}
} }
} }
} }