bug #17691 Fixed (string) catchable fatal error for PHP Incomplete Class instances (yceruto)

fabpot · fabpot · commit ca6f1f74289e · 2016-02-12T07:25:11.000+01:00
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17691). Discussion ---------- Fixed (string) catchable fatal error for PHP Incomplete Class instances | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17586 | License | MIT | Doc PR | - Commits ------- 4b7ed98 avoid (string) catchable fatal error for instances of __PHP_Incomplete_Class
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php b/src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php
@@ -35,6 +35,10 @@ public function exportValue($value, $depth = 1, $deep = false)
             return sprintf('Object(%s)', get_class($value));
         }
 
+        if ($value instanceof \__PHP_Incomplete_Class) {
+            return sprintf('__PHP_Incomplete_Class(%s)', $this->getClassNameFromIncomplete($value));
+        }
+
         if (is_array($value)) {
             if (empty($value)) {
                 return '[]';
@@ -75,4 +79,11 @@ public function exportValue($value, $depth = 1, $deep = false)
 
         return (string) $value;
     }
+
+    private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value)
+    {
+        $array = new \ArrayObject($value);
+
+        return $array['__PHP_Incomplete_Class_Name'];
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/Util/ValueExporterTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/Util/ValueExporterTest.php
@@ -39,4 +39,12 @@ public function testDateTimeImmutable()
         $dateTime = new \DateTimeImmutable('2014-06-10 07:35:40', new \DateTimeZone('UTC'));
         $this->assertSame('Object(DateTimeImmutable) - 2014-06-10T07:35:40+0000', $this->valueExporter->exportValue($dateTime));
     }
+
+    public function testIncompleteClass()
+    {
+        $foo = new \__PHP_Incomplete_Class();
+        $array = new \ArrayObject($foo);
+        $array['__PHP_Incomplete_Class_Name'] = 'AppBundle/Foo';
+        $this->assertSame('__PHP_Incomplete_Class(AppBundle/Foo)', $this->valueExporter->exportValue($foo));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,12 @@ public function testDateTimeImmutable()`
`39`	`39`	`$dateTime = new \DateTimeImmutable('2014-06-10 07:35:40', new \DateTimeZone('UTC'));`
`40`	`40`	`$this->assertSame('Object(DateTimeImmutable) - 2014-06-10T07:35:40+0000', $this->valueExporter->exportValue($dateTime));`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ public function testIncompleteClass()`
	`44`	`+ {`
	`45`	`+ $foo = new \__PHP_Incomplete_Class();`
	`46`	`+ $array = new \ArrayObject($foo);`
	`47`	`+ $array['__PHP_Incomplete_Class_Name'] = 'AppBundle/Foo';`
	`48`	`+ $this->assertSame('__PHP_Incomplete_Class(AppBundle/Foo)', $this->valueExporter->exportValue($foo));`
	`49`	`+ }`
`42`	`50`	`}`