From 842a7ea922f680203285df91898edefe84b897d0 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 22 Jan 2018 16:44:17 +0100 Subject: [PATCH] Fix dev-master not being normalized correctly for the root package, fixes #7007 --- src/Composer/Package/Version/VersionGuesser.php | 5 +---- tests/Composer/Test/Package/Version/VersionGuesserTest.php | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Composer/Package/Version/VersionGuesser.php b/src/Composer/Package/Version/VersionGuesser.php index 060bf26dd..02297a1e6 100644 --- a/src/Composer/Package/Version/VersionGuesser.php +++ b/src/Composer/Package/Version/VersionGuesser.php @@ -88,7 +88,7 @@ class VersionGuesser private function postprocess(array $versionData) { - if ('-dev' === substr($versionData['version'], -4)) { + if ('-dev' === substr($versionData['version'], -4) && preg_match('{\.9{7}}', $versionData['version'])) { $versionData['pretty_version'] = preg_replace('{(\.9{7})+}', '.x', $versionData['version']); } @@ -120,9 +120,6 @@ class VersionGuesser $version = $this->versionParser->normalizeBranch($match[1]); $prettyVersion = 'dev-' . $match[1]; $isFeatureBranch = 0 === strpos($version, 'dev-'); - if ('9999999-dev' === $version) { - $version = $prettyVersion; - } } if ($match[2]) { diff --git a/tests/Composer/Test/Package/Version/VersionGuesserTest.php b/tests/Composer/Test/Package/Version/VersionGuesserTest.php index d8db7e599..c0b6346c8 100644 --- a/tests/Composer/Test/Package/Version/VersionGuesserTest.php +++ b/tests/Composer/Test/Package/Version/VersionGuesserTest.php @@ -123,7 +123,8 @@ class VersionGuesserTest extends TestCase $guesser = new VersionGuesser($config, $executor, new VersionParser()); $versionArray = $guesser->guessVersion(array(), 'dummy/path'); - $this->assertEquals("dev-master", $versionArray['version']); + $this->assertEquals("9999999-dev", $versionArray['version']); + $this->assertEquals("dev-master", $versionArray['pretty_version']); $this->assertEquals($commitHash, $versionArray['commit']); }