From 667b9295f86d15023cb03e9cec9c9b88619aea03 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 26 Jan 2018 16:23:25 +0100 Subject: [PATCH] Revert "bug #25487 [Console] Fix a bug when passing a letter that could be an alias (Simperfit)" This reverts commit ccc93678fdca348d3bf23d17013c45f39eadafd9, reversing changes made to e77545ab8d1382387a1ba9512d1d3affb20617ad. --- src/Symfony/Component/Console/Input/ArgvInput.php | 2 -- src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php index 23430edde6..4493a5bafc 100644 --- a/src/Symfony/Component/Console/Input/ArgvInput.php +++ b/src/Symfony/Component/Console/Input/ArgvInput.php @@ -284,8 +284,6 @@ class ArgvInput extends Input } 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 index 8ded178bbe..85fb533715 100644 --- a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php +++ b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php @@ -299,9 +299,6 @@ class ArgvInputTest extends TestCase $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');