Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit 9fbfc4cf063a · 2019-06-03T22:27:17.000+02:00
* 3.4: fix type hint for salt in PasswordEncoderInterface fix typo in PR #31802 update italian validator translation Add missing translations
diff --git a/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
@@ -48,8 +48,8 @@ protected function demergePasswordAndSalt($mergedPasswordSalt)
     /**
      * Merges a password and a salt.
      *
-     * @param string $password The password to be used
-     * @param string $salt     The salt to be used
+     * @param string      $password The password to be used
+     * @param string|null $salt     The salt to be used
      *
      * @return string a merged password and salt
      *
diff --git a/src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php b/src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php
@@ -23,8 +23,8 @@ interface PasswordEncoderInterface
     /**
      * Encodes the raw password.
      *
-     * @param string $raw  The password to encode
-     * @param string $salt The salt
+     * @param string      $raw  The password to encode
+     * @param string|null $salt The salt
      *
      * @return string The encoded password
      *
@@ -36,9 +36,9 @@ public function encodePassword($raw, $salt);
     /**
      * Checks a raw password against an encoded password.
      *
-     * @param string $encoded An encoded password
-     * @param string $raw     A raw password
-     * @param string $salt    The salt
+     * @param string      $encoded An encoded password
+     * @param string      $raw     A raw password
+     * @param string|null $salt    The salt
      *
      * @return bool true if the password is valid, false otherwise
      *
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf
@@ -334,6 +334,34 @@
                 <source>This value should be valid JSON.</source>
                 <target>Ova vrijednost treba biti validan JSON.</target>
             </trans-unit>
+            <trans-unit id="87">
+                <source>This collection should contain only unique elements.</source>
+                <target>Ova kolekcija treba sadržavati samo unikatne elemente.</target>
+            </trans-unit>
+            <trans-unit id="88">
+                <source>This value should be positive.</source>
+                <target>Ova vrijednost treba biti pozitivna.</target>
+            </trans-unit>
+            <trans-unit id="89">
+                <source>This value should be either positive or zero.</source>
+                <target>Ova vrijednost treba biti pozitivna ili jednaka nuli.</target>
+            </trans-unit>
+            <trans-unit id="90">
+                <source>This value should be negative.</source>
+                <target>Ova vrijednost treba biti negativna.</target>
+            </trans-unit>
+            <trans-unit id="91">
+                <source>This value should be either negative or zero.</source>
+                <target>Ova vrijednost treba biti negativna ili jednaka nuli.</target>
+            </trans-unit>
+            <trans-unit id="92">
+                <source>This value is not a valid timezone.</source>
+                <target>Ova vrijednost nije validna vremenska zona.</target>
+            </trans-unit>
+            <trans-unit id="93">
+                <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
+                <target>Ova lozinka je procurila u nekom od sigurnosnih propusta, te je potrebno koristiti drugu lozinku.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf
@@ -330,6 +330,38 @@
                 <source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
                 <target>Questo codice identificativo bancario (BIC) non è associato all'IBAN {{ iban }}.</target>
             </trans-unit>
+            <trans-unit id="86">
+                <source>This value should be valid JSON.</source>
+                <target>Questo valore dovrebbe essere un JSON valido.</target>
+            </trans-unit>
+            <trans-unit id="87">
+                <source>This collection should contain only unique elements.</source>
+                <target>Questa collezione dovrebbe contenere solo elementi unici.</target>
+            </trans-unit>
+            <trans-unit id="88">
+                <source>This value should be positive.</source>
+                <target>Questo valore dovrebbe essere positivo.</target>
+            </trans-unit>
+            <trans-unit id="89">
+                <source>This value should be either positive or zero.</source>
+                <target>Questo valore dovrebbe essere positivo oppure zero.</target>
+            </trans-unit>
+            <trans-unit id="90">
+                <source>This value should be negative.</source>
+                <target>Questo valore dovrebbe essere negativo.</target>
+            </trans-unit>
+            <trans-unit id="91">
+                <source>This value should be either negative or zero.</source>
+                <target>Questo valore dovrebbe essere negativo oppure zero.</target>
+            </trans-unit>
+            <trans-unit id="92">
+                <source>This value is not a valid timezone.</source>
+                <target>Questo valore non è un fuso orario valido.</target>
+            </trans-unit>
+            <trans-unit id="93">
+                <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
+                <target>Questa password è trapelata durante una compromissione di dati, non deve essere usata. Si prega di usare una password diversa.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ protected function demergePasswordAndSalt($mergedPasswordSalt)`
`48`	`48`	`/**`
`49`	`49`	`* Merges a password and a salt.`
`50`	`50`	`*`
`51`		`- * @param string $password The password to be used`
`52`		`- * @param string $salt The salt to be used`
	`51`	`+ * @param string $password The password to be used`
	`52`	`+ * @param string\|null $salt The salt to be used`
`53`	`53`	`*`
`54`	`54`	`* @return string a merged password and salt`
`55`	`55`	`*`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ interface PasswordEncoderInterface`
`23`	`23`	`/**`
`24`	`24`	`* Encodes the raw password.`
`25`	`25`	`*`
`26`		`- * @param string $raw The password to encode`
`27`		`- * @param string $salt The salt`
	`26`	`+ * @param string $raw The password to encode`
	`27`	`+ * @param string\|null $salt The salt`
`28`	`28`	`*`
`29`	`29`	`* @return string The encoded password`
`30`	`30`	`*`
`@@ -36,9 +36,9 @@ public function encodePassword($raw, $salt);`
`36`	`36`	`/**`
`37`	`37`	`* Checks a raw password against an encoded password.`
`38`	`38`	`*`
`39`		`- * @param string $encoded An encoded password`
`40`		`- * @param string $raw A raw password`
`41`		`- * @param string $salt The salt`
	`39`	`+ * @param string $encoded An encoded password`
	`40`	`+ * @param string $raw A raw password`
	`41`	`+ * @param string\|null $salt The salt`
`42`	`42`	`*`
`43`	`43`	`* @return bool true if the password is valid, false otherwise`
`44`	`44`	`*`