Merge branch '7.3' into 7.4

* 7.3:
  Replace __sleep/wakeup() by __(un)serialize() for throwing and internal usages
  [TypeInfo] simplify identifier comparison in isIdentifiedBy method

Author: nicolas-grekas

src/Symfony/Component/ErrorHandler/ErrorRenderer/FileLinkFormatter.php

@@ -62,9 +62,6 @@ public function format(string $file, int $line): string|false
         return false;
     }
 
-    /**
-     * @internal
-     */
     public function __serialize(): array
     {
         $this->fileLinkFormat = $this->getFileLinkFormat();

src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php

@@ -197,9 +197,6 @@ public function getData(): array|Data
         return $this->data;
     }
 
-    /**
-     * @internal
-     */
     public function __serialize(): array
     {
         foreach ($this->data['forms_by_hash'] as &$form) {

src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

@@ -143,9 +143,6 @@ public function reset(): void
         $this->clonesIndex = 0;
     }
 
-    /**
-     * @internal
-     */
     public function __serialize(): array
     {
         if (!$this->dataCount) {
@@ -164,9 +161,6 @@ public function __serialize(): array
         return ['data' => $this->data];
     }
 
-    /**
-     * @internal
-     */
     public function __unserialize(array $data): void
     {
         $this->data = array_pop($data) ?? [];

src/Symfony/Component/Mime/Part/MessagePart.php

@@ -59,75 +59,12 @@ public function bodyToIterable(): iterable
 
     public function __serialize(): array
     {
-        if (self::class === (new \ReflectionMethod($this, '__sleep'))->class || self::class !== (new \ReflectionMethod($this, '__serialize'))->class) {
-            return ['message' => $this->message];
-        }
-
-        trigger_deprecation('symfony/mime', '7.4', 'Implementing "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
-
-        $data = [];
-        foreach ($this->__sleep() as $key) {
-            try {
-                if (($r = new \ReflectionProperty($this, $key))->isInitialized($this)) {
-                    $data[$key] = $r->getValue($this);
-                }
-            } catch (\ReflectionException) {
-                $data[$key] = $this->$key;
-            }
-        }
-
-        return $data;
+        return ['message' => $this->message];
     }
 
     public function __unserialize(array $data): void
     {
-        if ($wakeup = self::class !== (new \ReflectionMethod($this, '__wakeup'))->class && self::class === (new \ReflectionMethod($this, '__unserialize'))->class) {
-            trigger_deprecation('symfony/mime', '7.4', 'Implementing "%s::__wakeup()" is deprecated, use "__unserialize()" instead.', get_debug_type($this));
-        }
-
-        if (\in_array(array_keys($data), [['message'], ["\0".self::class."\0message"]], true)) {
-            $this->message = $data['message'] ?? $data["\0".self::class."\0message"];
-
-            if ($wakeup) {
-                $this->__wakeup();
-            } else {
-                $this->__construct($this->message);
-            }
-
-            return;
-        }
-
-        trigger_deprecation('symfony/mime', '7.4', 'Passing more than just key "message" to "%s::__unserialize()" is deprecated, populate properties in "%s::__unserialize()" instead.', self::class, get_debug_type($this));
-
-        \Closure::bind(function ($data) use ($wakeup) {
-            foreach ($data as $key => $value) {
-                $this->{("\0" === $key[0] ?? '') ? substr($key, 1 + strrpos($key, "\0")) : $key} = $value;
-            }
-
-            if ($wakeup) {
-                $this->__wakeup();
-            } else {
-                $this->__construct($this->message);
-            }
-        }, $this, static::class)($data);
-    }
-
-    /**
-     * @deprecated since Symfony 7.4, will be replaced by `__unserialize()` in 8.0
-     */
-    public function __sleep(): array
-    {
-        trigger_deprecation('symfony/mime', '7.4', 'Calling "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
-
-        return ['message'];
-    }
-
-    /**
-     * @deprecated since Symfony 7.4, will be replaced by `__unserialize()` in 8.0
-     */
-    public function __wakeup(): void
-    {
-        trigger_deprecation('symfony/mime', '7.4', 'Calling "%s::__wakeup()" is deprecated, use "__unserialize()" instead.', get_debug_type($this));
+        $this->message = $data['message'] ?? $data["\0".self::class."\0message"];
 
         $this->__construct($this->message);
     }

src/Symfony/Component/TypeInfo/Type/BuiltinType.php

@@ -41,15 +41,7 @@ public function getTypeIdentifier(): TypeIdentifier
     public function isIdentifiedBy(TypeIdentifier|string ...$identifiers): bool
     {
         foreach ($identifiers as $identifier) {
-            if (\is_string($identifier)) {
-                try {
-                    $identifier = TypeIdentifier::from($identifier);
-                } catch (\ValueError) {
-                    continue;
-                }
-            }
-
-            if ($identifier === $this->typeIdentifier) {
+            if ($identifier === $this->typeIdentifier || $identifier === $this->typeIdentifier->value) {
                 return true;
             }
         }

src/Symfony/Component/VarExporter/Tests/Fixtures/GoodNight.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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"];
+    }
+}

src/Symfony/Component/VarExporter/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]);
     }

src/Symfony/Component/VarExporter/Tests/Fixtures/LazyProxy/TestWakeupClass.php

@@ -13,7 +13,7 @@
 
 class TestWakeupClass extends TestClass
 {
-    public function __wakeup()
+    public function __wakeup(): void
     {
         $this->dep->wokeUp = true;
     }

src/Symfony/Component/VarExporter/Tests/Fixtures/MyWakeup.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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;
+        }
+    }
+}

src/Symfony/Component/VarExporter/Tests/Fixtures/Php74Serializable.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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();
+    }
+}