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
symfony · Jan 23, 2024 · 77d508d · 77d508d
1 parent 45e5a24
commit 77d508d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/HtmlSanitizer.php b/HtmlSanitizer.php
@@ -30,7 +30,7 @@ final class HtmlSanitizer implements HtmlSanitizerInterface
      */
     private array $domVisitors = [];
 
-    public function __construct(HtmlSanitizerConfig $config, ParserInterface $parser = null)
+    public function __construct(HtmlSanitizerConfig $config, ?ParserInterface $parser = null)
     {
         $this->config = $config;
         $this->parser = $parser ?? new MastermindsParser();

diff --git a/TextSanitizer/UrlSanitizer.php b/TextSanitizer/UrlSanitizer.php
@@ -29,7 +29,7 @@ final class UrlSanitizer
      *
      * It also transforms the URL to HTTPS if requested.
      */
-    public static function sanitize(?string $input, array $allowedSchemes = null, bool $forceHttps = false, array $allowedHosts = null, bool $allowRelative = false): ?string
+    public static function sanitize(?string $input, ?array $allowedSchemes = null, bool $forceHttps = false, ?array $allowedHosts = null, bool $allowRelative = false): ?string
     {
         if (!$input) {
             return null;