Use of null coalesce operator, that comes with PHP7.1

rkrx · rkrx · commit 2294511a7685 · 2023-12-12T10:26:38.000+01:00
diff --git a/src/String/truncate.php b/src/String/truncate.php
@@ -101,7 +101,7 @@ function truncate($string, array $options = [])
                 $newEnd = \end($match[0])[1];
             }
 
-            $result = \substr($result, 0, null === $newEnd ? $end : $newEnd);
+            $result = \substr($result, 0, $newEnd ?? $end);
         }
     } elseif (\strpos($string, $separator) !== $end) {
         $index = \strrpos($result, $separator);
diff --git a/src/internal/castSlice.php b/src/internal/castSlice.php
@@ -25,7 +25,7 @@
 function castSlice(array $array, int $start, ?int $end = null): array
 {
     $length = \count($array);
-    $end = null === $end ? $length : $end;
+    $end = $end ?? $length;
 
     return (!$start && $end >= $length) ? $array : \array_slice($array, $start, $end);
 }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ function truncate($string, array $options = [])`
`101`	`101`	`$newEnd = \end($match[0])[1];`
`102`	`102`	`}`
`103`	`103`
`104`		`- $result = \substr($result, 0, null === $newEnd ? $end : $newEnd);`
	`104`	`+ $result = \substr($result, 0, $newEnd ?? $end);`
`105`	`105`	`}`
`106`	`106`	`} elseif (\strpos($string, $separator) !== $end) {`
`107`	`107`	`$index = \strrpos($result, $separator);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`function castSlice(array $array, int $start, ?int $end = null): array`
`26`	`26`	`{`
`27`	`27`	`$length = \count($array);`
`28`		`- $end = null === $end ? $length : $end;`
	`28`	`+ $end = $end ?? $length;`
`29`	`29`
`30`	`30`	`return (!$start && $end >= $length) ? $array : \array_slice($array, $start, $end);`
`31`	`31`	`}`