Merge branch '11.0'

sebastianbergmann · Mar 8, 2024 · 1adf30d · 1adf30d
2 parents 3fa92eb + c157a06
commit 1adf30d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -68,6 +68,7 @@
   <file src="src/Event/Value/Telemetry/HRTime.php">
     <ImpureMethodCall>
       <code><![CDATA[fromSecondsAndNanoseconds]]></code>
+      <code><![CDATA[fromSecondsAndNanoseconds]]></code>
     </ImpureMethodCall>
   </file>
   <file src="src/Event/Value/Telemetry/MemoryUsage.php">

diff --git a/src/Event/Value/Telemetry/HRTime.php b/src/Event/Value/Telemetry/HRTime.php
@@ -56,9 +56,6 @@ public function nanoseconds(): int
         return $this->nanoseconds;
     }
 
-    /**
-     * @throws InvalidArgumentException
-     */
     public function duration(self $start): Duration
     {
         $seconds     = $this->seconds - $start->seconds();
@@ -71,7 +68,7 @@ public function duration(self $start): Duration
         }
 
         if ($seconds < 0) {
-            throw new InvalidArgumentException('Start needs to be smaller.');
+            return Duration::fromSecondsAndNanoseconds(0, 0);
         }
 
         return Duration::fromSecondsAndNanoseconds(

diff --git a/tests/unit/Event/Value/Telemetry/HRTimeTest.php b/tests/unit/Event/Value/Telemetry/HRTimeTest.php
@@ -124,7 +124,7 @@ public function testFromSecondsAndNanosecondsReturnsHRTime(): void
     }
 
     #[DataProvider('provideStartGreaterThanEnd')]
-    public function testDurationRejectsStartGreaterThanEnd(int $startSeconds, int $startNanoseconds, int $endSeconds, int $endNanoseconds): void
+    public function testDurationIgnoresStartGreaterThanEnd(int $startSeconds, int $startNanoseconds, int $endSeconds, int $endNanoseconds): void
     {
         $start = HRTime::fromSecondsAndNanoseconds(
             $startSeconds,
@@ -136,10 +136,10 @@ public function testDurationRejectsStartGreaterThanEnd(int $startSeconds, int $s
             $endNanoseconds,
         );
 
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Start needs to be smaller.');
+        $duration = $end->duration($start);
 
-        $end->duration($start);
+        $this->assertSame(0, $duration->seconds());
+        $this->assertSame(0, $duration->nanoseconds());
     }
 
     #[DataProvider('provideStartEndAndDuration')]