Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit d49b4f6dc469 · 2024-01-23T15:51:35.000+01:00
* 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
diff --git a/CoverageListener.php b/CoverageListener.php
@@ -26,7 +26,7 @@ class CoverageListener implements TestListener
     private $sutFqcnResolver;
     private $warningOnSutNotFound;
 
-    public function __construct(callable $sutFqcnResolver = null, bool $warningOnSutNotFound = false)
+    public function __construct(?callable $sutFqcnResolver = null, bool $warningOnSutNotFound = false)
     {
         $this->sutFqcnResolver = $sutFqcnResolver ?? static function (Test $test): ?string {
             $class = \get_class($test);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class CoverageListener implements TestListener`
`26`	`26`	`private $sutFqcnResolver;`
`27`	`27`	`private $warningOnSutNotFound;`
`28`	`28`
`29`		`- public function __construct(callable $sutFqcnResolver = null, bool $warningOnSutNotFound = false)`
	`29`	`+ public function __construct(?callable $sutFqcnResolver = null, bool $warningOnSutNotFound = false)`
`30`	`30`	`{`
`31`	`31`	`$this->sutFqcnResolver = $sutFqcnResolver ?? static function (Test $test): ?string {`
`32`	`32`	`$class = \get_class($test);`