Merge pull request #43 from weierophinney/hotfix/bump-minor-fix

Ocramius · web-flow · commit 01ddc3d459ea · 2020-08-12T19:32:49.000+02:00
Fix which branch the minor release bump in the changelog targets.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,7 +22,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#43](https://github.com/laminas/automatic-releases/pull/43) fixes which branch the minor changelog bump is targetted to to correctly be the next default branch.
 
 ## 1.2.0 - 2020-08-12
 
diff --git a/src/Application/Command/SwitchDefaultBranchToNextMinor.php b/src/Application/Command/SwitchDefaultBranchToNextMinor.php
@@ -81,7 +81,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
                 BumpAndCommitChangelogVersion::BUMP_MINOR,
                 $repositoryPath,
                 $releaseVersion,
-                $newestBranch
+                $nextDefaultBranch
             );
         }
 
diff --git a/test/unit/Application/SwitchDefaultBranchToNextMinorTest.php b/test/unit/Application/SwitchDefaultBranchToNextMinorTest.php
@@ -171,7 +171,7 @@ public function testWillSwitchToNewlyCreatedDefaultBranchWhenNoNewerReleaseBranc
                 BumpAndCommitChangelogVersion::BUMP_MINOR,
                 $workspace,
                 SemVerVersion::fromMilestoneName('1.2.3'),
-                BranchName::fromName('1.2.x')
+                BranchName::fromName('1.3.x')
             );
 
         $this->setDefaultBranch->expects(self::once())

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function execute(InputInterface $input, OutputInterface $output): int`
`81`	`81`	`BumpAndCommitChangelogVersion::BUMP_MINOR,`
`82`	`82`	`$repositoryPath,`
`83`	`83`	`$releaseVersion,`
`84`		`- $newestBranch`
	`84`	`+ $nextDefaultBranch`
`85`	`85`	`);`
`86`	`86`	`}`
`87`	`87`