fix merge

nicolas-grekas · nicolas-grekas · commit b4e2ba2c0499 · 2019-09-20T12:11:58.000+02:00
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -201,7 +201,7 @@ public function testAskWithAutocomplete()
 
     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
@@ -74,7 +74,9 @@ public function getContent(bool $throw = true): string;
     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;
 

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public function testAskWithAutocomplete()`
`201`	`201`
`202`	`202`	`public function testAskWithAutocompleteCallback()`
`203`	`203`	`{`
`204`		`- if (!$this->hasSttyAvailable()) {`
	`204`	`+ if (!Terminal::hasSttyAvailable()) {`
`205`	`205`	$this->markTestSkipped('`stty` is required to test autocomplete functionality');
`206`	`206`	`}`
`207`	`207`