Merge branch '3.4' into 4.2

* 3.4:
  Fix typo in translation
  Declare exceptions that are already thrown by implementations

Author: nicolas-grekas

Core/Encoder/PasswordEncoderInterface.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Security\Core\Encoder;
 
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+
 /**
  * PasswordEncoderInterface is the interface for all encoders.
  *
@@ -25,6 +27,9 @@ interface PasswordEncoderInterface
      * @param string $salt The salt
      *
      * @return string The encoded password
+     *
+     * @throws BadCredentialsException   If the raw password is invalid, e.g. excessively long
+     * @throws \InvalidArgumentException If the salt is invalid
      */
     public function encodePassword($raw, $salt);
 
@@ -36,6 +41,8 @@ public function encodePassword($raw, $salt);
      * @param string $salt    The salt
      *
      * @return bool true if the password is valid, false otherwise
+     *
+     * @throws \InvalidArgumentException If the salt is invalid
      */
     public function isPasswordValid($encoded, $raw, $salt);
 }

Core/Resources/translations/security.nb.xlf

@@ -16,7 +16,7 @@
             </trans-unit>
             <trans-unit id="4">
                 <source>Invalid credentials.</source>
-                <target>Ugyldig påloggingsinformasjonen.</target>
+                <target>Ugyldig påloggingsinformasjon.</target>
             </trans-unit>
             <trans-unit id="5">
                 <source>Cookie has already been used by someone else.</source>

Core/Resources/translations/security.no.xlf

@@ -16,7 +16,7 @@
             </trans-unit>
             <trans-unit id="4">
                 <source>Invalid credentials.</source>
-                <target>Ugyldig påloggingsinformasjonen.</target>
+                <target>Ugyldig påloggingsinformasjon.</target>
             </trans-unit>
             <trans-unit id="5">
                 <source>Cookie has already been used by someone else.</source>