merged branch apfelbox/patch-1 (PR #8982)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8982).

Discussion
----------

Fixed docblock in UserInterface::getSalt()

This method can return null, too.
See the line above:

> "This can return null if the password was not encoded using a salt."

Commits
-------

3c7b557 Fixed docblock in UserInterface::getSalt()

src/Symfony/Component/Security/Core/User/UserInterface.php

@@ -64,7 +64,7 @@ interface UserInterface
      *
      * This can return null if the password was not encoded using a salt.
      *
-     * @return string The salt
+     * @return string|null The salt
      */
     public function getSalt();