Skip to content

Commit 8dad9f1

Browse files
Merge branch '4.4'
* 4.4: (27 commits) [Validator] add notice in UPGRADE file for new Range constraint option [CssSelector] Support *:only-of-type pseudo class selector [Intl] Update the ICU data to 65.1 (4.4 branch) [Intl] Update the ICU data to 65.1 (4.3 branch) Replace deprecated calls in tests [Intl] Update the ICU data to 65.1 Delete 5_Security_issue.md [DI] Whitelist error_renderer.renderer tag in UnusedTagsPass [DI] Whitelist validator.auto_mapper in UnusedTagsPass Update CHANGELOG.md [HttpClient] Fixed #33832 NO_PROXY option ignored in NativeHttpClient::request() method [EventDispatcher] A compiler pass for aliased userland events. [Cache] give 100ms before starting the expiration countdown [Cache] fix logger usage in CacheTrait::doGet() [VarDumper] fix dumping uninitialized SplFileInfo Added missing translations. [Form] Added CountryType option for using alpha3 country codes Fixed invalid changelog 4.0.0 for VarDumper [Workflow] Fixed BC break on WorkflowInterface Fix wrong expression language value ...
2 parents eb59785 + 49e8706 commit 8dad9f1

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Adapter/ExtLdap/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function offsetUnset($offset)
118118
unset($this->entries[$offset]);
119119
}
120120

121-
private function getSingleEntry($con, $current)
121+
private function getSingleEntry($con, $current): Entry
122122
{
123123
$attributes = ldap_get_attributes($con, $current);
124124

@@ -137,7 +137,7 @@ private function getSingleEntry($con, $current)
137137
return new Entry($dn, $attributes);
138138
}
139139

140-
private function cleanupAttributes(array $entry)
140+
private function cleanupAttributes(array $entry): array
141141
{
142142
$attributes = array_diff_key($entry, array_flip(range(0, $entry['count'] - 1)) + [
143143
'count' => null,

Adapter/ExtLdap/EntryManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function applyOperations(string $dn, iterable $operations): void
156156
}
157157
}
158158

159-
private function parseRdnFromEntry(Entry $entry)
159+
private function parseRdnFromEntry(Entry $entry): string
160160
{
161161
if (!preg_match('/^([^,]+),/', $entry->getDn(), $matches)) {
162162
throw new LdapException(sprintf('Entry "%s" malformed, could not parse RDN.', $entry->getDn()));

Security/LdapUser.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public function getPassword(): ?string
6767
*/
6868
public function getSalt(): ?string
6969
{
70+
return null;
7071
}
7172

7273
/**

0 commit comments

Comments
 (0)