[VarExporter] Fix exporting classes with __serialize() but not __unserialize()

fancyweb · fancyweb · commit fc514143617a · 2023-07-18T19:24:22.000+02:00
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -83,6 +83,15 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                     throw new \TypeError($class.'::__serialize() must return an array');
                 }
 
+                if (!$reflector->hasMethod('__unserialize')) {
+                    $serializeProperties = $properties;
+                    $properties = [];
+                    foreach ($serializeProperties as $n => $v) {
+                        $c = \PHP_VERSION_ID >= 80100 && $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
+                        $properties[$c][$n] = $v;
+                    }
+                }
+
                 goto prepare_value;
             }
 
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/__serialize-but-no-__unserialize.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/__serialize-but-no-__unserialize.php
@@ -0,0 +1,17 @@
+<?php
+
+return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
+    $o = [
+        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\__SerializeButNo__Unserialize'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\__SerializeButNo__Unserialize')),
+    ],
+    null,
+    [
+        'stdClass' => [
+            'foo' => [
+                'ccc',
+            ],
+        ],
+    ],
+    $o[0],
+    []
+);
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -247,6 +247,8 @@ public static function provideExport()
 
         yield ['__unserialize-but-no-__serialize', new __UnserializeButNo__Serialize()];
 
+        yield ['__serialize-but-no-__unserialize', new __SerializeButNo__Unserialize()];
+
         if (\PHP_VERSION_ID < 80100) {
             return;
         }
@@ -470,3 +472,20 @@ public function __unserialize(array $data): void
         $this->foo = $data['foo'];
     }
 }
+
+class __SerializeButNo__Unserialize
+{
+    public $foo;
+
+    public function __construct()
+    {
+        $this->foo = 'ccc';
+    }
+
+    public function __serialize(): array
+    {
+        return [
+            'foo' => $this->foo,
+        ];
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,15 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount`
`83`	`83`	`throw new \TypeError($class.'::__serialize() must return an array');`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ if (!$reflector->hasMethod('__unserialize')) {`
	`87`	`+ $serializeProperties = $properties;`
	`88`	`+ $properties = [];`
	`89`	`+ foreach ($serializeProperties as $n => $v) {`
	`90`	`+ $c = \PHP_VERSION_ID >= 80100 && $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';`
	`91`	`+ $properties[$c][$n] = $v;`
	`92`	`+ }`
	`93`	`+ }`
	`94`	`+`
`86`	`95`	`goto prepare_value;`
`87`	`96`	`}`
`88`	`97`