From 4f47bb73a0727d865461ddb51dcb56414e37577f Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 26 Jan 2018 16:25:25 +0100
Subject: [PATCH] Revert "bug #24987 [Console] Fix global console flag when
 used in chain (Simperfit)"

This reverts commit 9107fb0afd7369618c9d3e293e323a4894f8cbd0, reversing
changes made to abe6e92593aef46cfc8de13b998209862d8fbc62.
---
 src/Symfony/Component/Console/Input/ArgvInput.php         | 8 --------
 .../Component/Console/Tests/Input/ArgvInputTest.php       | 3 ---
 2 files changed, 11 deletions(-)

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