Merge pull request #73 from ciaranmcnulty/fix-from-option-parsing

Check that from is actually provided
Roave · May 27, 2018 · cd87d1f · cd87d1f
2 parents 81b816e + d03ad31
commit cd87d1f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Command/AssertBackwardsCompatible.php b/src/Command/AssertBackwardsCompatible.php
@@ -148,7 +148,7 @@ public function execute(InputInterface $input, OutputInterface $output) : int
         // @todo fix flaky assumption about the path of the source repo...
         $sourceRepo = CheckedOutRepository::fromPath(getcwd());
 
-        $fromRevision = $input->hasOption('from')
+        $fromRevision = $input->hasParameterOption('from')
             ? $this->parseRevisionFromInput($input, $sourceRepo)
             : $this->determineFromRevisionFromRepository($sourceRepo, $stdErr);
 

diff --git a/test/unit/Command/AssertBackwardsCompatibleTest.php b/test/unit/Command/AssertBackwardsCompatibleTest.php
@@ -110,6 +110,7 @@ public function testExecuteWhenRevisionsAreProvidedAsOptions() : void
         $toSha   = sha1('toRevision', false);
 
         $this->input->expects(self::any())->method('hasOption')->willReturn(true);
+        $this->input->expects(self::any())->method('hasParameterOption')->willReturn(true);
         $this->input->expects(self::any())->method('getOption')->willReturnMap([
             ['from', $fromSha],
             ['to', $toSha],
@@ -160,6 +161,7 @@ public function testExecuteReturnsNonZeroExitCodeWhenChangesAreDetected() : void
         $toSha   = sha1('toRevision', false);
 
         $this->input->expects(self::any())->method('hasOption')->willReturn(true);
+        $this->input->expects(self::any())->method('hasParameterOption')->willReturn(true);
         $this->input->expects(self::any())->method('getOption')->willReturnMap([
             ['from', $fromSha],
             ['to', $toSha],
@@ -222,6 +224,7 @@ public function testProvidingMarkdownOptionWritesMarkdownOutput() : void
         $toSha   = sha1('toRevision', false);
 
         $this->input->expects(self::any())->method('hasOption')->willReturn(true);
+        $this->input->expects(self::any())->method('hasParameterOption')->willReturn(true);
         $this->input->expects(self::any())->method('getOption')->willReturnMap([
             ['from', $fromSha],
             ['to', $toSha],
@@ -349,6 +352,7 @@ public function testExecuteFailsIfCheckedOutRepositoryDoesNotExist() : void
         $toSha   = sha1('toRevision', false);
 
         $this->input->expects(self::any())->method('hasOption')->willReturn(true);
+        $this->input->expects(self::any())->method('hasParameterOption')->willReturn(true);
         $this->input->expects(self::any())->method('getOption')->willReturnMap([
             ['from', $fromSha],
             ['to', $toSha],