Merge branch '5.4' into 6.4

* 5.4: Make more nullable types explicit Add more explicit nullable types for default null values
symfony · Mar 19, 2024 · 46df6c8 · 46df6c8
2 parents 8c95956 + a4841ab
commit 46df6c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Tests/Fixtures/CustomArrayObject.php b/Tests/Fixtures/CustomArrayObject.php
@@ -19,7 +19,7 @@ class CustomArrayObject implements \ArrayAccess, \IteratorAggregate, \Countable
 {
     private array $array;
 
-    public function __construct(array $array = null)
+    public function __construct(?array $array = null)
     {
         $this->array = $array ?: [];
     }

diff --git a/Tests/Fixtures/FixedTranslator.php b/Tests/Fixtures/FixedTranslator.php
@@ -22,7 +22,7 @@ public function __construct(array $translations)
         $this->translations = $translations;
     }
 
-    public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string
+    public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string
     {
         return $this->translations[$id] ?? $id;
     }