Remove Serializable implementations

symfony · nicolas-grekas · May 27, 2021 · May 19, 2021 · May 27, 2021 · 33969158d0758f517a743a2b48211ab6b89e2bea
commit 33969158d0758f517a743a2b48211ab6b89e2bea
@@ -15,7 +15,7 @@
 * This class is a hand written simplified version of PHP native `ArrayObject`
 * class, to show that it behaves differently than the PHP native implementation.
 */
-class CustomArrayObject implements \ArrayAccess, \IteratorAggregate, \Countable, \Serializable
+class CustomArrayObject implements \ArrayAccess, \IteratorAggregate, \Countable
 {
    private $array;

@@ -63,18 +63,8 @@ public function __serialize(): array
        return $this->array;
    }

-    public function serialize(): string
-    {
-        return serialize($this->__serialize());
-    }
-
    public function __unserialize(array $data): void
    {
        $this->array = $data;
    }
-
-    public function unserialize($serialized)
-    {
-        $this->__unserialize((array) unserialize((string) $serialized));
-    }
 }
diff --git a/src/Symfony/Component/Mime/CHANGELOG.md b/src/Symfony/Component/Mime/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---

 * Remove `Address::fromString()`, use `Address::create()` instead
+ * Remove `Serializable` interface from `RawMessage`

 5.2.0
 -----

diff --git a/src/Symfony/Component/Mime/RawMessage.php b/src/Symfony/Component/Mime/RawMessage.php
@@ -16,7 +16,7 @@
 /**
 * @author Fabien Potencier <fabien@symfony.com>
 */
-class RawMessage implements \Serializable
+class RawMessage
 {
    private $message;

@@ -60,22 +60,6 @@ public function ensureValidity()
    {
    }

-    /**
-     * @internal
-     */
-    final public function serialize(): string
-    {
-        return serialize($this->__serialize());
-    }
-
-    /**
-     * @internal
-     */
-    final public function unserialize($serialized)
-    {
-        $this->__unserialize(unserialize($serialized));
-    }
-
    public function __serialize(): array
    {
        return [$this->toString()];

diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/NonTraversableArrayObject.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/NonTraversableArrayObject.php
@@ -15,7 +15,7 @@
 * This class is a hand written simplified version of PHP native `ArrayObject`
 * class, to show that it behaves differently than the PHP native implementation.
 */
-class NonTraversableArrayObject implements \ArrayAccess, \Countable, \Serializable
+class NonTraversableArrayObject implements \ArrayAccess, \Countable
 {
    private $array;

@@ -58,18 +58,8 @@ public function __serialize(): array
        return $this->array;
    }

-    public function serialize(): string
-    {
-        return serialize($this->__serialize());
-    }
-
    public function __unserialize(array $data): void
    {
        $this->array = $data;
    }
-
-    public function unserialize($serialized)
-    {
-        $this->__unserialize((array) unserialize((string) $serialized));
-    }
 }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TraversableArrayObject.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TraversableArrayObject.php
@@ -15,7 +15,7 @@
 * This class is a hand written simplified version of PHP native `ArrayObject`
 * class, to show that it behaves differently than the PHP native implementation.
 */
-class TraversableArrayObject implements \ArrayAccess, \IteratorAggregate, \Countable, \Serializable
+class TraversableArrayObject implements \ArrayAccess, \IteratorAggregate, \Countable
 {
    private $array;

@@ -63,18 +63,8 @@ public function __serialize(): array
        return $this->array;
    }

-    public function serialize(): string
-    {
-        return serialize($this->__serialize());
-    }
-
    public function __unserialize(array $data): void
    {
        $this->array = $data;
    }
-
-    public function unserialize($serialized)
-    {
-        $this->__unserialize((array) unserialize((string) $serialized));
-    }
 }
diff --git a/src/Symfony/Component/Routing/CompiledRoute.php b/src/Symfony/Component/Routing/CompiledRoute.php
@@ -68,7 +68,7 @@ public function __serialize(): array
     */
    final public function serialize(): string
    {
-        return serialize($this->__serialize());
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
    }

    public function __unserialize(array $data): void

diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
@@ -82,7 +82,7 @@ public function __serialize(): array
     */
    final public function serialize(): string
    {
-        return serialize($this->__serialize());
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
    }

    public function __unserialize(array $data): void

diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -299,7 +299,7 @@ public function testSerializeWhenCompiledWithClass()
     */
    public function testSerializedRepresentationKeepsWorking()
    {
-        $serialized = 'C:31:"Symfony\Component\Routing\Route":936:{a:8:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:8:"compiled";C:39:"Symfony\Component\Routing\CompiledRoute":571:{a:8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:31:"{^/prefix(?:/(?P<foo>\d+))?$}sD";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:40:"{^(?P<locale>[^\.]++)\.example\.net$}sDi";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}}}';
+        $serialized = 'O:31:"Symfony\Component\Routing\Route":9:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:9:"condition";s:0:"";s:8:"compiled";O:39:"Symfony\Component\Routing\CompiledRoute":8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:31:"{^/prefix(?:/(?P<foo>\d+))?$}sD";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:40:"{^(?P<locale>[^\.]++)\.example\.net$}sDi";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}';
        $unserialized = unserialize($serialized);

        $route = new Route('/prefix/{foo}', ['foo' => 'default'], ['foo' => '\d+']);

@@ -21,7 +21,7 @@
 * @author Fabien Potencier <fabien@symfony.com>
 * @author Johannes M. Schmitt <schmittjoh@gmail.com>
 */
-abstract class AbstractToken implements TokenInterface
+abstract class AbstractToken implements TokenInterface, \Serializable
 {
    private $user;
    private $roleNames = [];
@@ -264,7 +264,7 @@ public function __toString()
     */
    final public function serialize(): string
    {
-        return serialize($this->__serialize());
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
    }

    /**

@@ -100,25 +100,4 @@ public function __serialize(): array
    public function __unserialize(array $data): void
    {
    }
-
-    /**
-     * @return string
-     *
-     * @internal in 5.3
-     * @final in 5.3
-     */
-    public function serialize()
-    {
-        return '';
-    }
-
-    /**
-     * @return void
-     *
-     * @internal in 5.3
-     * @final in 5.3
-     */
-    public function unserialize($serialized)
-    {
-    }
 }
@@ -21,7 +21,7 @@
 * @author Fabien Potencier <fabien@symfony.com>
 * @author Johannes M. Schmitt <schmittjoh@gmail.com>
 */
-interface TokenInterface extends \Serializable
+interface TokenInterface
 {
    /**
     * Returns a string representation of the Token.

@@ -1,6 +1,11 @@
 CHANGELOG
 =========

+6.0
+---
+
+ * `TokenInterface` does not extend `Serializable` anymore
+
 5.3
 ---


@@ -232,7 +232,7 @@ public function __toString(): string
    }
 }

-class SerializableUser implements UserInterface, \Serializable
+class SerializableUser implements UserInterface
 {
    private $roles;
    private $name;
@@ -275,16 +275,6 @@ public function getSalt()
    {
        return null;
    }
-
-    public function serialize(): string
-    {
-        return serialize($this->name);
-    }
-
-    public function unserialize($serialized): void
-    {
-        $this->name = unserialize($serialized);
-    }
 }

 class ConcreteToken extends AbstractToken

@@ -94,7 +94,7 @@ public function testSerializeNullImpersonateUrl()
    /**
     * Tests if an old version of SwitchUserToken can still be unserialized.
     *
-     * The fixture was generated by running the following code with Symfony 4.4 and PHP 7.2.
+     * The fixture was generated by running the following code with Symfony 4.4 and PHP 8.0.
     *
     * serialize(
     *     new SwitchUserToken(

diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/CustomArrayObject.php b/src/Symfony/Component/Validator/Tests/Fixtures/CustomArrayObject.php
@@ -15,7 +15,7 @@
 * This class is a hand written simplified version of PHP native `ArrayObject`
 * class, to show that it behaves differently than the PHP native implementation.
 */
-class CustomArrayObject implements \ArrayAccess, \IteratorAggregate, \Countable, \Serializable
+class CustomArrayObject implements \ArrayAccess, \IteratorAggregate, \Countable
 {
    private $array;

@@ -63,18 +63,8 @@ public function __serialize(): array
        return $this->array;
    }

-    public function serialize(): string
-    {
-        return serialize($this->__serialize());
-    }
-
    public function __unserialize(array $data): void
    {
        $this->array = $data;
    }
-
-    public function unserialize($serialized)
-    {
-        $this->__unserialize((array) unserialize((string) $serialized));
-    }
 }