Skip to content

Commit 0a2eeb0

Browse files
Merge branch '6.4' into 7.0
* 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
2 parents 92df075 + d49b4f6 commit 0a2eeb0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CoverageListener.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class CoverageListener implements TestListener
2626
private $sutFqcnResolver;
2727
private $warningOnSutNotFound;
2828

29-
public function __construct(callable $sutFqcnResolver = null, bool $warningOnSutNotFound = false)
29+
public function __construct(?callable $sutFqcnResolver = null, bool $warningOnSutNotFound = false)
3030
{
3131
$this->sutFqcnResolver = $sutFqcnResolver ?? static function (Test $test): ?string {
3232
$class = \get_class($test);

DeprecationErrorHandler/Configuration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class Configuration
7070
* @param string $baselineFile The path to the baseline file
7171
* @param string|null $logFile The path to the log file
7272
*/
73-
private function __construct(array $thresholds = [], string $regex = '', array $verboseOutput = [], string $ignoreFile = '', bool $generateBaseline = false, string $baselineFile = '', string $logFile = null)
73+
private function __construct(array $thresholds = [], string $regex = '', array $verboseOutput = [], string $ignoreFile = '', bool $generateBaseline = false, string $baselineFile = '', ?string $logFile = null)
7474
{
7575
$groups = ['total', 'indirect', 'direct', 'self'];
7676

0 commit comments

Comments
 (0)