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

Robin Chalas · Robin Chalas · commit 9107fb0afd73 · 2017-11-26T02:04:32.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Console] Fix global console flag when used in chain | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #23876 | License | MIT | Doc PR | Because SymfonyCon is great we can create pull request in it ! (this was preparer in the plane and I can push it just right now ;)) Finished in the #SymfonyConHackday2017 Commits ------- 1f8db73 [Console] Fix global console flag when used in chain
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -282,6 +282,14 @@ 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,6 +296,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
`@@ -282,6 +282,14 @@ 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`	`+ }`
`285`	`293`	`}`
`286`	`294`	`}`
`287`	`295`