Skip to content

Commit a41abf3

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.6' into 2.7
* 2.6: Fix merge [VarDumper] Fix dumping ThrowingCasterException Conflicts: src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
2 parents 8bee26f + e5611d2 commit a41abf3

File tree

6 files changed

+74
-41
lines changed

6 files changed

+74
-41
lines changed

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
1010

1111
/**
12-
* ProjectServiceContainer
12+
* ProjectServiceContainer.
1313
*
1414
* This class has been auto-generated
1515
* by the Symfony Dependency Injection Component.

‎src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,17 @@ public static function castThrowingCasterException(ThrowingCasterException $e, a
7171
{
7272
$b = (array) $a["\0Exception\0previous"];
7373

74-
array_splice($b["\0Exception\0trace"], count($a["\0Exception\0trace"]));
75-
76-
$t = static::$traceArgs;
77-
static::$traceArgs = false;
78-
$b = static::castException($a["\0Exception\0previous"], $b, $stub, $isNested);
79-
static::$traceArgs = $t;
80-
81-
if (empty($a["\0*\0message"])) {
82-
$a["\0*\0message"] = "Unexpected exception thrown from a caster: ".get_class($a["\0Exception\0previous"]);
83-
}
84-
8574
if (isset($b["\0*\0message"])) {
8675
$a["\0~\0message"] = $b["\0*\0message"];
8776
}
88-
if (isset($b["\0*\0file"])) {
89-
$a["\0~\0file"] = $b["\0*\0file"];
90-
}
91-
if (isset($b["\0*\0line"])) {
92-
$a["\0~\0line"] = $b["\0*\0line"];
93-
}
94-
if (isset($b["\0Exception\0trace"])) {
77+
78+
if (isset($a["\0Exception\0trace"])) {
79+
$b["\0Exception\0trace"][0] += array(
80+
'file' => $b["\0*\0file"],
81+
'line' => $b["\0*\0line"],
82+
);
83+
array_splice($b["\0Exception\0trace"], -1 - count($a["\0Exception\0trace"]));
84+
static::filterTrace($b["\0Exception\0trace"], false);
9585
$a["\0~\0trace"] = $b["\0Exception\0trace"];
9686
}
9787

‎src/Symfony/Component/VarDumper/Caster/PdoCaster.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,30 +59,30 @@ class PdoCaster
5959

6060
public static function castPdo(\PDO $c, array $a, Stub $stub, $isNested)
6161
{
62-
$a = array();
62+
$attr = array();
6363
$errmode = $c->getAttribute(\PDO::ATTR_ERRMODE);
6464
$c->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
6565

66-
foreach (self::$pdoAttributes as $attr => $values) {
67-
if (!isset($attr[0])) {
68-
$attr = $values;
69-
$values = array();
66+
foreach (self::$pdoAttributes as $k => $v) {
67+
if (!isset($k[0])) {
68+
$k = $v;
69+
$v = array();
7070
}
7171

7272
try {
73-
$a[$attr] = 'ERRMODE' === $attr ? $errmode : $c->getAttribute(constant("PDO::ATTR_{$attr}"));
74-
if ($values && isset($values[$a[$attr]])) {
75-
$a[$attr] = new ConstStub($values[$a[$attr]], $a[$attr]);
73+
$attr[$k] = 'ERRMODE' === $k ? $errmode : $c->getAttribute(constant('PDO::ATTR_'.$k));
74+
if ($v && isset($v[$attr[$k]])) {
75+
$attr[$k] = new ConstStub($v[$attr[$k]], $attr[$k]);
7676
}
77-
} catch (\Exception $m) {
77+
} catch (\Exception $e) {
7878
}
7979
}
8080

8181
$m = "\0~\0";
82-
$a = (array) $c + array(
82+
$a += array(
8383
$m.'inTransaction' => method_exists($c, 'inTransaction'),
8484
$m.'errorInfo' => $c->errorInfo(),
85-
$m.'attributes' => $a,
85+
$m.'attributes' => $attr,
8686
);
8787

8888
if ($a[$m.'inTransaction']) {

‎src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ private function callCaster($callback, $obj, $a, $stub, $isNested)
276276
$a = $cast;
277277
}
278278
} catch (\Exception $e) {
279-
$a["\0~\0⚠"] = new ThrowingCasterException($callback, $e);
279+
$a[(Stub::TYPE_OBJECT === $stub->type ? "\0~\0" : '').'⚠'] = new ThrowingCasterException($callback, $e);
280280
}
281281

282282
return $a;

‎src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,12 @@
1616
*/
1717
class ThrowingCasterException extends \Exception
1818
{
19-
private $caster;
20-
2119
/**
2220
* @param callable $caster The failing caster
2321
* @param \Exception $prev The exception thrown from the caster
2422
*/
2523
public function __construct($caster, \Exception $prev)
2624
{
27-
if (is_array($caster)) {
28-
if (isset($caster[0]) && is_object($caster[0])) {
29-
$caster[0] = get_class($caster[0]);
30-
}
31-
$caster = implode('::', $caster);
32-
}
33-
$this->caster = $caster;
34-
parent::__construct(null, 0, $prev);
25+
parent::__construct('Unexpected exception thrown from a caster: '.get_class($prev), 0, $prev);
3526
}
3627
}

‎src/Symfony/Component/VarDumper/Tests/CliDumperTest.php

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,58 @@ public function testXmlResource()
136136
error_code: XML_ERROR_NONE
137137
}
138138
139+
EOTXT
140+
,
141+
$out
142+
);
143+
}
144+
145+
public function testThrowingCaster()
146+
{
147+
$out = fopen('php://memory', 'r+b');
148+
149+
$dumper = new CliDumper();
150+
$dumper->setColors(false);
151+
$cloner = new VarCloner();
152+
$cloner->addCasters(array(
153+
':stream' => function () {
154+
throw new \Exception('Foobar');
155+
},
156+
));
157+
$line = __LINE__ - 3;
158+
$file = __FILE__;
159+
$ref = (int) $out;
160+
161+
$data = $cloner->cloneVar($out);
162+
$dumper->dump($data, $out);
163+
rewind($out);
164+
$out = stream_get_contents($out);
165+
166+
$this->assertStringMatchesFormat(
167+
<<<EOTXT
168+
:stream {@{$ref}
169+
wrapper_type: "PHP"
170+
stream_type: "MEMORY"
171+
mode: "w+b"
172+
unread_bytes: 0
173+
seekable: true
174+
uri: "php://memory"
175+
timed_out: false
176+
blocked: true
177+
eof: false
178+
options: []
179+
⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {#%d
180+
#message: "Unexpected exception thrown from a caster: Exception"
181+
message: "Foobar"
182+
trace: array:1 [
183+
0 => array:2 [
184+
"call" => "%s{closure}()"
185+
"file" => "{$file}:{$line}"
186+
]
187+
]
188+
}
189+
}
190+
139191
EOTXT
140192
,
141193
$out

0 commit comments

Comments
 (0)