Revert "bug #24987 [Console] Fix global console flag when used in chain (Simperfit)"

fabpot · fabpot · commit 4f47bb73a072 · 2018-01-26T16:25:25.000+01:00
This reverts commit 9107fb0, reversing changes made to abe6e92.
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -282,14 +282,6 @@ public function hasParameterOption($values)
                 if ($token === $value || 0 === strpos($token, $value.'=')) {
                     return true;
                 }
-
-                if (0 === strpos($token, '-') && 0 !== strpos($token, '--')) {
-                    $searchableToken = str_replace('-', '', $token);
-                    $searchableValue = str_replace('-', '', $value);
-                    if ('' !== $searchableToken && '' !== $searchableValue && false !== strpos($searchableToken, $searchableValue)) {
-                        return true;
-                    }
-                }
             }
         }
 
diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -296,9 +296,6 @@ public function testHasParameterOption()
         $input = new ArgvInput(array('cli.php', '-f', 'foo'));
         $this->assertTrue($input->hasParameterOption('-f'), '->hasParameterOption() returns true if the given short option is in the raw input');
 
-        $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', '--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
`@@ -282,14 +282,6 @@ public function hasParameterOption($values)`
`282`	`282`	`if ($token === $value \|\| 0 === strpos($token, $value.'=')) {`
`283`	`283`	`return true;`
`284`	`284`	`}`
`285`		`-`
`286`		`- if (0 === strpos($token, '-') && 0 !== strpos($token, '--')) {`
`287`		`- $searchableToken = str_replace('-', '', $token);`
`288`		`- $searchableValue = str_replace('-', '', $value);`
`289`		`- if ('' !== $searchableToken && '' !== $searchableValue && false !== strpos($searchableToken, $searchableValue)) {`
`290`		`- return true;`
`291`		`- }`
`292`		`- }`
`293`	`285`	`}`
`294`	`286`	`}`
`295`	`287`