Merge branch '6.0' into 6.1

* 6.0: Fix integration test gha Update RedisTrait.php Use static methods inside data providers [VarExporter] Fix exporting classes with __unserialize() but not __serialize() [Validator] Fix IBAN format for Tunisia and Mauritania [Workflow] Allow spaces in place names so the PUML dump doesn't break
symfony · Dec 22, 2022 · 5d3feff · 5d3feff
2 parents b49350f + d87c15d
commit 5d3feff
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/Internal/Exporter.php b/Internal/Exporter.php
@@ -151,6 +151,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;
@@ -166,6 +167,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/Tests/Fixtures/__unserialize-but-no-__serialize.php b/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/Tests/VarExporterTest.php b/Tests/VarExporterTest.php
@@ -233,6 +233,8 @@ public function provideExport()
 
         yield ['php74-serializable', new Php74Serializable()];
 
+        yield ['__unserialize-but-no-__serialize', new __UnserializeButNo__Serialize()];
+
         yield ['unit-enum', [FooUnitEnum::Bar], true];
         yield ['readonly', new FooReadonly('k', 'v')];
     }
@@ -437,3 +439,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'];
+    }
+}