Skip to content

Commit 6b8960c

Browse files
Merge branch '4.4'
* 4.4: cs fix Fix inconsistent return points. [Config] Add handling for ignored keys in ArrayNode::mergeValues. Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null cs fix cs fix Fix missing exporter in PHPUnit constraint poylfill added `Process::getLastOutputTime()` method [Router] Fix TraceableUrlMatcher behaviour with trailing slash [HttpKernel] Remove outdated docblock comment Fix handling for session parameters Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"
2 parents 79d396b + 9b55875 commit 6b8960c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

User/UserInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function getRoles();
5252
* This should be the encoded password. On authentication, a plain-text
5353
* password will be salted, encoded, and then compared to this value.
5454
*
55-
* @return string The password
55+
* @return string|null The encoded password if any
5656
*/
5757
public function getPassword();
5858

0 commit comments

Comments
 (0)