Skip to content

Commit 7d0836b

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: [Finder] Fix gitignore regex build with "**" Fixed deprecation warnings about passing null as parameter [Security] Keep Bulgarian wording consistent across all texts. Migrate configuration file for PHP CS Fixer 2.19/3.0 [Form] Replace broken ServerParams mock [Mailer] Fix SES API call with UTF-8 Addresses
2 parents 6fbe27d + c9dd632 commit 7d0836b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Resources/translations/security.bg.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@
7272
</trans-unit>
7373
<trans-unit id="19">
7474
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
75-
<target>Прекалено много неуспешни опити за вход, моля опитайте отново след %minutes% минута.</target>
75+
<target>Твърде много неуспешни опити за вход, моля опитайте отново след %minutes% минута.</target>
7676
</trans-unit>
7777
<trans-unit id="20">
7878
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
79-
<target>Прекалено много неуспешни опити за вход, моля опитайте отново след %minutes% минути.</target>
79+
<target>Твърде много неуспешни опити за вход, моля опитайте отново след %minutes% минути.</target>
8080
</trans-unit>
8181
</body>
8282
</file>

Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public function testBindFailureShouldThrowAnException()
7171
->method('bind')
7272
->willThrowException(new ConnectionException())
7373
;
74+
$ldap->method('escape')->willReturnArgument(0);
7475
$userChecker = $this->createMock(UserCheckerInterface::class);
7576

7677
$provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap);
@@ -208,6 +209,7 @@ public function testEmptyQueryResultShouldThrowAnException()
208209
->method('query')
209210
->willReturn($query)
210211
;
212+
$ldap->method('escape')->willReturnArgument(0);
211213
$userChecker = $this->createMock(UserCheckerInterface::class);
212214

213215
$provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap, '{username}', true, 'elsa', 'test1234A$');

0 commit comments

Comments
 (0)