Skip to content

Commit 1c268ba

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Make more nullable types explicit Add more explicit nullable types for default null values
2 parents d085b6b + 304e555 commit 1c268ba

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Fixtures/NonTraversableArrayObject.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class NonTraversableArrayObject implements \ArrayAccess, \Countable
1919
{
2020
private $array;
2121

22-
public function __construct(array $array = null)
22+
public function __construct(?array $array = null)
2323
{
2424
$this->array = $array ?: [];
2525
}

Tests/Fixtures/TraversableArrayObject.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class TraversableArrayObject implements \ArrayAccess, \IteratorAggregate, \Count
1919
{
2020
private $array;
2121

22-
public function __construct(array $array = null)
22+
public function __construct(?array $array = null)
2323
{
2424
$this->array = $array ?: [];
2525
}

0 commit comments

Comments
 (0)