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

Author: nicolas-grekas

Caster/Caster.php

@@ -47,7 +47,7 @@ class Caster
      *
      * @param bool $hasDebugInfo Whether the __debugInfo method exists on $obj or not
      */
-    public static function castObject(object $obj, string $class, bool $hasDebugInfo = false, string $debugClass = null): array
+    public static function castObject(object $obj, string $class, bool $hasDebugInfo = false, ?string $debugClass = null): array
     {
         if ($hasDebugInfo) {
             try {

Caster/ClassStub.php

@@ -24,7 +24,7 @@ class ClassStub extends ConstStub
      * @param string   $identifier A PHP identifier, e.g. a class, method, interface, etc. name
      * @param callable $callable   The callable targeted by the identifier when it is ambiguous or not a real PHP identifier
      */
-    public function __construct(string $identifier, callable|array|string $callable = null)
+    public function __construct(string $identifier, callable|array|string|null $callable = null)
     {
         $this->value = $identifier;
 

Caster/ConstStub.php

@@ -20,7 +20,7 @@
  */
 class ConstStub extends Stub
 {
-    public function __construct(string $name, string|int|float $value = null)
+    public function __construct(string $name, string|int|float|null $value = null)
     {
         $this->class = $name;
         $this->value = 1 < \func_num_args() ? $value : $name;

Caster/FFICaster.php

@@ -97,7 +97,7 @@ private static function castFFIFunction(Stub $stub, CType $type): array
         return [Caster::PREFIX_VIRTUAL.'returnType' => $returnType];
     }
 
-    private static function castFFIPointer(Stub $stub, CType $type, CData $data = null): array
+    private static function castFFIPointer(Stub $stub, CType $type, ?CData $data = null): array
     {
         $ptr = $type->getPointerType();
 
@@ -132,7 +132,7 @@ private static function castFFIStringValue(CData $data): string|CutStub
         return $stub;
     }
 
-    private static function castFFIStructLike(CType $type, CData $data = null): array
+    private static function castFFIStructLike(CType $type, ?CData $data = null): array
     {
         $isUnion = ($type->getAttributes() & CType::ATTR_UNION) === CType::ATTR_UNION;
 

Caster/LinkStub.php

@@ -23,7 +23,7 @@ class LinkStub extends ConstStub
     private static array $vendorRoots;
     private static array $composerRoots = [];
 
-    public function __construct(string $label, int $line = 0, string $href = null)
+    public function __construct(string $label, int $line = 0, ?string $href = null)
     {
         $this->value = $label;
 

Caster/TraceStub.php

@@ -25,7 +25,7 @@ class TraceStub extends Stub
     public ?int $sliceLength;
     public int $numberingOffset;
 
-    public function __construct(array $trace, bool $keepArgs = true, int $sliceOffset = 0, int $sliceLength = null, int $numberingOffset = 0)
+    public function __construct(array $trace, bool $keepArgs = true, int $sliceOffset = 0, ?int $sliceLength = null, int $numberingOffset = 0)
     {
         $this->value = $trace;
         $this->keepArgs = $keepArgs;

Cloner/AbstractCloner.php

@@ -219,7 +219,7 @@ abstract class AbstractCloner implements ClonerInterface
      *
      * @see addCasters
      */
-    public function __construct(array $casters = null)
+    public function __construct(?array $casters = null)
     {
         $this->addCasters($casters ?? static::$defaultCasters);
     }

Dumper/AbstractDumper.php

@@ -45,7 +45,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
      * @param string|null                   $charset The default character encoding to use for non-UTF8 strings
      * @param int                           $flags   A bit field of static::DUMP_* constants to fine tune dumps representation
      */
-    public function __construct($output = null, string $charset = null, int $flags = 0)
+    public function __construct($output = null, ?string $charset = null, int $flags = 0)
     {
         $this->flags = $flags;
         $this->setCharset($charset ?: \ini_get('php.output_encoding') ?: \ini_get('default_charset') ?: 'UTF-8');

Dumper/CliDumper.php

@@ -63,7 +63,7 @@ class CliDumper extends AbstractDumper
 
     private bool $handlesHrefGracefully;
 
-    public function __construct($output = null, string $charset = null, int $flags = 0)
+    public function __construct($output = null, ?string $charset = null, int $flags = 0)
     {
         parent::__construct($output, $charset, $flags);
 

Dumper/ContextProvider/SourceContextProvider.php

@@ -30,7 +30,7 @@ final class SourceContextProvider implements ContextProviderInterface
     private ?string $projectDir;
     private ?FileLinkFormatter $fileLinkFormatter;
 
-    public function __construct(string $charset = null, string $projectDir = null, FileLinkFormatter $fileLinkFormatter = null, int $limit = 9)
+    public function __construct(?string $charset = null, ?string $projectDir = null, ?FileLinkFormatter $fileLinkFormatter = null, int $limit = 9)
     {
         $this->charset = $charset;
         $this->projectDir = $projectDir;