Merge branch '5.1' into 5.x

symfony · Nov 5, 2020 · ed0de5b · ed0de5b
2 parents 41a8114 + fa15b95
commit ed0de5b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/Authentication/Token/Storage/TokenStorageInterface.php b/Authentication/Token/Storage/TokenStorageInterface.php
@@ -30,7 +30,7 @@ public function getToken();
     /**
      * Sets the authentication token.
      *
-     * @param TokenInterface $token A TokenInterface token, or null if no further authentication information should be stored
+     * @param TokenInterface|null $token A TokenInterface token, or null if no further authentication information should be stored
      */
     public function setToken(TokenInterface $token = null);
 }
diff --git a/Resources/translations/security.pt_PT.xlf → Resources/translations/security.pt.xlf b/Resources/translations/security.pt_PT.xlf → Resources/translations/security.pt.xlf