bug #25487 [Console] Fix a bug when passing a letter that could be an alias (Simperfit)

fabpot · fabpot · commit ccc93678fdca · 2017-12-13T16:23:07.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [Console] Fix a bug when passing a letter that could be an alias | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | see #24987 (comment) | License | MIT | Doc PR | Fixing the global in console commands I've introduced a bug where when you pass -e=test it finds it a --shell, this fix the wrong behaviour. cc @Zwartpet Commits ------- a8871de [Console] Fix a bug when passing a letter that could be an alias
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -284,6 +284,8 @@ public function hasParameterOption($values)
                 }
 
                 if (0 === strpos($token, '-') && 0 !== strpos($token, '--')) {
+                    $noValue = explode('=', $token);
+                    $token = $noValue[0];
                     $searchableToken = str_replace('-', '', $token);
                     $searchableValue = str_replace('-', '', $value);
                     if ('' !== $searchableToken && '' !== $searchableValue && false !== strpos($searchableToken, $searchableValue)) {
diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -299,6 +299,9 @@ public function testHasParameterOption()
         $input = new ArgvInput(array('cli.php', '-fh'));
         $this->assertTrue($input->hasParameterOption('-fh'), '->hasParameterOption() returns true if the given short option is in the raw input');
 
+        $input = new ArgvInput(array('cli.php', '-e=test'));
+        $this->assertFalse($input->hasParameterOption('-s'), '->hasParameterOption() returns true if the given short option is in the raw input');
+
         $input = new ArgvInput(array('cli.php', '--foo', 'foo'));
         $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if the given short option is in the raw input');
 

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,8 @@ public function hasParameterOption($values)`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`if (0 === strpos($token, '-') && 0 !== strpos($token, '--')) {`
	`287`	`+ $noValue = explode('=', $token);`
	`288`	`+ $token = $noValue[0];`
`287`	`289`	`$searchableToken = str_replace('-', '', $token);`
`288`	`290`	`$searchableValue = str_replace('-', '', $value);`
`289`	`291`	`if ('' !== $searchableToken && '' !== $searchableValue && false !== strpos($searchableToken, $searchableValue)) {`