[VarExporter] Add support of PHP 8.1 enumerations

alexandre-daubois · alexandre-daubois · commit 78e24412d4fb · 2021-04-30T17:31:25.000+02:00
diff --git a/src/Symfony/Component/VarExporter/CHANGELOG.md b/src/Symfony/Component/VarExporter/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.3.0
+-----
+
+ * Add support of PHP 8.1 enumerations
+
 5.1.0
 -----
 
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) {
+            } elseif (!\is_object($value) && !$value instanceof \__PHP_Incomplete_Class || $value instanceof \UnitEnum) {
                 goto handle_value;
             }
 
@@ -188,7 +188,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
     public static function export($value, string $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,3 @@
+<?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
@@ -17,6 +17,7 @@
 use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
 use Symfony\Component\VarExporter\Internal\Registry;
 use Symfony\Component\VarExporter\VarExporter;
+use Symfony\Component\VarExporter\Tests\Fixtures\FooUnitEnum;
 
 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
@@ -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)) {
+        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
`@@ -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) {`
	`63`	`+ } elseif (!\is_object($value) && !$value instanceof \__PHP_Incomplete_Class \|\| $value instanceof \UnitEnum) {`
`64`	`64`	`goto handle_value;`
`65`	`65`	`}`
`66`	`66`
`@@ -188,7 +188,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount`
`188`	`188`	`public static function export($value, string $indent = '')`
`189`	`189`	`{`
`190`	`190`	`switch (true) {`
`191`		`- case \is_int($value) \|\| \is_float($value): return var_export($value, true);`
	`191`	`+ case \is_int($value) \|\| \is_float($value) \|\| $value instanceof \UnitEnum : return var_export($value, true);`
`192`	`192`	`case [] === $value: return '[]';`
`193`	`193`	`case false === $value: return 'false';`
`194`	`194`	`case true === $value: return 'true';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+return Symfony\Component\VarExporter\Tests\Fixtures\FooUnitEnum::Bar;`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;`
`18`	`18`	`use Symfony\Component\VarExporter\Internal\Registry;`
`19`	`19`	`use Symfony\Component\VarExporter\VarExporter;`
	`20`	`+use Symfony\Component\VarExporter\Tests\Fixtures\FooUnitEnum;`
`20`	`21`
`21`	`22`	`class VarExporterTest extends TestCase`
`22`	`23`	`{`
`@@ -209,6 +210,10 @@ public function provideExport()`
`209`	`210`	`yield ['private-constructor', PrivateConstructor::create('bar')];`
`210`	`211`
`211`	`212`	`yield ['php74-serializable', new Php74Serializable()];`
	`213`	`+`
	`214`	`+ if (\PHP_VERSION_ID >= 80100) {`
	`215`	`+ yield ['unit-enum', FooUnitEnum::Bar, true];`
	`216`	`+ }`
`212`	`217`	`}`
`213`	`218`	`}`
`214`	`219`
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)) {`
	`47`	`+ if (!\is_object($value) && !(\is_array($value) && $value) && !$value instanceof \__PHP_Incomplete_Class && !\is_resource($value) \|\| $value instanceof \UnitEnum) {`
`48`	`48`	`return Exporter::export($value);`
`49`	`49`	`}`
`50`	`50`