Skip to content

Commit d1962d0

Browse files
Merge branch '6.3' into 6.4
* 6.3: minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench) Fix bad merge List CS fix in .git-blame-ignore-revs 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
2 parents d82bf7c + 09eb813 commit d1962d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+59
-59
lines changed

AccessMap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class AccessMap implements AccessMapInterface
3030
*
3131
* @return void
3232
*/
33-
public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], string $channel = null)
33+
public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], ?string $channel = null)
3434
{
3535
$this->map[] = [$requestMatcher, $attributes, $channel];
3636
}

Authentication/AuthenticatorManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class AuthenticatorManager implements AuthenticatorManagerInterface, UserAuthent
5858
/**
5959
* @param iterable<mixed, AuthenticatorInterface> $authenticators
6060
*/
61-
public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true, array $requiredBadges = [])
61+
public function __construct(iterable $authenticators, TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher, string $firewallName, ?LoggerInterface $logger = null, bool $eraseCredentials = true, bool $hideUserNotFoundExceptions = true, array $requiredBadges = [])
6262
{
6363
$this->authenticators = $authenticators;
6464
$this->tokenStorage = $tokenStorage;

Authentication/DefaultAuthenticationFailureHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle
4343
'failure_path_parameter' => '_failure_path',
4444
];
4545

46-
public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = [], LoggerInterface $logger = null)
46+
public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = [], ?LoggerInterface $logger = null)
4747
{
4848
$this->httpKernel = $httpKernel;
4949
$this->httpUtils = $httpUtils;

Authentication/DefaultAuthenticationSuccessHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
4545
/**
4646
* @param array $options Options for processing a successful authentication attempt
4747
*/
48-
public function __construct(HttpUtils $httpUtils, array $options = [], LoggerInterface $logger = null)
48+
public function __construct(HttpUtils $httpUtils, array $options = [], ?LoggerInterface $logger = null)
4949
{
5050
$this->httpUtils = $httpUtils;
5151
$this->logger = $logger;

Authenticator/AbstractLoginFormAuthenticator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
6060
* Override to control what happens when the user hits a secure page
6161
* but isn't logged in yet.
6262
*/
63-
public function start(Request $request, AuthenticationException $authException = null): Response
63+
public function start(Request $request, ?AuthenticationException $authException = null): Response
6464
{
6565
$url = $this->getLoginUrl($request);
6666

Authenticator/AbstractPreAuthenticatedAuthenticator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ abstract class AbstractPreAuthenticatedAuthenticator implements InteractiveAuthe
4141
private string $firewallName;
4242
private ?LoggerInterface $logger;
4343

44-
public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, LoggerInterface $logger = null)
44+
public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, ?LoggerInterface $logger = null)
4545
{
4646
$this->userProvider = $userProvider;
4747
$this->tokenStorage = $tokenStorage;

Authenticator/AccessTokenAuthenticator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function setTranslator(?TranslatorInterface $translator)
106106
/**
107107
* @see https://datatracker.ietf.org/doc/html/rfc6750#section-3
108108
*/
109-
private function getAuthenticateHeader(string $errorDescription = null): string
109+
private function getAuthenticateHeader(?string $errorDescription = null): string
110110
{
111111
$data = [
112112
'realm' => $this->realm,

Authenticator/Debug/TraceableAuthenticator.php

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

95-
public function start(Request $request, AuthenticationException $authException = null): Response
95+
public function start(Request $request, ?AuthenticationException $authException = null): Response
9696
{
9797
if (!$this->authenticator instanceof AuthenticationEntryPointInterface) {
9898
throw new NotAnEntryPointException();

Authenticator/FormLoginAuthenticator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function setHttpKernel(HttpKernelInterface $httpKernel): void
143143
$this->httpKernel = $httpKernel;
144144
}
145145

146-
public function start(Request $request, AuthenticationException $authException = null): Response
146+
public function start(Request $request, ?AuthenticationException $authException = null): Response
147147
{
148148
if (!$this->options['use_forward']) {
149149
return parent::start($request, $authException);

Authenticator/HttpBasicAuthenticator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ class HttpBasicAuthenticator implements AuthenticatorInterface, AuthenticationEn
3737
private UserProviderInterface $userProvider;
3838
private ?LoggerInterface $logger;
3939

40-
public function __construct(string $realmName, UserProviderInterface $userProvider, LoggerInterface $logger = null)
40+
public function __construct(string $realmName, UserProviderInterface $userProvider, ?LoggerInterface $logger = null)
4141
{
4242
$this->realmName = $realmName;
4343
$this->userProvider = $userProvider;
4444
$this->logger = $logger;
4545
}
4646

47-
public function start(Request $request, AuthenticationException $authException = null): Response
47+
public function start(Request $request, ?AuthenticationException $authException = null): Response
4848
{
4949
$response = new Response();
5050
$response->headers->set('WWW-Authenticate', sprintf('Basic realm="%s"', $this->realmName));

0 commit comments

Comments
 (0)