Merge branch '5.4' into 6.4

derrabus · derrabus · commit 46df6c840be9 · 2024-03-19T12:56:30.000+01:00
* 5.4:
  Make more nullable types explicit
  Add more explicit nullable types for default null values
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;
     }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class CustomArrayObject implements \ArrayAccess, \IteratorAggregate, \Countable`
`19`	`19`	`{`
`20`	`20`	`private array $array;`
`21`	`21`
`22`		`- public function __construct(array $array = null)`
	`22`	`+ public function __construct(?array $array = null)`
`23`	`23`	`{`
`24`	`24`	`$this->array = $array ?: [];`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(array $translations)`
`22`	`22`	`$this->translations = $translations;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string`
	`25`	`+ public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string`
`26`	`26`	`{`
`27`	`27`	`return $this->translations[$id] ?? $id;`
`28`	`28`	`}`