Skip to content

Commit 2ebe1c7

Browse files
committed
Merge branch '5.0' into 5.1
* 5.0: [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 update cookie test
2 parents aaa15a0 + 36d19db commit 2ebe1c7

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

Caster/ResourceCaster.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
*/
2323
class ResourceCaster
2424
{
25+
/**
26+
* @param \CurlHandle|resource $h
27+
*
28+
* @return array
29+
*/
2530
public static function castCurl($h, array $a, Stub $stub, bool $isNested)
2631
{
2732
return curl_getinfo($h);

Cloner/AbstractCloner.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,9 @@ abstract class AbstractCloner implements ClonerInterface
145145
'Ds\Pair' => ['Symfony\Component\VarDumper\Caster\DsCaster', 'castPair'],
146146
'Symfony\Component\VarDumper\Caster\DsPairStub' => ['Symfony\Component\VarDumper\Caster\DsCaster', 'castPairStub'],
147147

148+
'CurlHandle' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
148149
':curl' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
150+
149151
':dba' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
150152
':dba persistent' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
151153
':gd' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castGd'],

0 commit comments

Comments
 (0)