symfony
diff --git a/‎src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -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
      *
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`	`*`