Skip to content

Commit a6fdb60

Browse files
Merge branch '4.1'
* 4.1: (21 commits) [php_cs] disable fopen_flags [DI] fix error in dumped container [CS] Remove unused variables passed to closures [DI] fix dumping setters before their inlined instances [CS] Remove empty comment [CS] Enforces null type hint on last position in phpDocs [CS] Use combined assignment operators when possible Fix a typo in error messages Don't return early as this bypasses the auto exit feature [Console] Add missing null to input values allowed types [PHPUnitBridge] Fix microtime() format bumped Symfony version to 4.1.6 updated VERSION for 4.1.5 updated CHANGELOG for 4.1.5 bumped Symfony version to 3.4.17 updated VERSION for 3.4.16 updated CHANGELOG for 3.4.16 bumped Symfony version to 2.8.47 update CONTRIBUTORS for 2.8.46 updated VERSION for 2.8.46 ...
2 parents 31298c9 + 9c3c94d commit a6fdb60

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

User/LdapUserProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ protected function loadUser($username, Entry $entry)
134134
/**
135135
* Fetches a required unique attribute value from an LDAP entry.
136136
*
137-
* @param null|Entry $entry
137+
* @param Entry|null $entry
138138
* @param string $attribute
139139
*/
140140
private function getAttributeValue(Entry $entry, $attribute)

0 commit comments

Comments
 (0)