bug #48724 [VarExporter] Fix exporting classes with __unserialize() but not __serialize() (fancyweb)

nicolas-grekas · nicolas-grekas · commit 2aedd16d90c8 · 2022-12-22T11:10:43.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [VarExporter] Fix exporting classes with __unserialize() but not __serialize() | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #48706 indirectly | License | MIT | Doc PR | - This is an edge case not supported yet, highlighted by our own symfony/expression-language GetAttrNode class. Commits ------- 6ccb85e [VarExporter] Fix exporting classes with __unserialize() but not __serialize()
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -149,6 +149,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                 }
                 if (null !== $sleep) {
                     if (!isset($sleep[$n]) || ($i && $c !== $class)) {
+                        unset($arrayValue[$name]);
                         continue;
                     }
                     $sleep[$n] = false;
@@ -164,6 +165,9 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                     }
                 }
             }
+            if (method_exists($class, '__unserialize')) {
+                $properties = $arrayValue;
+            }
 
             prepare_value:
             $objectsPool[$value] = [$id = \count($objectsPool)];
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/__unserialize-but-no-__serialize.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/__unserialize-but-no-__serialize.php
@@ -0,0 +1,15 @@
+<?php
+
+return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
+    $o = [
+        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\__UnserializeButNo__Serialize'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\__UnserializeButNo__Serialize')),
+    ],
+    null,
+    [],
+    $o[0],
+    [
+        [
+            'foo' => 'ccc',
+        ],
+    ]
+);
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -245,6 +245,8 @@ public function provideExport()
 
         yield ['php74-serializable', new Php74Serializable()];
 
+        yield ['__unserialize-but-no-__serialize', new __UnserializeButNo__Serialize()];
+
         if (\PHP_VERSION_ID < 80100) {
             return;
         }
@@ -453,3 +455,18 @@ public function unserialize($ser)
 class ArrayObject extends \ArrayObject
 {
 }
+
+class __UnserializeButNo__Serialize
+{
+    public $foo;
+
+    public function __construct()
+    {
+        $this->foo = 'ccc';
+    }
+
+    public function __unserialize(array $data): void
+    {
+        $this->foo = $data['foo'];
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount`
`149`	`149`	`}`
`150`	`150`	`if (null !== $sleep) {`
`151`	`151`	`if (!isset($sleep[$n]) \|\| ($i && $c !== $class)) {`
	`152`	`+ unset($arrayValue[$name]);`
`152`	`153`	`continue;`
`153`	`154`	`}`
`154`	`155`	`$sleep[$n] = false;`
`@@ -164,6 +165,9 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount`
`164`	`165`	`}`
`165`	`166`	`}`
`166`	`167`	`}`
	`168`	`+ if (method_exists($class, '__unserialize')) {`
	`169`	`+ $properties = $arrayValue;`
	`170`	`+ }`
`167`	`171`
`168`	`172`	`prepare_value:`
`169`	`173`	`$objectsPool[$value] = [$id = \count($objectsPool)];`