[Console] Fix global console flag when used in chain

Amrouche Hamza · Amrouche Hamza · commit 52a6cc23e6a9 · 2017-11-15T16:25:33.000+01:00
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -285,6 +285,14 @@ public function hasParameterOption($values, $onlyParams = false)
                 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
@@ -314,6 +314,9 @@ 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
`@@ -285,6 +285,14 @@ public function hasParameterOption($values, $onlyParams = false)`
`285`	`285`	`if ($token === $value \|\| 0 === strpos($token, $value.'=')) {`
`286`	`286`	`return true;`
`287`	`287`	`}`
	`288`	`+`
	`289`	`+ if (0 === strpos($token, '-') && 0 !== strpos($token, '--')) {`
	`290`	`+ $searchableToken = str_replace('-', '', $token);`
	`291`	`+ $searchableValue = str_replace('-', '', $value);`
	`292`	`+ if ('' !== $searchableToken && '' !== $searchableValue && false !== strpos($searchableToken, $searchableValue)) {`
	`293`	`+ return true;`
	`294`	`+ }`
	`295`	`+ }`
`288`	`296`	`}`
`289`	`297`	`}`
`290`	`298`