bug #37379 [HttpClient] Support for cURL handler objects (derrabus)

fabpot · fabpot · commit b3adba83fd7b · 2020-06-24T10:43:43.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpClient] Support for cURL handler objects | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #37378 | License | MIT | Doc PR | N/A Commits ------- 7ccc2e1 [HttpClient] Support for cURL handler objects.
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -337,7 +337,7 @@ public function reset()
         $this->multi->dnsCache->evictions = $this->multi->dnsCache->evictions ?: $this->multi->dnsCache->removals;
         $this->multi->dnsCache->removals = $this->multi->dnsCache->hostnames = [];
 
-        if (\is_resource($this->multi->handle)) {
+        if (\is_resource($this->multi->handle) || $this->multi->handle instanceof \CurlMultiHandle) {
             if (\defined('CURLMOPT_PUSHFUNCTION')) {
                 curl_multi_setopt($this->multi->handle, CURLMOPT_PUSHFUNCTION, null);
             }
@@ -347,7 +347,7 @@ public function reset()
         }
 
         foreach ($this->multi->openHandles as [$ch]) {
-            if (\is_resource($ch)) {
+            if (\is_resource($ch) || $ch instanceof \CurlHandle) {
                 curl_setopt($ch, CURLOPT_VERBOSE, false);
             }
         }
diff --git a/src/Symfony/Component/HttpClient/Internal/CurlClientState.php b/src/Symfony/Component/HttpClient/Internal/CurlClientState.php
@@ -20,7 +20,7 @@
  */
 final class CurlClientState extends ClientState
 {
-    /** @var resource */
+    /** @var \CurlMultiHandle|resource */
     public $handle;
     /** @var PushedResponse[] */
     public $pushedResponses = [];
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -36,13 +36,15 @@ final class CurlResponse implements ResponseInterface
     private $debugBuffer;
 
     /**
+     * @param \CurlHandle|resource|string $ch
+     *
      * @internal
      */
     public function __construct(CurlClientState $multi, $ch, array $options = null, LoggerInterface $logger = null, string $method = 'GET', callable $resolveRedirect = null, int $curlVersion = null)
     {
         $this->multi = $multi;
 
-        if (\is_resource($ch)) {
+        if (\is_resource($ch) || $ch instanceof \CurlHandle) {
             unset($multi->handlesActivity[(int) $ch]);
             $this->handle = $ch;
             $this->debugBuffer = fopen('php://temp', 'w+');
diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php
@@ -50,7 +50,7 @@ trait ResponseTrait
         'canceled' => false,
     ];
 
-    /** @var resource */
+    /** @var object|resource */
     private $handle;
     private $id;
     private $timeout = 0;

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ public function reset()`
`337`	`337`	`$this->multi->dnsCache->evictions = $this->multi->dnsCache->evictions ?: $this->multi->dnsCache->removals;`
`338`	`338`	`$this->multi->dnsCache->removals = $this->multi->dnsCache->hostnames = [];`
`339`	`339`
`340`		`- if (\is_resource($this->multi->handle)) {`
	`340`	`+ if (\is_resource($this->multi->handle) \|\| $this->multi->handle instanceof \CurlMultiHandle) {`
`341`	`341`	`if (\defined('CURLMOPT_PUSHFUNCTION')) {`
`342`	`342`	`curl_multi_setopt($this->multi->handle, CURLMOPT_PUSHFUNCTION, null);`
`343`	`343`	`}`
`@@ -347,7 +347,7 @@ public function reset()`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`foreach ($this->multi->openHandles as [$ch]) {`
`350`		`- if (\is_resource($ch)) {`
	`350`	`+ if (\is_resource($ch) \|\| $ch instanceof \CurlHandle) {`
`351`	`351`	`curl_setopt($ch, CURLOPT_VERBOSE, false);`
`352`	`352`	`}`
`353`	`353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`final class CurlClientState extends ClientState`
`22`	`22`	`{`
`23`		`- /** @var resource */`
	`23`	`+ /** @var \CurlMultiHandle\|resource */`
`24`	`24`	`public $handle;`
`25`	`25`	`/** @var PushedResponse[] */`
`26`	`26`	`public $pushedResponses = [];`