Merge branch '6.4' into 7.3

nicolas-grekas · nicolas-grekas · commit 0f020b544a30 · 2025-09-11T12:12:26.000+02:00
* 6.4:
  Replace __sleep/wakeup() by __(un)serialize() for throwing and internal usages
diff --git a/Tests/Fixtures/GoodNight.php b/Tests/Fixtures/GoodNight.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Tests\Fixtures;
+
+class GoodNight
+{
+    public $good;
+    protected $foo;
+    private $bar;
+
+    public function __construct()
+    {
+        unset($this->good);
+        $this->foo = 'afternoon';
+        $this->bar = 'morning';
+    }
+
+    public function __sleep(): array
+    {
+        $this->good = 'night';
+
+        return ['good', 'foo', "\0*\0foo", "\0".__CLASS__."\0bar"];
+    }
+}
diff --git a/Tests/Fixtures/LazyGhost/MagicClass.php b/Tests/Fixtures/LazyGhost/MagicClass.php
@@ -27,7 +27,7 @@ public function __get($name)
         return $this->data[$name] ?? null;
     }
 
-    public function __set($name, $value)
+    public function __set($name, $value): void
     {
         $this->data[$name] = $value;
     }
@@ -37,7 +37,7 @@ public function __isset($name): bool
         return isset($this->data[$name]);
     }
 
-    public function __unset($name)
+    public function __unset($name): void
     {
         unset($this->data[$name]);
     }
diff --git a/Tests/Fixtures/LazyProxy/TestWakeupClass.php b/Tests/Fixtures/LazyProxy/TestWakeupClass.php
@@ -13,7 +13,7 @@
 
 class TestWakeupClass extends TestClass
 {
-    public function __wakeup()
+    public function __wakeup(): void
     {
         $this->dep->wokeUp = true;
     }
diff --git a/Tests/Fixtures/MyWakeup.php b/Tests/Fixtures/MyWakeup.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Tests\Fixtures;
+
+class MyWakeup
+{
+    public $sub;
+    public $bis;
+    public $baz;
+    public $def = 234;
+
+    public function __sleep(): array
+    {
+        return ['sub', 'baz'];
+    }
+
+    public function __wakeup(): void
+    {
+        if (123 === $this->sub) {
+            $this->bis = 123;
+            $this->baz = 123;
+        }
+    }
+}
diff --git a/Tests/Fixtures/Php74Serializable.php b/Tests/Fixtures/Php74Serializable.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Tests\Fixtures;
+
+class Php74Serializable implements \Serializable
+{
+    public $foo;
+
+    public function __serialize(): array
+    {
+        return [$this->foo = new \stdClass()];
+    }
+
+    public function __unserialize(array $data): void
+    {
+        [$this->foo] = $data;
+    }
+
+    public function __sleep(): array
+    {
+        throw new \BadMethodCallException();
+    }
+
+    public function __wakeup(): void
+    {
+        throw new \BadMethodCallException();
+    }
+
+    public function serialize(): string
+    {
+        throw new \BadMethodCallException();
+    }
+
+    public function unserialize($ser)
+    {
+        throw new \BadMethodCallException();
+    }
+}
diff --git a/Tests/Fixtures/php74-serializable.php b/Tests/Fixtures/php74-serializable.php
@@ -2,7 +2,7 @@
 
 return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
     $o = [
-        clone (($p = &\Symfony\Component\VarExporter\Internal\Registry::$prototypes)['Symfony\\Component\\VarExporter\\Tests\\Php74Serializable'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\Php74Serializable')),
+        clone (($p = &\Symfony\Component\VarExporter\Internal\Registry::$prototypes)['Symfony\\Component\\VarExporter\\Tests\\Fixtures\\Php74Serializable'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\Fixtures\\Php74Serializable')),
         clone ($p['stdClass'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('stdClass')),
     ],
     null,
diff --git a/Tests/Fixtures/var-on-sleep.php b/Tests/Fixtures/var-on-sleep.php
@@ -2,7 +2,7 @@
 
 return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
     $o = [
-        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\GoodNight'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\GoodNight')),
+        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\Fixtures\\GoodNight'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\Fixtures\\GoodNight')),
     ],
     null,
     [
@@ -11,7 +11,7 @@
                 'night',
             ],
         ],
-        'Symfony\\Component\\VarExporter\\Tests\\GoodNight' => [
+        'Symfony\\Component\\VarExporter\\Tests\\Fixtures\\GoodNight' => [
             'foo' => [
                 'afternoon',
             ],
diff --git a/Tests/Fixtures/wakeup-refl.php b/Tests/Fixtures/wakeup-refl.php
@@ -2,7 +2,7 @@
 
 return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
     $o = [
-        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\MyWakeup'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\MyWakeup')),
+        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\Fixtures\\MyWakeup'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\Fixtures\\MyWakeup')),
     ],
     null,
     [],
diff --git a/Tests/Fixtures/wakeup.php b/Tests/Fixtures/wakeup.php
@@ -2,8 +2,8 @@
 
 return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
     $o = [
-        clone (($p = &\Symfony\Component\VarExporter\Internal\Registry::$prototypes)['Symfony\\Component\\VarExporter\\Tests\\MyWakeup'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\MyWakeup')),
-        clone $p['Symfony\\Component\\VarExporter\\Tests\\MyWakeup'],
+        clone (($p = &\Symfony\Component\VarExporter\Internal\Registry::$prototypes)['Symfony\\Component\\VarExporter\\Tests\\Fixtures\\MyWakeup'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\Fixtures\\MyWakeup')),
+        clone $p['Symfony\\Component\\VarExporter\\Tests\\Fixtures\\MyWakeup'],
     ],
     null,
     [
diff --git a/Tests/LazyProxyTraitTest.php b/Tests/LazyProxyTraitTest.php
@@ -31,6 +31,26 @@
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\TestWakeupClass;
 use Symfony\Component\VarExporter\Tests\Fixtures\SimpleObject;
 
+$errorHandler = set_error_handler(static function (int $errno, string $errstr) use (&$errorHandler) {
+    if (\E_DEPRECATED === $errno && str_contains($errstr, 'serialize()')) {
+        // We're testing if the component handles deprecated Serializable and __sleep/wakeup implementations well.
+        // This kind of implementation triggers a deprecation warning that we explicitly want to ignore here.
+        return true;
+    }
+
+    return $errorHandler ? $errorHandler(...\func_get_args()) : false;
+});
+
+try {
+    foreach ([
+        TestWakeupClass::class,
+    ] as $class) {
+        class_exists($class);
+    }
+} finally {
+    restore_error_handler();
+}
+
 /**
  * @requires PHP 8.4
  */
diff --git a/Tests/LegacyLazyGhostTraitTest.php b/Tests/LegacyLazyGhostTraitTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\VarExporter\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Serializer\Mapping\AttributeMetadata;
+use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
@@ -29,6 +31,28 @@
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\HookedWithDefaultValue;
 use Symfony\Component\VarExporter\Tests\Fixtures\SimpleObject;
 
+$errorHandler = set_error_handler(static function (int $errno, string $errstr) use (&$errorHandler) {
+    if (\E_DEPRECATED === $errno && str_contains($errstr, 'serialize()')) {
+        // We're testing if the component handles deprecated Serializable and __sleep/wakeup implementations well.
+        // This kind of implementation triggers a deprecation warning that we explicitly want to ignore here.
+        return true;
+    }
+
+    return $errorHandler ? $errorHandler(...\func_get_args()) : false;
+});
+
+try {
+    foreach ([
+        MagicClass::class,
+        ClassMetadata::class,
+        AttributeMetadata::class,
+    ] as $class) {
+        class_exists($class);
+    }
+} finally {
+    restore_error_handler();
+}
+
 /**
  * @group legacy
  */
diff --git a/Tests/VarExporterTest.php b/Tests/VarExporterTest.php

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function __get($name)`
`27`	`27`	`return $this->data[$name] ?? null;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function __set($name, $value)`
	`30`	`+ public function __set($name, $value): void`
`31`	`31`	`{`
`32`	`32`	`$this->data[$name] = $value;`
`33`	`33`	`}`
`@@ -37,7 +37,7 @@ public function __isset($name): bool`
`37`	`37`	`return isset($this->data[$name]);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function __unset($name)`
	`40`	`+ public function __unset($name): void`
`41`	`41`	`{`
`42`	`42`	`unset($this->data[$name]);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`class TestWakeupClass extends TestClass`
`15`	`15`	`{`
`16`		`- public function __wakeup()`
	`16`	`+ public function __wakeup(): void`
`17`	`17`	`{`
`18`	`18`	`$this->dep->wokeUp = true;`
`19`	`19`	`}`