From 1f8db731a0dd6ba464f04c0cde2752a8f4be4102 Mon Sep 17 00:00:00 2001
From: Amrouche Hamza <hamza@les-tilleuls.coop>
Date: Wed, 15 Nov 2017 16:25:33 +0100
Subject: [PATCH] [Console] Fix global console flag when used in chain

---
 src/Symfony/Component/Console/Input/ArgvInput.php         | 8 ++++++++
 .../Component/Console/Tests/Input/ArgvInputTest.php       | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
index c2f533eb36..4493a5bafc 100644
--- a/src/Symfony/Component/Console/Input/ArgvInput.php
+++ b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -282,6 +282,14 @@ class ArgvInput extends Input
                 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
index 1fe21d0f6c..85fb533715 100644
--- a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -296,6 +296,9 @@ class ArgvInputTest extends TestCase
         $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');