bug #41072 [VarExporter] Add support of PHP enumerations (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit e51e651c4acf · 2021-05-06T21:18:04.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [VarExporter] Add support of PHP enumerations | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #40237 | License | MIT | Doc PR | _none_ Commits ------- 4b0f299 [VarExporter] Add support of PHP enumerations
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -62,7 +62,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) {
+            } elseif (!\is_object($value) && !$value instanceof \__PHP_Incomplete_Class || $value instanceof \UnitEnum) {
                 goto handle_value;
             }
 
@@ -190,7 +190,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
     public static function export($value, $indent = '')
     {
         switch (true) {
-            case \is_int($value) || \is_float($value): return var_export($value, true);
+            case \is_int($value) || \is_float($value) || $value instanceof \UnitEnum: return var_export($value, true);
             case [] === $value: return '[]';
             case false === $value: return 'false';
             case true === $value: return 'true';
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/FooUnitEnum.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/FooUnitEnum.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\VarExporter\Tests\Fixtures;
+
+enum FooUnitEnum
+{
+    case Bar;
+}
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/unit-enum.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/unit-enum.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    Symfony\Component\VarExporter\Tests\Fixtures\FooUnitEnum::Bar,
+];
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\VarExporter\Exception\ClassNotFoundException;
 use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
 use Symfony\Component\VarExporter\Internal\Registry;
+use Symfony\Component\VarExporter\Tests\Fixtures\FooUnitEnum;
 use Symfony\Component\VarExporter\VarExporter;
 
 class VarExporterTest extends TestCase
@@ -209,6 +210,10 @@ public function provideExport()
         yield ['private-constructor', PrivateConstructor::create('bar')];
 
         yield ['php74-serializable', new Php74Serializable()];
+
+        if (\PHP_VERSION_ID >= 80100) {
+            yield ['unit-enum', [FooUnitEnum::Bar], true];
+        }
     }
 }
 
diff --git a/src/Symfony/Component/VarExporter/VarExporter.php b/src/Symfony/Component/VarExporter/VarExporter.php
@@ -43,7 +43,7 @@ public static function export($value, bool &$isStaticValue = null): string
     {
         $isStaticValue = true;
 
-        if (!\is_object($value) && !(\is_array($value) && $value) && !$value instanceof \__PHP_Incomplete_Class && !\is_resource($value)) {
+        if (!\is_object($value) && !(\is_array($value) && $value) && !$value instanceof \__PHP_Incomplete_Class && !\is_resource($value) || $value instanceof \UnitEnum) {
             return Exporter::export($value);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount`
`62`	`62`	`$value = self::prepare($value, $objectsPool, $refsPool, $objectsCount, $valueIsStatic);`
`63`	`63`	`}`
`64`	`64`	`goto handle_value;`
`65`		`- } elseif (!\is_object($value) && !$value instanceof \__PHP_Incomplete_Class) {`
	`65`	`+ } elseif (!\is_object($value) && !$value instanceof \__PHP_Incomplete_Class \|\| $value instanceof \UnitEnum) {`
`66`	`66`	`goto handle_value;`
`67`	`67`	`}`
`68`	`68`
`@@ -190,7 +190,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount`
`190`	`190`	`public static function export($value, $indent = '')`
`191`	`191`	`{`
`192`	`192`	`switch (true) {`
`193`		`- case \is_int($value) \|\| \is_float($value): return var_export($value, true);`
	`193`	`+ case \is_int($value) \|\| \is_float($value) \|\| $value instanceof \UnitEnum: return var_export($value, true);`
`194`	`194`	`case [] === $value: return '[]';`
`195`	`195`	`case false === $value: return 'false';`
`196`	`196`	`case true === $value: return 'true';`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<?php
++
 +return [
 +    Symfony\Component\VarExporter\Tests\Fixtures\FooUnitEnum::Bar,
 +];
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static function export($value, bool &$isStaticValue = null): string`
`43`	`43`	`{`
`44`	`44`	`$isStaticValue = true;`
`45`	`45`
`46`		`- if (!\is_object($value) && !(\is_array($value) && $value) && !$value instanceof \__PHP_Incomplete_Class && !\is_resource($value)) {`
	`46`	`+ if (!\is_object($value) && !(\is_array($value) && $value) && !$value instanceof \__PHP_Incomplete_Class && !\is_resource($value) \|\| $value instanceof \UnitEnum) {`
`47`	`47`	`return Exporter::export($value);`
`48`	`48`	`}`
`49`	`49`