Fixes symfony#26136: Avoid emitting warning when hasParameterOption /…

… getParameterOption is passed invalid parameters.
greg-1-anderson · Feb 12, 2018 · e3fb107 · e3fb107
1 parent aa3a04a
commit e3fb107
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 || !empty($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 (!empty($leading) && 0 === strpos($token, $leading)) {
                     return substr($token, strlen($leading));
                 }
             }