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

Fix hg version guessing, fixes #6236, fixes #6235

pull/4063/merge
Jordi Boggiano 2017-03-08 17:12:00 +01:00
parent 04b1ddb79f
commit 843877cd6d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,7 +179,7 @@ class VersionGuesser
} }
if (!$isFeatureBranch) { if (!$isFeatureBranch) {
return $version; return array('version' => $version, 'commit' => null, 'pretty_version' => $version);
} }
// re-use the HgDriver to fetch branches (this properly includes bookmarks) // re-use the HgDriver to fetch branches (this properly includes bookmarks)

2
tests/Composer/Test/Package/Version/VersionGuesserTest.php
View File

@ -88,7 +88,7 @@ class VersionGuesserTest extends \PHPUnit_Framework_TestCase
$guesser = new VersionGuesser($config, $executor, new VersionParser()); $guesser = new VersionGuesser($config, $executor, new VersionParser());
$versionArray = $guesser->guessVersion(array(), 'dummy/path'); $versionArray = $guesser->guessVersion(array(), 'dummy/path');
$this->assertEquals($branch, $versionArray['version']); $this->assertEquals('dev-' . $branch, $versionArray['version']);
$this->assertEmpty($versionArray['commit']); $this->assertEmpty($versionArray['commit']);
} }