diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
index da064598d0741..62c658b4f9c6a 100644
--- a/src/Symfony/Component/Console/Input/ArgvInput.php
+++ b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -283,7 +283,7 @@ public function hasParameterOption($values)
// For long options, test for '--option=' at beginning
// For short options, test for '-o' at beginning
$leading = 0 === strpos($value, '--') ? $value.'=' : $value;
- if ($token === $value || 0 === strpos($token, $leading)) {
+ if ($token === $value || '' !== $leading && 0 === strpos($token, $leading)) {
return true;
}
}
@@ -311,7 +311,7 @@ public function getParameterOption($values, $default = false)
// For long options, test for '--option=' at beginning
// For short options, test for '-o' at beginning
$leading = 0 === strpos($value, '--') ? $value.'=' : $value;
- if (0 === strpos($token, $leading)) {
+ if ('' !== $leading && 0 === strpos($token, $leading)) {
return substr($token, strlen($leading));
}
}
diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
index 04f5ce3157c44..c2a277a93fa78 100644
--- a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -337,6 +337,21 @@ public function testHasParameterOptionEdgeCasesAndLimitations()
$this->assertFalse($input->hasParameterOption('-fh'), '->hasParameterOption() returns true if the given short option is in the raw input');
}
+ public function testNoWarningOnInvalidParameterOption()
+ {
+ $input = new ArgvInput(array('cli.php', '-edev'));
+
+ // Control.
+ $this->assertTrue($input->hasParameterOption(array('-e', '')));
+ // No warning is thrown if https://github.com/symfony/symfony/pull/26156 is fixed
+ $this->assertFalse($input->hasParameterOption(array('-m', '')));
+
+ // Control.
+ $this->assertEquals('dev', $input->getParameterOption(array('-e', '')));
+ // No warning is thrown if https://github.com/symfony/symfony/pull/26156 is fixed
+ $this->assertFalse($input->getParameterOption(array('-m', '')));
+ }
+
public function testToString()
{
$input = new ArgvInput(array('cli.php', '-f', 'foo'));
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy