Skip to content

Commit 84aa853

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Add missing dots at the end of exception messages [DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict) Fix bad merge Add missing dots at the end of exception messages
2 parents 5584c85 + 77e7095 commit 84aa853

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Adapter/ExtLdap/Query.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function execute()
123123
$this->resetPagination();
124124
}
125125

126-
throw new LdapException(sprintf('Could not complete search with dn "%s", query "%s" and filters "%s".%s', $this->dn, $this->query, implode(',', $this->options['filter']), $ldapError));
126+
throw new LdapException(sprintf('Could not complete search with dn "%s", query "%s" and filters "%s".%s.', $this->dn, $this->query, implode(',', $this->options['filter']), $ldapError));
127127
}
128128

129129
$this->results[] = $search;

Ldap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function escape(string $subject, string $ignore = '', int $flags = 0): st
7575
public static function create(string $adapter, array $config = []): self
7676
{
7777
if (!isset(self::$adapterMap[$adapter])) {
78-
throw new DriverNotFoundException(sprintf('Adapter "%s" not found. You should use one of: %s', $adapter, implode(', ', self::$adapterMap)));
78+
throw new DriverNotFoundException(sprintf('Adapter "%s" not found. You should use one of: %s.', $adapter, implode(', ', self::$adapterMap)));
7979
}
8080

8181
$class = self::$adapterMap[$adapter];

Security/LdapUserProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function loadUserByUsername(string $username)
8484
}
8585

8686
if ($count > 1) {
87-
throw new UsernameNotFoundException('More than one user found');
87+
throw new UsernameNotFoundException('More than one user found.');
8888
}
8989

9090
$entry = $entries[0];

0 commit comments

Comments
 (0)