minor #41129 Remove code that deals with legacy behavior of PHP_Incomplete_Class (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 2d719ac831a3 · 2021-05-07T15:43:39.000+02:00
This PR was merged into the 5.2 branch. Discussion ---------- Remove code that deals with legacy behavior of PHP_Incomplete_Class | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- c5a4f7d Remove code that deals with legacy behavior of PHP_Incomplete_Class
diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
@@ -359,7 +359,6 @@ private function flattenArgs(array $args, int $level = 0, int &$count = 0): arra
                 return ['array', '*SKIPPED over 10000 entries*'];
             }
             if ($value instanceof \__PHP_Incomplete_Class) {
-                // is_object() returns false on PHP<=7.1
                 $result[$key] = ['incomplete-object', $this->getClassNameFromIncomplete($value)];
             } elseif (\is_object($value)) {
                 $result[$key] = ['object', \get_class($value)];
diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -166,7 +166,6 @@ protected function doClone($var)
                         break;
 
                     case \is_object($v):
-                    case $v instanceof \__PHP_Incomplete_Class:
                         if (empty($objRefs[$h = spl_object_id($v)])) {
                             $stub = new Stub();
                             $stub->type = Stub::TYPE_OBJECT;
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -60,7 +60,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                     $value = self::prepare($value, $objectsPool, $refsPool, $objectsCount, $valueIsStatic);
                 }
                 goto handle_value;
-            } elseif (!\is_object($value) && !$value instanceof \__PHP_Incomplete_Class || $value instanceof \UnitEnum) {
+            } elseif (!\is_object($value) || $value instanceof \UnitEnum) {
                 goto handle_value;
             }
 
diff --git a/src/Symfony/Component/VarExporter/VarExporter.php b/src/Symfony/Component/VarExporter/VarExporter.php
@@ -44,7 +44,7 @@ public static function export($value, bool &$isStaticValue = null, array &$found
     {
         $isStaticValue = true;
 
-        if (!\is_object($value) && !(\is_array($value) && $value) && !$value instanceof \__PHP_Incomplete_Class && !\is_resource($value) || $value instanceof \UnitEnum) {
+        if (!\is_object($value) && !(\is_array($value) && $value) && !\is_resource($value) || $value instanceof \UnitEnum) {
             return Exporter::export($value);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,6 @@ private function flattenArgs(array $args, int $level = 0, int &$count = 0): arra`
`359`	`359`	`return ['array', 'SKIPPED over 10000 entries'];`
`360`	`360`	`}`
`361`	`361`	`if ($value instanceof \__PHP_Incomplete_Class) {`
`362`		`- // is_object() returns false on PHP<=7.1`
`363`	`362`	`$result[$key] = ['incomplete-object', $this->getClassNameFromIncomplete($value)];`
`364`	`363`	`} elseif (\is_object($value)) {`
`365`	`364`	`$result[$key] = ['object', \get_class($value)];`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount`
`60`	`60`	`$value = self::prepare($value, $objectsPool, $refsPool, $objectsCount, $valueIsStatic);`
`61`	`61`	`}`
`62`	`62`	`goto handle_value;`
`63`		`- } elseif (!\is_object($value) && !$value instanceof \__PHP_Incomplete_Class \|\| $value instanceof \UnitEnum) {`
	`63`	`+ } elseif (!\is_object($value) \|\| $value instanceof \UnitEnum) {`
`64`	`64`	`goto handle_value;`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static function export($value, bool &$isStaticValue = null, array &$found`
`44`	`44`	`{`
`45`	`45`	`$isStaticValue = true;`
`46`	`46`
`47`		`- if (!\is_object($value) && !(\is_array($value) && $value) && !$value instanceof \__PHP_Incomplete_Class && !\is_resource($value) \|\| $value instanceof \UnitEnum) {`
	`47`	`+ if (!\is_ 4972 object($value) && !(\is_array($value) && $value) && !\is_resource($value) \|\| $value instanceof \UnitEnum) {`
`48`	`48`	`return Exporter::export($value);`
`49`	`49`	`}`
`50`	`50`