Skip to content

Commit f6cf7ff

Browse files
Merge branch '5.4' into 6.3
* 5.4: Fix implicitly-required parameters List CS fix in .git-blame-ignore-revs Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value [Messenger][AmazonSqs] Allow async-aws/sqs version 2
2 parents 5f1308d + b6ddb17 commit f6cf7ff

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

Adapter/ConnectionInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ public function isBound(): bool;
3434
*
3535
* @return void
3636
*/
37-
public function bind(string $dn = null, #[\SensitiveParameter] string $password = null);
37+
public function bind(?string $dn = null, #[\SensitiveParameter] ?string $password = null);
3838
}

Adapter/ExtLdap/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function isBound(): bool
6666
*
6767
* @return void
6868
*/
69-
public function bind(string $dn = null, #[\SensitiveParameter] string $password = null)
69+
public function bind(?string $dn = null, #[\SensitiveParameter] ?string $password = null)
7070
{
7171
if (!$this->connection) {
7272
$this->connect();

Ldap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct(AdapterInterface $adapter)
2929
$this->adapter = $adapter;
3030
}
3131

32-
public function bind(string $dn = null, #[\SensitiveParameter] string $password = null): void
32+
public function bind(?string $dn = null, #[\SensitiveParameter] ?string $password = null): void
3333
{
3434
$this->adapter->getConnection()->bind($dn, $password);
3535
}

LdapInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ interface LdapInterface
3232
*
3333
* @return void
3434
*/
35-
public function bind(string $dn = null, #[\SensitiveParameter] string $password = null);
35+
public function bind(?string $dn = null, #[\SensitiveParameter] ?string $password = null);
3636

3737
/**
3838
* Queries a ldap server for entries matching the given criteria.

Security/LdapAuthenticator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
8888
return $this->authenticator->onAuthenticationFailure($request, $exception);
8989
}
9090

91-
public function start(Request $request, AuthenticationException $authException = null): Response
91+
public function start(Request $request, ?AuthenticationException $authException = null): Response
9292
{
9393
if (!$this->authenticator instanceof AuthenticationEntryPointInterface) {
9494
throw new NotAnEntryPointException(sprintf('Decorated authenticator "%s" does not implement interface "%s".', get_debug_type($this->authenticator), AuthenticationEntryPointInterface::class));

Security/LdapBadge.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class LdapBadge implements BadgeInterface
3131
private string $searchPassword;
3232
private ?string $queryString;
3333

34-
public function __construct(string $ldapServiceId, string $dnString = '{user_identifier}', string $searchDn = '', string $searchPassword = '', string $queryString = null)
34+
public function __construct(string $ldapServiceId, string $dnString = '{user_identifier}', string $searchDn = '', string $searchPassword = '', ?string $queryString = null)
3535
{
3636
$this->ldapServiceId = $ldapServiceId;
3737
$dnString = str_replace('{username}', '{user_identifier}', $dnString, $replaceCount);

Security/LdapUserProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterfa
4343
private ?string $passwordAttribute;
4444
private array $extraFields;
4545

46-
public function __construct(LdapInterface $ldap, string $baseDn, string $searchDn = null, #[\SensitiveParameter] string $searchPassword = null, array $defaultRoles = [], string $uidKey = null, string $filter = null, string $passwordAttribute = null, array $extraFields = [])
46+
public function __construct(LdapInterface $ldap, string $baseDn, ?string $searchDn = null, #[\SensitiveParameter] ?string $searchPassword = null, array $defaultRoles = [], ?string $uidKey = null, ?string $filter = null, ?string $passwordAttribute = null, array $extraFields = [])
4747
{
4848
$uidKey ??= 'sAMAccountName';
4949
$filter ??= '({uid_key}={user_identifier})';

0 commit comments

Comments
 (0)