Merge branch '5.4' into 6.3

* 5.4:
  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

Crypto/SMimeEncrypter.php

@@ -26,7 +26,7 @@ final class SMimeEncrypter extends SMime
      * @param string|string[] $certificate The path (or array of paths) of the file(s) containing the X.509 certificate(s)
      * @param int|null        $cipher      A set of algorithms used to encrypt the message. Must be one of these PHP constants: https://www.php.net/manual/en/openssl.ciphers.php
      */
-    public function __construct(string|array $certificate, int $cipher = null)
+    public function __construct(string|array $certificate, ?int $cipher = null)
     {
         if (!\extension_loaded('openssl')) {
             throw new \LogicException('PHP extension "openssl" is required to use SMime.');

Crypto/SMimeSigner.php

@@ -31,7 +31,7 @@ final class SMimeSigner extends SMime
      * @param string|null $extraCerts           The path of the file containing intermediate certificates (in PEM format) needed by the signing certificate
      * @param int|null    $signOptions          Bitwise operator options for openssl_pkcs7_sign() (@see https://secure.php.net/manual/en/openssl.pkcs7.flags.php)
      */
-    public function __construct(string $certificate, string $privateKey, string $privateKeyPassphrase = null, string $extraCerts = null, int $signOptions = null)
+    public function __construct(string $certificate, string $privateKey, ?string $privateKeyPassphrase = null, ?string $extraCerts = null, ?int $signOptions = null)
     {
         if (!\extension_loaded('openssl')) {
             throw new \LogicException('PHP extension "openssl" is required to use SMime.');

DraftEmail.php

@@ -19,7 +19,7 @@
  */
 class DraftEmail extends Email
 {
-    public function __construct(Headers $headers = null, AbstractPart $body = null)
+    public function __construct(?Headers $headers = null, ?AbstractPart $body = null)
     {
         parent::__construct($headers, $body);
 

Email.php

@@ -329,15 +329,15 @@ public function getHtmlCharset(): ?string
      *
      * @return $this
      */
-    public function attach($body, string $name = null, string $contentType = null): static
+    public function attach($body, ?string $name = null, ?string $contentType = null): static
     {
         return $this->addPart(new DataPart($body, $name, $contentType));
     }
 
     /**
      * @return $this
      */
-    public function attachFromPath(string $path, string $name = null, string $contentType = null): static
+    public function attachFromPath(string $path, ?string $name = null, ?string $contentType = null): static
     {
         return $this->addPart(new DataPart(new File($path), $name, $contentType));
     }
@@ -347,15 +347,15 @@ public function attachFromPath(string $path, string $name = null, string $conten
      *
      * @return $this
      */
-    public function embed($body, string $name = null, string $contentType = null): static
+    public function embed($body, ?string $name = null, ?string $contentType = null): static
     {
         return $this->addPart((new DataPart($body, $name, $contentType))->asInline());
     }
 
     /**
      * @return $this
      */
-    public function embedFromPath(string $path, string $name = null, string $contentType = null): static
+    public function embedFromPath(string $path, ?string $name = null, ?string $contentType = null): static
     {
         return $this->addPart((new DataPart(new File($path), $name, $contentType))->asInline());
     }

FileinfoMimeTypeGuesser.php

@@ -28,7 +28,7 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
      *
      * @see http://www.php.net/manual/en/function.finfo-open.php
      */
-    public function __construct(string $magicFile = null)
+    public function __construct(?string $magicFile = null)
     {
         $this->magicFile = $magicFile;
     }

Header/AbstractHeader.php

@@ -237,7 +237,7 @@ protected function generateTokenLines(string $token): array
     /**
      * Generate a list of all tokens in the final header.
      */
-    protected function toTokens(string $string = null): array
+    protected function toTokens(?string $string = null): array
     {
         $string ??= $this->getBodyAsString();
 

Header/Headers.php

@@ -188,7 +188,7 @@ public function get(string $name): ?HeaderInterface
         return array_shift($values);
     }
 
-    public function all(string $name = null): iterable
+    public function all(?string $name = null): iterable
     {
         if (null === $name) {
             foreach ($this->headers as $name => $collection) {

Header/ParameterizedHeader.php

@@ -85,7 +85,7 @@ public function getBodyAsString(): string
      * This doesn't need to be overridden in theory, but it is for implementation
      * reasons to prevent potential breakage of attributes.
      */
-    protected function toTokens(string $string = null): array
+    protected function toTokens(?string $string = null): array
     {
         $tokens = parent::toTokens(parent::getBodyAsString());
 

Message.php

@@ -24,7 +24,7 @@ class Message extends RawMessage
     private Headers $headers;
     private ?AbstractPart $body;
 
-    public function __construct(Headers $headers = null, AbstractPart $body = null)
+    public function __construct(?Headers $headers = null, ?AbstractPart $body = null)
     {
         $this->headers = $headers ? clone $headers : new Headers();
         $this->body = $body;
@@ -42,7 +42,7 @@ public function __clone()
     /**
      * @return $this
      */
-    public function setBody(AbstractPart $body = null): static
+    public function setBody(?AbstractPart $body = null): static
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/mime', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);

Part/DataPart.php

@@ -29,7 +29,7 @@ class DataPart extends TextPart
     /**
      * @param resource|string|File $body Use a File instance to defer loading the file until rendering
      */
-    public function __construct($body, string $filename = null, string $contentType = null, string $encoding = null)
+    public function __construct($body, ?string $filename = null, ?string $contentType = null, ?string $encoding = null)
     {
         unset($this->_parent);
 
@@ -49,7 +49,7 @@ public function __construct($body, string $filename = null, string $contentType
         $this->setDisposition('attachment');
     }
 
-    public static function fromPath(string $path, string $name = null, string $contentType = null): self
+    public static function fromPath(string $path, ?string $name = null, ?string $contentType = null): self
     {
         return new self(new File($path), $name, $contentType);
     }

Part/TextPart.php

@@ -42,7 +42,7 @@ class TextPart extends AbstractPart
     /**
      * @param resource|string|File $body Use a File instance to defer loading the file until rendering
      */
-    public function __construct($body, ?string $charset = 'utf-8', string $subtype = 'plain', string $encoding = null)
+    public function __construct($body, ?string $charset = 'utf-8', string $subtype = 'plain', ?string $encoding = null)
     {
         unset($this->_headers);
 

Test/Constraint/EmailAttachmentCount.php

@@ -20,7 +20,7 @@ final class EmailAttachmentCount extends Constraint
     private int $expectedValue;
     private ?string $transport;
 
-    public function __construct(int $expectedValue, string $transport = null)
+    public function __construct(int $expectedValue, ?string $transport = null)
     {
         $this->expectedValue = $expectedValue;
         $this->transport = $transport;