Merge branch '4.4' into 5.0

* 4.4:
  [HttpClient] Support for cURL handler objects.
  [HttpClient] unset activity list when creating CurlResponse
  Fixed typo in test name
  add .body wrapper element
  [HttpFondation] Change file extension of "audio/mpeg" from "mpga" to "mp3"
  [VarDumper] Support for cURL handler objects.
  Check whether path is file in DataPart::fromPath()
  [DI][FrameworkBundle] Remove whitelist occurrences
  Avoid accessibility errors on debug toolbar

Author: fabpot

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);
             }
         }

Internal/CurlClientState.php

@@ -20,7 +20,7 @@
  */
 final class CurlClientState extends ClientState
 {
-    /** @var resource */
+    /** @var \CurlMultiHandle|resource */
     public $handle;
     /** @var PushedResponse[] */
     public $pushedResponses = [];

Response/CurlResponse.php

@@ -36,13 +36,16 @@ 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+');
             if (0x074000 === $curlVersion) {

Response/ResponseTrait.php

@@ -50,7 +50,7 @@ trait ResponseTrait
         'canceled' => false,
     ];
 
-    /** @var resource */
+    /** @var object|resource */
     private $handle;
     private $id;
     private $timeout = 0;