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

Small fixes to the version guessing

pull/757/head
Jordi Boggiano 2012-05-31 15:57:49 +02:00
parent 371b48870e
commit 57c3359bdb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Composer/Package/Loader/RootPackageLoader.php
View File

@ -162,7 +162,7 @@ class RootPackageLoader extends ArrayLoader
foreach ($this->process->splitLines($output) as $branch) { foreach ($this->process->splitLines($output) as $branch) {
if ($branch && preg_match('{^(?:\* ) *(?:[^/ ]+?/)?(\S+|\(no branch\)) *([a-f0-9]+) .*$}', $branch, $match)) { if ($branch && preg_match('{^(?:\* ) *(?:[^/ ]+?/)?(\S+|\(no branch\)) *([a-f0-9]+) .*$}', $branch, $match)) {
if ($match[1] === '(no branch)') { if ($match[1] === '(no branch)') {
$version = $match[2]; $version = 'dev-'.$match[2];
$isFeatureBranch = true; $isFeatureBranch = true;
} else { } else {
$version = $this->versionParser->normalizeBranch($match[1]); $version = $this->versionParser->normalizeBranch($match[1]);
@ -202,6 +202,9 @@ class RootPackageLoader extends ArrayLoader
if (strlen($output) < $length) { if (strlen($output) < $length) {
$length = strlen($output); $length = strlen($output);
$version = $this->versionParser->normalizeBranch($candidate); $version = $this->versionParser->normalizeBranch($candidate);
if ('9999999-dev' === $version) {
$version = 'dev-'.$match[1];
}
} }
} }
} }