Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 7e132a3fcd4b · 2022-04-26T06:19:20.000-07:00
* 4.4:
  [VarDumper] Fix dumping floats on PHP8
  Fix dumping enums on PHP 8.2
  [Cache] Prevent fatal errors on php 8 when running concurrently with TagAwareAdapter v6.1
diff --git a/Internal/Exporter.php b/Internal/Exporter.php
@@ -193,12 +193,13 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
     public static function export($value, string $indent = '')
     {
         switch (true) {
-            case \is_int($value) || \is_float($value) || $value instanceof \UnitEnum: return var_export($value, true);
+            case \is_int($value) || \is_float($value): return var_export($value, true);
             case [] === $value: return '[]';
             case false === $value: return 'false';
             case true === $value: return 'true';
             case null === $value: return 'null';
             case '' === $value: return "''";
+            case $value instanceof \UnitEnum: return ltrim(var_export($value, true), '\\');
         }
 
         if ($value instanceof Reference) {

Original file line number	Diff line number	Diff line change
`@@ -193,12 +193,13 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount`
`193`	`193`	`public static function export($value, string $indent = '')`
`194`	`194`	`{`
`195`	`195`	`switch (true) {`
`196`		`- case \is_int($value) \|\| \is_float($value) \|\| $value instanceof \UnitEnum: return var_export($value, true);`
	`196`	`+ case \is_int($value) \|\| \is_float($value): return var_export($value, true);`
`197`	`197`	`case [] === $value: return '[]';`
`198`	`198`	`case false === $value: return 'false';`
`199`	`199`	`case true === $value: return 'true';`
`200`	`200`	`case null === $value: return 'null';`
`201`	`201`	`case '' === $value: return "''";`
	`202`	`+ case $value instanceof \UnitEnum: return ltrim(var_export($value, true), '\\');`
`202`	`203`	`}`
`203`	`204`
`204`	`205`	`if ($value instanceof Reference) {`