Fix Time\Duration tests for lower PHP versions

Author: nyamsprod

tests/Time/DurationTest.php

@@ -48,10 +48,15 @@ public function testFromSecondsRejectsInvalidSeconds(int $seconds, string $excep
         Duration::fromSeconds($seconds);
     }
 
-    public static function invalidSecondsProvider(): iterable
+    /**
+     * @return array<non-empty-string, array{0: int, 1: class-string<\Throwable>}>
+     */
+    public static function invalidSecondsProvider(): array
     {
-        yield 'negative value' => [-1, \ValueError::class];
-        yield 'too large value' => [9_223_372_036, TimeException::class];
+        return [
+            'negative value' => [-1, \ValueError::class],
+            'too large value' => [9_223_372_036, TimeException::class],
+        ];
     }
 
     /**
@@ -66,10 +71,15 @@ public function testFromSecondsRejectsInvalidNanoseconds(int $nanoseconds, strin
         Duration::fromSeconds(1, $nanoseconds);
     }
 
+    /**
+     * @return array<non-empty-string, array{0: int, 1: class-string<\Throwable>}>
+     */
     public static function invalidNanosecondsProvider(): iterable
     {
-        yield 'negative value' => [-1, \ValueError::class];
-        yield 'too large value' => [1_000_000_000, TimeException::class];
+        return [
+            'negative value' => [-1, \ValueError::class],
+            'too large value' => [1_000_000_000, TimeException::class],
+        ];
     }
 
     public function testFromNanoseconds(): void
@@ -137,17 +147,19 @@ public function testParseIso8601(
     }
 
     /**
-     * @return iterable<array{0: non-empty-string, non-negative-int, non-negative-int, bool}>
+     * @return array<non-empty-string, array{0: non-empty-string, 1: non-negative-int, 2: non-negative-int, 3: bool}>
      */
-    public static function validIso8601Provider(): iterable
+    public static function validIso8601Provider(): array
     {
-        yield ['PT1S', 1, 0, false];
-        yield ['PT1.5S', 1, 500_000_000, false];
-        yield ['PT1,5S', 1, 500_000_000, false];
-        yield ['PT2M30S', 150, 0, false];
-        yield ['PT1H2M3.123456789S', 3723, 123_456_789, false];
-        yield ['-PT5S', 5, 0, true];
-        yield ['-PT0S', 0, 0, false];
+        return [
+            '1 second' => ['PT1S', 1, 0, false],
+            '1.5 seconds (dot)' => ['PT1.5S', 1, 500_000_000, false],
+            '1.5 seconds (comma)' => ['PT1,5S', 1, 500_000_000, false],
+            '2 minutes 30 seconds' => ['PT2M30S', 150, 0, false],
+            'full precision' => ['PT1H2M3.123456789S', 3723, 123_456_789, false],
+            'negative duration' => ['-PT5S', 5, 0, true],
+            'negative zero normalizes to positive' => ['-PT0S', 0, 0, false],
+        ];
     }
 
     /**
@@ -161,15 +173,17 @@ public function testRejectInvalidIso8601(string $spec): void
     }
 
     /**
-     * @return iterable<array{0: non-empty-string}>
+     * @return array<non-empty-string, array{0: non-empty-string}>
      */
-    public static function invalidIso8601Provider(): iterable
+    public static function invalidIso8601Provider(): array
     {
-        yield ['P1D'];
-        yield ['PT'];
-        yield ['P'];
-        yield ['foo'];
-        yield ['PT1Y'];
+        return [
+            'date component only' => ['P1D'],
+            'missing time value' => ['PT'],
+            'empty duration' => ['P'],
+            'not an ISO 8601 duration' => ['foo'],
+            'unsupported year component' => ['PT1Y'],
+        ];
     }
 
     public function testNegatePositiveDuration(): void
@@ -283,8 +297,10 @@ public function testDivideByRejectsInvalidDivisor(int $divisor): void
      */
     public static function invalidDivisorProvider(): iterable
     {
-        yield 'division by zero' => [0];
-        yield 'division with negative factor' => [-1];
+        return [
+            'division by zero' => [0],
+            'division with negative factor' => [-1],
+        ];
     }
 
     public function testCompare(): void
@@ -344,38 +360,26 @@ public function test_it_rejects_invalid_iso8601_durations(string $specification)
     }
 
     /**
-     * @return iterable<non-empty-string, array{0: string}>
+     * @return array<string, array{0: string}>
      */
-    public static function invalidIso8601Durations(): iterable
-    {
-        yield 'empty string' => [''];
-
-        yield 'invalid prefix' => ['1H'];
-
-        yield 'missing time designator' => ['P1H'];
-
-        yield 'missing value' => ['PT'];
-
-        yield 'unsupported years component' => ['P1Y'];
-
-        yield 'unsupported months component' => ['P1M'];
-
-        yield 'unsupported weeks component' => ['P1W'];
-
-        yield 'unsupported days component' => ['P1D'];
-
-        yield 'invalid fraction format' => ['PT1.S'];
-
-        yield 'invalid unit' => ['PT1X'];
-
-        yield 'invalid duplicated seconds' => ['PT1S2S'];
-
-        yield 'invalid duplicated fraction' => ['PT1.5.5S'];
-
-        yield 'hours overflow integer range' => ['PT2562047789H'];
-
-        yield 'combined components overflow integer range' => ['PT2562047788H59M59S'];
-
-        yield 'combined components exceeds integer range' => ['PT2562047788015215H59M59S'];
+    public static function invalidIso8601Durations(): array
+    {
+        return [
+            'empty string' => [''],
+            'invalid prefix' => ['1H'],
+            'missing time designator' => ['P1H'],
+            'missing time value' => ['PT'],
+            'unsupported years component' => ['P1Y'],
+            'unsupported months component' => ['P1M'],
+            'unsupported weeks component' => ['P1W'],
+            'unsupported days component' => ['P1D'],
+            'invalid fractional seconds format' => ['PT1.S'],
+            'unknown time unit' => ['PT1X'],
+            'duplicate seconds component' => ['PT1S2S'],
+            'duplicate fractional seconds' => ['PT1.5.5S'],
+            'hours component overflows integer range' => ['PT2562047789H'],
+            'combined components overflow integer range' => ['PT2562047788H59M59S'],
+            'combined components exceed supported range' => ['PT2562047788015215H59M59S'],
+        ];
     }
 }