[Console] Fix a bug when passing a letter that could be an alias

Amrouche Hamza · Amrouche Hamza · commit c2904e1c31ed · 2017-12-13T19:55:05.000+01:00
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -284,6 +284,7 @@ public function hasParameterOption($values)
                 }
 
                 if (0 === strpos($token, '-') && 0 !== strpos($token, '--')) {
+                    $token = explode('=', $token)[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,7 @@ public function hasParameterOption($values)`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`if (0 === strpos($token, '-') && 0 !== strpos($token, '--')) {`
	`287`	`+ $token = explode('=', $token)[0];`
`287`	`288`	`$searchableToken = str_replace('-', '', $token);`
`288`	`289`	`$searchableValue = str_replace('-', '', $value);`
`289`	`290`	`if ('' !== $searchableToken && '' !== $searchableValue && false !== strpos($searchableToken, $searchableValue)) {`