Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit f0f724e599f0 · 2024-01-23T16:02:46.000+01:00
* 6.4:
  Fix implicitly-required parameters
  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
  [Messenger][AmazonSqs] Allow async-aws/sqs version 2
diff --git a/CsrfTokenManager.php b/CsrfTokenManager.php
@@ -37,7 +37,7 @@ class CsrfTokenManager implements CsrfTokenManagerInterface
      *                   * RequestStack: generates a namespace using the current main request
      *                   * callable: uses the result of this callable (must return a string)
      */
-    public function __construct(TokenGeneratorInterface $generator = null, TokenStorageInterface $storage = null, string|RequestStack|callable $namespace = null)
+    public function __construct(?TokenGeneratorInterface $generator = null, ?TokenStorageInterface $storage = null, string|RequestStack|callable|null $namespace = null)
     {
         $this->generator = $generator ?? new UriSafeTokenGenerator();
         $this->storage = $storage ?? new NativeSessionTokenStorage();

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class CsrfTokenManager implements CsrfTokenManagerInterface`
`37`	`37`	`* * RequestStack: generates a namespace using the current main request`
`38`	`38`	`* * callable: uses the result of this callable (must return a string)`
`39`	`39`	`*/`
`40`		`- public function __construct(TokenGeneratorInterface $generator = null, TokenStorageInterface $storage = null, string\|RequestStack\|callable $namespace = null)`
	`40`	`+ public function __construct(?TokenGeneratorInterface $generator = null, ?TokenStorageInterface $storage = null, string\|RequestStack\|callable\|null $namespace = null)`
`41`	`41`	`{`
`42`	`42`	`$this->generator = $generator ?? new UriSafeTokenGenerator();`
`43`	`43`	`$this->storage = $storage ?? new NativeSessionTokenStorage();`