Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit04424c7

Browse files
[Debug][HttpKernel][VarDumper] Prepare for committed 7.2 changes
1 parent386e5e7 commit04424c7

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

‎src/Symfony/Component/Debug/Exception/FlattenException.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,10 @@ private function flattenArgs($args, $level = 0, &$count = 0)
263263
if (++$count >1e4) {
264264
returnarray('array','*SKIPPED over 10000 entries*');
265265
}
266-
if (is_object($value)) {
266+
if ($valueinstanceof \__PHP_Incomplete_Class) {
267+
// Special case of object, is_object will return false
268+
$result[$key] =array('incomplete-object',$this->getClassNameFromIncomplete($value));
269+
}elseif (is_object($value)) {
267270
$result[$key] =array('object',get_class($value));
268271
}elseif (is_array($value)) {
269272
if ($level >10) {
@@ -277,9 +280,6 @@ private function flattenArgs($args, $level = 0, &$count = 0)
277280
$result[$key] =array('boolean',$value);
278281
}elseif (is_resource($value)) {
279282
$result[$key] =array('resource',get_resource_type($value));
280-
}elseif ($valueinstanceof \__PHP_Incomplete_Class) {
281-
// Special case of object, is_object will return false
282-
$result[$key] =array('incomplete-object',$this->getClassNameFromIncomplete($value));
283283
}else {
284284
$result[$key] =array('string', (string)$value);
285285
}

‎src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ class ValueExporter
2727
*/
2828
publicfunctionexportValue($value,$depth =1,$deep =false)
2929
{
30+
if ($valueinstanceof \__PHP_Incomplete_Class) {
31+
returnsprintf('__PHP_Incomplete_Class(%s)',$this->getClassNameFromIncomplete($value));
32+
}
33+
3034
if (is_object($value)) {
3135
if ($valueinstanceof \DateTime ||$valueinstanceof \DateTimeInterface) {
3236
returnsprintf('Object(%s) - %s',get_class($value),$value->format(\DateTime::ISO8601));
@@ -35,10 +39,6 @@ public function exportValue($value, $depth = 1, $deep = false)
3539
returnsprintf('Object(%s)',get_class($value));
3640
}
3741

38-
if ($valueinstanceof \__PHP_Incomplete_Class) {
39-
returnsprintf('__PHP_Incomplete_Class(%s)',$this->getClassNameFromIncomplete($value));
40-
}
41-
4242
if (is_array($value)) {
4343
if (empty($value)) {
4444
return'[]';

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,12 @@ public function __construct($value)
3939

4040
case'resource':
4141
case'unknown type':
42+
case'resource (closed)':
4243
$this->type =self::TYPE_RESOURCE;
4344
$this->handle = (int)$value;
44-
$this->class = @get_resource_type($value);
45+
if ('Unknown' ===$this->class = @get_resource_type($value)) {
46+
$this->class ='Closed';
47+
}
4548
$this->cut = -1;
4649
break;
4750

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,13 @@ protected function doClone($var)
183183

184184
case'resource':
185185
case'unknown type':
186+
case'resource (closed)':
186187
if (empty($resRefs[$h = (int)$v])) {
187188
$stub =newStub();
188189
$stub->type = Stub::TYPE_RESOURCE;
189-
$stub->class =$zval['resource_type'] ?:get_resource_type($v);
190+
if ('Unknown' ===$stub->class =$zval['resource_type'] ?: @get_resource_type($v)) {
191+
$stub->class ='Closed';
192+
}
190193
$stub->value =$v;
191194
$stub->handle =$h;
192195
$a =$this->castResource($stub,0 <$i);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public function testClosedResource()
193193

194194
$this->assertStringMatchesFormat(
195195
<<<EOTXT
196-
Unknown resource @{$res}
196+
Closed resource @{$res}
197197
198198
EOTXT
199199
,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp