From b4e2ba2c0499c5c38a5acedfe082de852459c1c0 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 20 Sep 2019 12:11:58 +0200
Subject: [PATCH] fix merge

---
 .../Component/Console/Tests/Helper/QuestionHelperTest.php     | 2 +-
 src/Symfony/Contracts/HttpClient/ResponseInterface.php        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
index 1b2122757b..69c6f58a17 100644
--- a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -201,7 +201,7 @@ class QuestionHelperTest extends AbstractQuestionHelperTest
 
     public function testAskWithAutocompleteCallback()
     {
-        if (!$this->hasSttyAvailable()) {
+        if (!Terminal::hasSttyAvailable()) {
             $this->markTestSkipped('`stty` is required to test autocomplete functionality');
         }
 
diff --git a/src/Symfony/Contracts/HttpClient/ResponseInterface.php b/src/Symfony/Contracts/HttpClient/ResponseInterface.php
index 791be4bc61..8628c8daf1 100644
--- a/src/Symfony/Contracts/HttpClient/ResponseInterface.php
+++ b/src/Symfony/Contracts/HttpClient/ResponseInterface.php
@@ -74,7 +74,9 @@ interface ResponseInterface
     public function toArray(bool $throw = true): array;
 
     /**
-     * Cancels the response.
+     * Closes the response stream and all related buffers.
+     *
+     * No further chunk will be yielded after this method has been called.
      */
     public function cancel(): void;