From ad643d9957cc573908bc30bb144e5f91245816c3 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 7 Oct 2020 14:17:49 +0200 Subject: [PATCH 1/5] VersionGuesser: Analyze remote origin and upstream branches too --- .../Package/Version/VersionGuesser.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Composer/Package/Version/VersionGuesser.php b/src/Composer/Package/Version/VersionGuesser.php index fb1ee712b..fd8dd7a91 100644 --- a/src/Composer/Package/Version/VersionGuesser.php +++ b/src/Composer/Package/Version/VersionGuesser.php @@ -118,7 +118,7 @@ class VersionGuesser $isDetached = false; // 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(); $isFeatureBranch = false; @@ -141,8 +141,8 @@ class VersionGuesser } } - if ($branch && !preg_match('{^ *[^/]+/HEAD }', $branch)) { - if (preg_match('{^(?:\* )? *(\S+) *([a-f0-9]+) .*$}', $branch, $match)) { + if ($branch && !preg_match('{^ *.+/HEAD }', $branch)) { + if (preg_match('{^(?:\* )? *((?:remotes/(?:origin|upstream)/)[^\s/]+) *([a-f0-9]+) .*$}', $branch, $match)) { $branches[] = $match[1]; } } @@ -245,13 +245,14 @@ class VersionGuesser } foreach ($branches as $candidate) { + $candidateVersion = preg_replace('{^remotes/\S+/}', '', $candidate); // 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; } // 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; } @@ -262,8 +263,11 @@ class VersionGuesser if (strlen($output) < $length) { $length = strlen($output); - $version = $this->versionParser->normalizeBranch($candidate); - $prettyVersion = 'dev-' . $match[1]; + $version = $this->versionParser->normalizeBranch($candidateVersion); + $prettyVersion = 'dev-' . $candidateVersion; + if ($length === 0) { + break; + } } } } From db2f09a36167622a5d868d6000ac1e88cba0afcb Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 7 Oct 2020 14:25:55 +0200 Subject: [PATCH 2/5] VersionGuesser: Update tests to match new git command generated --- .../Package/Version/VersionGuesserTest.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/Composer/Test/Package/Version/VersionGuesserTest.php b/tests/Composer/Test/Package/Version/VersionGuesserTest.php index 5d8d4f5eb..5347d1487 100644 --- a/tests/Composer/Test/Package/Version/VersionGuesserTest.php +++ b/tests/Composer/Test/Package/Version/VersionGuesserTest.php @@ -48,7 +48,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at($step)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); return 128; }) @@ -116,7 +116,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash, $anotherCommitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* master $commitHash Commit message\n(no branch) $anotherCommitHash Commit message\n"; return 0; @@ -153,7 +153,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash, $anotherCommitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = " arbitrary $commitHash Commit message\n* current $anotherCommitHash Another message\n"; return 0; @@ -200,7 +200,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash, $anotherCommitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = " latest-testing $commitHash Commit message\n* current $anotherCommitHash Another message\n"; return 0; @@ -247,7 +247,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash, $anotherCommitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* latest-testing $commitHash Commit message\n current $anotherCommitHash Another message\n master $anotherCommitHash Another message\n"; return 0; @@ -282,7 +282,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* (no branch) $commitHash Commit message\n"; return 0; @@ -313,7 +313,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* (HEAD detached at FETCH_HEAD) $commitHash Commit message\n"; return 0; @@ -343,7 +343,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* (HEAD detached at 03a15d220) $commitHash Commit message\n"; return 0; @@ -372,7 +372,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* (HEAD detached at v2.0.5-alpha2) 433b98d4218c181bae01865901aac045585e8a1a Commit message\n"; return 0; @@ -413,7 +413,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* (HEAD detached at 1.0.0) c006f0c12bbbf197b5c071ffb1c0e9812bb14a4d Commit message\n"; return 0; @@ -455,7 +455,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* foo 03a15d220da53c52eddd5f32ffca64a7b3801bea Commit message\n"; return 0; @@ -485,7 +485,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* 1.5 03a15d220da53c52eddd5f32ffca64a7b3801bea Commit message\n"; return 0; From b3c465d55a78d645f1063b82f46fbf4aa2566a0f Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 7 Oct 2020 15:10:20 +0200 Subject: [PATCH 3/5] VersionGuesser: local branches still need to be considered --- src/Composer/Package/Version/VersionGuesser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Package/Version/VersionGuesser.php b/src/Composer/Package/Version/VersionGuesser.php index fd8dd7a91..072a53dfa 100644 --- a/src/Composer/Package/Version/VersionGuesser.php +++ b/src/Composer/Package/Version/VersionGuesser.php @@ -142,7 +142,7 @@ class VersionGuesser } if ($branch && !preg_match('{^ *.+/HEAD }', $branch)) { - if (preg_match('{^(?:\* )? *((?:remotes/(?:origin|upstream)/)[^\s/]+) *([a-f0-9]+) .*$}', $branch, $match)) { + if (preg_match('{^(?:\* )? *((?:remotes/(?:origin|upstream)/)?[^\s/]+) *([a-f0-9]+) .*$}', $branch, $match)) { $branches[] = $match[1]; } } From 92722a9a4cd4e71db8027437d7f0ee3dc97b5420 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 7 Oct 2020 15:11:08 +0200 Subject: [PATCH 4/5] VersionGuesser: Fix root package loader test which relies on git cmd in guesser --- tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php b/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php index a94539279..858e95231 100644 --- a/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php +++ b/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php @@ -137,7 +137,7 @@ class RootPackageLoaderTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* latest-production 38137d2f6c70e775e137b2d8a7a7d3eaebf7c7e5 Commit message\n master 4f6ed96b0bc363d2aa4404c3412de1c011f67c66 Commit message\n"; return 0; @@ -187,7 +187,7 @@ class RootPackageLoaderTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* latest-production 38137d2f6c70e775e137b2d8a7a7d3eaebf7c7e5 Commit message\n master 4f6ed96b0bc363d2aa4404c3412de1c011f67c66 Commit message\n"; return 0; From 89afb823b636f31e1f9e78f7f49b9056d6a78c3a Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 7 Oct 2020 15:21:04 +0200 Subject: [PATCH 5/5] VersionGuesser: Add test for remote version guess --- .../Package/Version/VersionGuesserTest.php | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tests/Composer/Test/Package/Version/VersionGuesserTest.php b/tests/Composer/Test/Package/Version/VersionGuesserTest.php index 5347d1487..337438fc0 100644 --- a/tests/Composer/Test/Package/Version/VersionGuesserTest.php +++ b/tests/Composer/Test/Package/Version/VersionGuesserTest.php @@ -500,4 +500,46 @@ class VersionGuesserTest extends TestCase $this->assertEquals("1.5.x-dev", $versionData['pretty_version']); $this->assertEquals("1.5.9999999.9999999-dev", $versionData['version']); } + + public function testRemoteBranchesAreSelected() + { + $executor = $this->getMockBuilder('\\Composer\\Util\\ProcessExecutor') + ->setMethods(array('execute')) + ->disableArgumentCloning() + ->disableOriginalConstructor() + ->getMock() + ; + + $self = $this; + + $executor + ->expects($this->at(0)) + ->method('execute') + ->willReturnCallback(function ($command, &$output) use ($self) { + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); + $output = "* feature-branch 03a15d220da53c52eddd5f32ffca64a7b3801bea Commit message\n". + "remotes/origin/1.5 03a15d220da53c52eddd5f32ffca64a7b3801bea Commit message\n"; + + return 0; + }) + ; + + $executor + ->expects($this->at(1)) + ->method('execute') + ->willReturnCallback(function ($command, &$output, $path) use ($self) { + $self->assertEquals('git rev-list remotes/origin/1.5..feature-branch', $command); + $output = "\n"; + + return 0; + }) + ; + + $config = new Config; + $config->merge(array('repositories' => array('packagist' => false))); + $guesser = new VersionGuesser($config, $executor, new VersionParser()); + $versionData = $guesser->guessVersion(array('version' => 'self.version'), 'dummy/path'); + $this->assertEquals("1.5.x-dev", $versionData['pretty_version']); + $this->assertEquals("1.5.9999999.9999999-dev", $versionData['version']); + } }