Simplify out of bound check

Author: vudaltsov

src/TimeSpan.php

@@ -93,41 +93,22 @@ private static function fromX(int|float $value, int $multiplier): self
             return new self($nanoseconds);
         }
 
-        if ($value >= 0) {
-            /** @var non-empty-string */
-            static $max = (string) PHP_INT_MAX;
-            /**
-             * @var non-empty-string
-             * @psalm-suppress UnusedFunctionCall
-             */
-            static $positiveFormat = \sprintf("%%'0%s.0f", \strlen($max));
-
-            $nanoseconds = \sprintf($positiveFormat, round($value * $multiplier));
-
-            if (\strlen($nanoseconds) > \strlen($max) || strcmp($nanoseconds, $max) > 0) {
-                throw new \OutOfBoundsException('The specified time span cannot be expressed as integer nanoseconds due to overflow.');
-            }
-
-            return new self((int) $nanoseconds);
-        }
-
-        /** @var non-empty-string */
-        static $min = (string) PHP_INT_MIN;
-        /**
-         * @var non-empty-string
-         * @psalm-suppress UnusedFunctionCall
-         */
-        static $negativeFormat = \sprintf("%%'0%s.0f", \strlen($min));
+        $nanoseconds = \sprintf('%.0f', round($value * $multiplier));
 
-        $nanoseconds = \sprintf($negativeFormat, round($value * $multiplier));
-
-        if (\strlen($nanoseconds) > \strlen($min) || strcmp($nanoseconds, $min) > 0) {
+        if ($value > 0 && self::compareUnsignedNumericStrings($nanoseconds, (string) PHP_INT_MAX) > 0
+            || $value < 0 && self::compareUnsignedNumericStrings($nanoseconds, (string) PHP_INT_MIN) > 0
+        ) {
             throw new \OutOfBoundsException('The specified time span cannot be expressed as integer nanoseconds due to overflow.');
         }
 
         return new self((int) $nanoseconds);
     }
 
+    private static function compareUnsignedNumericStrings(string $a, string $b): int
+    {
+        return \strlen($a) <=> \strlen($b) ?: strcmp($a, $b);
+    }
+
     public static function fromInterval(\DateInterval $interval): self
     {
         if ($interval->m !== 0 || $interval->y !== 0) {

tests/TimeSpanTest.php

@@ -73,6 +73,10 @@ public function testItThrowsForInvalidFormatWithRepeatingPlaceholder(): void
     /**
      * @param array{days?: float|int, hours?: float|int, minutes?: float|int, seconds?: float|int, milliseconds?: float|int, microseconds?: float|int} $args
      */
+    #[TestWith([
+        [],
+        0,
+    ])]
     #[TestWith([
         ['seconds' => 987, 'milliseconds' => 654, 'microseconds' => 321, 'nanoseconds' => 123],
         987_654_321_123,
@@ -175,6 +179,8 @@ public function testItThrowsForDateTimeInterfaceDiffInterval(): void
         TimeSpan::fromInterval($interval);
     }
 
+    #[TestWith([0, 0])]
+    #[TestWith([0.0, 0])]
     #[TestWith([100, 100])]
     #[TestWith([100.1, 100])]
     #[TestWith([100.5, 101])]
@@ -190,6 +196,8 @@ public function testFromNanoseconds(int|float $nanoseconds, int $expected): void
         self::assertSame($expected, $span->toNanoseconds());
     }
 
+    #[TestWith([0, 0])]
+    #[TestWith([0.0, 0])]
     #[TestWith([100, 100])]
     #[TestWith([100.1, 100])]
     #[TestWith([100.5, 101])]
@@ -201,6 +209,8 @@ public function testFromMicroseconds(int|float $microseconds, int $expected): vo
         self::assertSame($expected, $span->toMicroseconds());
     }
 
+    #[TestWith([0, 0])]
+    #[TestWith([0.0, 0])]
     #[TestWith([100, 100_000])]
     #[TestWith([100.1, 100_100])]
     #[TestWith([100.5, 100_500])]
@@ -212,6 +222,8 @@ public function testFromMilliseconds(int|float $milliseconds, int $expected): vo
         self::assertSame($expected, $span->toMicroseconds());
     }
 
+    #[TestWith([0, 0])]
+    #[TestWith([0.0, 0])]
     #[TestWith([100, 100_000_000])]
     #[TestWith([100.1, 100_100_000])]
     #[TestWith([100.5, 100_500_000])]
@@ -223,6 +235,8 @@ public function testFromSeconds(int|float $seconds, int $expected): void
         self::assertSame($expected, $span->toMicroseconds());
     }
 
+    #[TestWith([0, 0])]
+    #[TestWith([0.0, 0])]
     #[TestWith([100, 6_000_000_000])]
     #[TestWith([100.1, 6_006_000_000])]
     #[TestWith([100.5, 6_030_000_000])]
@@ -234,6 +248,8 @@ public function testFromMinutes(int|float $minutes, int $expected): void
         self::assertSame($expected, $span->toMicroseconds());
     }
 
+    #[TestWith([0, 0])]
+    #[TestWith([0.0, 0])]
     #[TestWith([100, 360_000_000_000])]
     #[TestWith([100.1, 360_360_000_000])]
     #[TestWith([100.5, 361_800_000_000])]
@@ -245,6 +261,8 @@ public function testFromHours(int|float $hours, int $expected): void
         self::assertSame($expected, $span->toMicroseconds());
     }
 
+    #[TestWith([0, 0])]
+    #[TestWith([0.0, 0])]
     #[TestWith([100, 8_640_000_000_000_000])]
     #[TestWith([106751, 9_223_286_400_000_000_000])]
     #[TestWith([-106751, -9_223_286_400_000_000_000])]