Fix PHP84 nullable types

azjezz · Apr 5, 2024 · 1ade4f1 · 1ade4f1
1 parent a8685b2
commit 1ade4f1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/config/.php_cs.dist.php b/config/.php_cs.dist.php
@@ -76,5 +76,6 @@
         'phpdoc_trim_consecutive_blank_line_separation' => true,
         'no_empty_statement' => true,
         'semicolon_after_instruction' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
     ])
     ;
diff --git a/src/Psl/Vec/range.php b/src/Psl/Vec/range.php
@@ -45,7 +45,7 @@
  *
  * @see https://github.com/vimeo/psalm/issues/2152#issuecomment-533363310
  */
-function range(int|float $start, int|float $end, int|float $step = null): array
+function range(int|float $start, int|float $end, int|float|null $step = null): array
 {
     if ((float) $start === (float) $end) {
         return [$start];

diff --git a/tests/unit/Dict/SliceTest.php b/tests/unit/Dict/SliceTest.php
@@ -12,7 +12,7 @@ final class SliceTest extends TestCase
     /**
      * @dataProvider provideData
      */
-    public function testSlice(array $expected, array $array, int $n, int $l = null): void
+    public function testSlice(array $expected, array $array, int $n, ?int $l = null): void
     {
         $result = Dict\slice($array, $n, $l);
 

diff --git a/tests/unit/Regex/EveryMatchTest.php b/tests/unit/Regex/EveryMatchTest.php
@@ -19,7 +19,7 @@ public function testMatching(
         array $expected,
         string $subject,
         string $pattern,
-        TypeInterface $shape = null,
+        ?TypeInterface $shape = null,
         int $offset = 0
     ): void {
         static::assertSame($expected, Regex\every_match($subject, $pattern, $shape, $offset));

diff --git a/tests/unit/Regex/FirstMatchTest.php b/tests/unit/Regex/FirstMatchTest.php
@@ -19,7 +19,7 @@ public function testMatching(
         array $expected,
         string $subject,
         string $pattern,
-        TypeInterface $shape = null,
+        ?TypeInterface $shape = null,
         int $offset = 0
     ): void {
         static::assertSame($expected, Regex\first_match($subject, $pattern, $shape, $offset));

diff --git a/tests/unit/Vec/SliceTest.php b/tests/unit/Vec/SliceTest.php
@@ -12,7 +12,7 @@ final class SliceTest extends TestCase
     /**
      * @dataProvider provideData
      */
-    public function testSlice(array $expected, array $array, int $n, int $l = null): void
+    public function testSlice(array $expected, array $array, int $n, ?int $l = null): void
     {
         $result = Vec\slice($array, $n, $l);