rex_timer::measure: Umgang mit Exceptions (#3173)

redaxo/src/core/lib/util/timer.php

@@ -57,15 +57,17 @@ public static function measure($label, callable $callable)
         }
 
         $timer = new self();
-        $result = $callable();
-        $timer->stop();
 
-        $duration = isset(self::$serverTimings[$label]) ? self::$serverTimings[$label] : 0;
-        $duration += $timer->getDelta(self::MILLISEC);
+        try {
+            return $callable();
+        } finally {
+            $timer->stop();
 
-        self::$serverTimings[$label] = $duration;
+            $duration = isset(self::$serverTimings[$label]) ? self::$serverTimings[$label] : 0;
+            $duration += $timer->getDelta(self::MILLISEC);
 
-        return $result;
+            self::$serverTimings[$label] = $duration;
+        }
     }
 
     /**

redaxo/src/core/tests/util/timer_test.php

@@ -0,0 +1,43 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ */
+class rex_timer_test extends TestCase
+{
+    public function testMeasure(): void
+    {
+        $callable = static function () {
+            static $i = 1;
+            return 'result'.($i++);
+        };
+
+        $result = rex_timer::measure('test', $callable);
+        $timing = rex_timer::$serverTimings['test'];
+
+        $this->assertSame('result1', $result);
+        $this->assertIsFloat($timing);
+        $this->assertGreaterThan(0, $timing);
+
+        $result = rex_timer::measure('test', $callable);
+
+        $this->assertSame('result2', $result);
+        $this->assertGreaterThan($timing, rex_timer::$serverTimings['test']);
+
+        $exception = null;
+        try {
+            rex_timer::measure('test2', static function () {
+                throw new RuntimeException();
+            });
+        } catch (Throwable $exception) {
+        }
+
+        $timing = rex_timer::$serverTimings['test'];
+
+        $this->assertInstanceOf(RuntimeException::class, $exception);
+        $this->assertIsFloat($timing);
+        $this->assertGreaterThan(0, $timing);
+    }
+}