From 98d8c6db3dbc1719b6e6c78e19bbfbc90b461704 Mon Sep 17 00:00:00 2001
From: Joshua Thijssen <jthijssen@noxlogic.nl>
Date: Wed, 4 Nov 2015 12:56:13 +0100
Subject: [PATCH 1/2] Moved question prompt to readline() function

---
 src/Symfony/Component/Console/Helper/QuestionHelper.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index 3707ffee08f76..781eff3a5bafc 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -30,6 +30,7 @@ class QuestionHelper extends Helper
     private $inputStream;
     private static $shell;
     private static $stty;
+    private $readlinePrompt;
 
     /**
      * Asks a question to the user.
@@ -172,7 +173,11 @@ protected function writePrompt(OutputInterface $output, Question $question)
             $message = $question->getPrompt();
         }
 
-        $output->write($message);
+        if ($this->inputStream == STDIN && function_exists('readline')) {
+            $this->readlinePrompt = $message;
+        } else {
+            $output->write($message);
+        }
     }
 
     /**
@@ -438,7 +443,7 @@ private function getShell()
     private function readFromInput($stream)
     {
         if (STDIN === $stream && function_exists('readline')) {
-            $ret = readline();
+            $ret = readline($this->readlinePrompt);
         } else {
             $ret = fgets($stream, 4096);
         }

From 658ece6f9f4c3eddd4ba6e67ee6e92be0131f07d Mon Sep 17 00:00:00 2001
From: Joshua Thijssen <jthijssen@noxlogic.nl>
Date: Wed, 4 Nov 2015 13:26:23 +0100
Subject: [PATCH 2/2] Fixed strict comparison

---
 src/Symfony/Component/Console/Helper/QuestionHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index 781eff3a5bafc..b0a9ca3795738 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -173,7 +173,7 @@ protected function writePrompt(OutputInterface $output, Question $question)
             $message = $question->getPrompt();
         }
 
-        if ($this->inputStream == STDIN && function_exists('readline')) {
+        if ($this->inputStream === STDIN && function_exists('readline')) {
             $this->readlinePrompt = $message;
         } else {
             $output->write($message);