Upgrade 1-11.38

vendor/symfony/security/Core/Exception/AccessDeniedException.php

@@ -18,7 +18,7 @@ namespace Symfony\Component\Security\Core\Exception;
  */
 class AccessDeniedException extends \RuntimeException
 {
-    private $attributes = array();
+    private $attributes = [];
     private $subject;
 
     public function __construct($message = 'Access Denied.', \Exception $previous = null)

vendor/symfony/security/Core/Exception/AccountStatusException.php

@@ -34,11 +34,6 @@ abstract class AccountStatusException extends AuthenticationException
         return $this->user;
     }
 
-    /**
-     * Set the user.
-     *
-     * @param UserInterface $user
-     */
     public function setUser(UserInterface $user)
     {
         $this->user = $user;
@@ -49,10 +44,9 @@ abstract class AccountStatusException extends AuthenticationException
      */
     public function serialize()
     {
-        return serialize(array(
-            $this->user,
-            parent::serialize(),
-        ));
+        $serialized = [$this->user, parent::serialize(true)];
+
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
@@ -60,7 +54,7 @@ abstract class AccountStatusException extends AuthenticationException
      */
     public function unserialize($str)
     {
-        list($this->user, $parentData) = unserialize($str);
+        list($this->user, $parentData) = \is_array($str) ? $str : unserialize($str);
 
         parent::unserialize($parentData);
     }

vendor/symfony/security/Core/Exception/AuthenticationException.php

@@ -26,32 +26,45 @@ class AuthenticationException extends \RuntimeException implements \Serializable
     /**
      * Get the token.
      *
-     * @return TokenInterface
+     * @return TokenInterface|null
      */
     public function getToken()
     {
         return $this->token;
     }
 
-    /**
-     * Set the token.
-     *
-     * @param TokenInterface $token
-     */
     public function setToken(TokenInterface $token)
     {
         $this->token = $token;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function serialize()
     {
-        return serialize(array(
+        $serialized = [
             $this->token,
             $this->code,
             $this->message,
             $this->file,
             $this->line,
-        ));
+        ];
+
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
+    }
+
+    /**
+     * @internal
+     */
+    protected function doSerialize($serialized, $isCalledFromOverridingMethod)
+    {
+        if (null === $isCalledFromOverridingMethod) {
+            $trace = debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT, 3);
+            $isCalledFromOverridingMethod = isset($trace[2]['function'], $trace[2]['object']) && 'serialize' === $trace[2]['function'] && $this === $trace[2]['object'];
+        }
+
+        return $isCalledFromOverridingMethod ? $serialized : serialize($serialized);
     }
 
     public function unserialize($str)
@@ -62,7 +75,7 @@ class AuthenticationException extends \RuntimeException implements \Serializable
             $this->message,
             $this->file,
             $this->line
-        ) = unserialize($str);
+        ) = \is_array($str) ? $str : unserialize($str);
     }
 
     /**
@@ -82,6 +95,6 @@ class AuthenticationException extends \RuntimeException implements \Serializable
      */
     public function getMessageData()
     {
-        return array();
+        return [];
     }
 }

vendor/symfony/security/Core/Exception/AuthenticationExpiredException.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Security\Core\Exception;
 
 /**
- * AuthenticationServiceException is thrown when an authenticated token becomes un-authenticated between requests.
+ * AuthenticationExpiredException is thrown when an authenticated token becomes un-authenticated between requests.
  *
  * In practice, this is due to the User changing between requests (e.g. password changes),
  * causes the token to become un-authenticated.

vendor/symfony/security/Core/Exception/CustomUserMessageAuthenticationException.php

@@ -24,9 +24,9 @@ class CustomUserMessageAuthenticationException extends AuthenticationException
 {
     private $messageKey;
 
-    private $messageData = array();
+    private $messageData = [];
 
-    public function __construct($message = '', array $messageData = array(), $code = 0, \Exception $previous = null)
+    public function __construct($message = '', array $messageData = [], $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
@@ -39,7 +39,7 @@ class CustomUserMessageAuthenticationException extends AuthenticationException
      * @param string $messageKey  The message or message key
      * @param array  $messageData Data to be passed into the translator
      */
-    public function setSafeMessage($messageKey, array $messageData = array())
+    public function setSafeMessage($messageKey, array $messageData = [])
     {
         $this->messageKey = $messageKey;
         $this->messageData = $messageData;
@@ -60,11 +60,9 @@ class CustomUserMessageAuthenticationException extends AuthenticationException
      */
     public function serialize()
     {
-        return serialize(array(
-            parent::serialize(),
-            $this->messageKey,
-            $this->messageData,
-        ));
+        $serialized = [parent::serialize(true), $this->messageKey, $this->messageData];
+
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
@@ -72,7 +70,7 @@ class CustomUserMessageAuthenticationException extends AuthenticationException
      */
     public function unserialize($str)
     {
-        list($parentData, $this->messageKey, $this->messageData) = unserialize($str);
+        list($parentData, $this->messageKey, $this->messageData) = \is_array($str) ? $str : unserialize($str);
 
         parent::unserialize($parentData);
     }

vendor/symfony/security/Core/Exception/NonceExpiredException.php

@@ -11,12 +11,16 @@
 
 namespace Symfony\Component\Security\Core\Exception;
 
+@trigger_error(sprintf('The %s class and the whole HTTP digest authentication system is deprecated since Symfony 3.4 and will be removed in 4.0.', NonceExpiredException::class), \E_USER_DEPRECATED);
+
 /**
  * NonceExpiredException is thrown when an authentication is rejected because
  * the digest nonce has expired.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Alexander <iam.asm89@gmail.com>
+ *
+ * @deprecated since 3.4, to be removed in 4.0
  */
 class NonceExpiredException extends AuthenticationException
 {

vendor/symfony/security/Core/Exception/UsernameNotFoundException.php

@@ -54,10 +54,9 @@ class UsernameNotFoundException extends AuthenticationException
      */
     public function serialize()
     {
-        return serialize(array(
-            $this->username,
-            parent::serialize(),
-        ));
+        $serialized = [$this->username, parent::serialize(true)];
+
+        return $this->doSerialize($serialized, \func_num_args() ? func_get_arg(0) : null);
     }
 
     /**
@@ -65,7 +64,7 @@ class UsernameNotFoundException extends AuthenticationException
      */
     public function unserialize($str)
     {
-        list($this->username, $parentData) = unserialize($str);
+        list($this->username, $parentData) = \is_array($str) ? $str : unserialize($str);
 
         parent::unserialize($parentData);
     }
@@ -75,6 +74,6 @@ class UsernameNotFoundException extends AuthenticationException
      */
     public function getMessageData()
     {
-        return array('{{ username }}' => $this->username);
+        return ['{{ username }}' => $this->username];
     }
 }