[User] Remove deprecated \Serializable interface

Sylius · May 2, 2022 · 8ee908c · 8ee908c
1 parent 50be917
commit 8ee908c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/src/Sylius/Behat/spec/Service/SecurityServiceSpec.php b/src/Sylius/Behat/spec/Service/SecurityServiceSpec.php
@@ -48,7 +48,7 @@ function it_logs_user_in(
     ) {
         $shopUser->getRoles()->willReturn(['ROLE_USER']);
         $shopUser->getPassword()->willReturn('xyz');
-        $shopUser->serialize()->willReturn('serialized_user');
+        $shopUser->__serialize()->willReturn(['serialized_user']);
 
         $session->set('_security_shop', Argument::any())->shouldBeCalled();
         $session->save()->shouldBeCalled();

diff --git a/src/Sylius/Component/User/Model/User.php b/src/Sylius/Component/User/Model/User.php
@@ -394,9 +394,9 @@ public function setEncoderName(?string $encoderName): void
     /**
      * The serialized data have to contain the fields used by the equals method and the username.
      */
-    public function serialize(): string
+    public function __serialize(): array
     {
-        return serialize([
+        return [
             $this->password,
             $this->salt,
             $this->usernameCanonical,
@@ -405,18 +405,22 @@ public function serialize(): string
             $this->enabled,
             $this->id,
             $this->encoderName,
-        ]);
+        ];
     }
 
     /**
-     * @param string $serialized
+     * @internal
      */
-    public function unserialize($serialized): void
+    public function serialize(): string
+    {
+        return serialize($this->__serialize());
+    }
+
+    public function __unserialize(array $serialized): void
     {
-        $data = unserialize($serialized);
         // add a few extra elements in the array to ensure that we have enough keys when unserializing
         // older data which does not include all properties.
-        $data = array_merge($data, array_fill(0, 2, null));
+        $serialized = array_merge($serialized, array_fill(0, 2, null));
 
         [
             $this->password,
@@ -427,7 +431,17 @@ public function unserialize($serialized): void
             $this->enabled,
             $this->id,
             $this->encoderName,
-        ] = $data;
+        ] = $serialized;
+    }
+
+    /**
+     * @param string $serialized
+     *
+     * @internal
+     */
+    public function unserialize($serialized): void
+    {
+        $this->__unserialize(unserialize($serialized));
     }
 
     protected function hasExpired(?\DateTimeInterface $date): bool

diff --git a/src/Sylius/Component/User/Model/UserInterface.php b/src/Sylius/Component/User/Model/UserInterface.php
@@ -111,4 +111,8 @@ public function getOAuthAccount(string $provider): ?UserOAuthInterface;
     public function addOAuthAccount(UserOAuthInterface $oauth): void;
 
     public function setEncoderName(?string $encoderName): void;
+
+    public function __serialize(): array;
+
+    public function __unserialize(array $data): void;
 }