From 23d8fc761bf5099465dfb8ffe4541c47ae12fcb3 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 13 Jun 2019 16:28:46 +0200 Subject: [PATCH] fix merge --- .../Authentication/Token/AbstractToken.php | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index 2834abc7f0..5e92fa4900 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -143,25 +143,6 @@ abstract class AbstractToken implements TokenInterface return [$this->user, $this->authenticated, null, $this->attributes, $this->roleNames]; } - /** - * {@inheritdoc} - * - * @final since Symfony 4.3, use __serialize() instead - * - * @internal since Symfony 4.3, use __serialize() instead - */ - public function serialize() - { - $serialized = $this->__serialize(); - - if (null === $isCalledFromOverridingMethod = \func_num_args() ? func_get_arg(0) : null) { - $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 2); - $isCalledFromOverridingMethod = isset($trace[1]['function'], $trace[1]['object']) && 'serialize' === $trace[1]['function'] && $this === $trace[1]['object']; - } - - return $isCalledFromOverridingMethod ? $serialized : serialize($serialized); - } - /** * Restores the object state from an array given by __serialize(). *