Merge pull request #60 from leviy/fix-pre-releases-changelog

Fix changelog generation for pre-releases

Author: nicwortel

src/Vcs/Git.php

@@ -122,7 +122,9 @@ public function getPreReleasesForVersion(string $version): array
 
         $preReleaseTagPattern = sprintf('%s-*', $tag);
 
-        return self::execute('tag', ['--list', '--sort=taggerdate', '--merged=' . $tag, $preReleaseTagPattern]);
+        $tags = self::execute('tag', ['--list', '--sort=taggerdate', '--merged=' . $tag, $preReleaseTagPattern]);
+
+        return array_map([$this, 'getVersionFromTag'], $tags);
     }
 
     private function getVersionFromTag(string $tag): string

tests/integration/Vcs/GitTest.php

@@ -138,7 +138,7 @@ public function testPreReleasesForAReleaseAreReturned(): void
         $preReleases = $git->getPreReleasesForVersion('1.0.0');
 
         $this->assertCount(1, $preReleases);
-        $this->assertContains('v1.0.0-alpha.1', $preReleases);
+        $this->assertContains('1.0.0-alpha.1', $preReleases);
     }
 
     public function testPreReleasesForAReleaseAreReturnedInChronologicalOrder(): void
@@ -154,7 +154,7 @@ public function testPreReleasesForAReleaseAreReturnedInChronologicalOrder(): voi
         $git = new Git('v');
         $preReleases = $git->getPreReleasesForVersion('1.0.0');
 
-        $this->assertSame(['v1.0.0-alpha.1', 'v1.0.0-beta.1', 'v1.0.0-alpha.2'], $preReleases);
+        $this->assertSame(['1.0.0-alpha.1', '1.0.0-beta.1', '1.0.0-alpha.2'], $preReleases);
     }
 
     public function testTagsNotReachableFromTheCurrentCommitAreIgnored(): void
@@ -169,8 +169,8 @@ public function testTagsNotReachableFromTheCurrentCommitAreIgnored(): void
         $git = new Git('v');
         $preReleases = $git->getPreReleasesForVersion('1.0.0');
 
-        $this->assertContains('v1.0.0-alpha.1', $preReleases);
-        $this->assertNotContains('v1.0.0-beta.1', $preReleases);
+        $this->assertContains('1.0.0-alpha.1', $preReleases);
+        $this->assertNotContains('1.0.0-beta.1', $preReleases);
     }
 
     private function commitFile(string $filename, string $commitMessage = 'Commit message'): void