Skip to content

Commit 2125805

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Fixed typo in test name [HttpFondation] Change file extension of "audio/mpeg" from "mpga" to "mp3" [VarDumper] Support for cURL handler objects. [DI][FrameworkBundle] Remove whitelist occurrences Avoid accessibility errors on debug toolbar
2 parents 9b3daaf + 276cdd8 commit 2125805

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, $isNested)
2631
{
2732
return curl_getinfo($h);

Cloner/AbstractCloner.php

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

147+
'CurlHandle' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
147148
':curl' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
149+
148150
':dba' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
149151
':dba persistent' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
150152
':gd' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castGd'],

0 commit comments

Comments
 (0)