Util\Timing::getHumanReadableDuration: improve time display

This commit makes some tiny changes to how the run time is displayed:
* For "exactly 1 second", display `1 secs` instead of `1000ms`.
* For "exactly 1 minute", display `1 mins` instead of `60 secs`.
* When minutes are displayed, only display seconds when there are seconds to display (so no `# mins, 0 secs`).

Includes updating the tests to match.

Author: jrfnl

src/Util/Timing.php

@@ -67,14 +67,14 @@ public static function getDuration()
     public static function getHumanReadableDuration($duration)
     {
         $timeString = '';
-        if ($duration > 60000) {
+        if ($duration >= 60000) {
             $mins       = floor($duration / 60000);
             $secs       = round((fmod($duration, 60000) / 1000), 2);
             $timeString = $mins.' mins';
-            if ($secs !== 0) {
+            if ($secs >= 0.01) {
                 $timeString .= ", $secs secs";
             }
-        } else if ($duration > 1000) {
+        } else if ($duration >= 1000) {
             $timeString = round(($duration / 1000), 2).' secs';
         } else {
             $timeString = round($duration).'ms';

tests/Core/Util/Timing/GetHumanReadableDurationTest.php

@@ -68,7 +68,7 @@ public static function dataGetHumanReadableDuration()
             ],
             'Duration: 1 second'                           => [
                 'duration' => 1000,
-                'expected' => '1000ms',
+                'expected' => '1 secs',
             ],
             'Duration: slightly more than 1 second'        => [
                 'duration' => 1001.178215,
@@ -80,11 +80,11 @@ public static function dataGetHumanReadableDuration()
             ],
             'Duration: exactly 1 minute'                   => [
                 'duration' => 60000,
-                'expected' => '60 secs',
+                'expected' => '1 mins',
             ],
             'Duration: slightly more than 1 minute'        => [
                 'duration' => 60001.7581235,
-                'expected' => '1 mins, 0 secs',
+                'expected' => '1 mins',
             ],
             'Duration: 1 minute, just under half a second' => [
                 'duration' => 60499.83639,
@@ -100,7 +100,7 @@ public static function dataGetHumanReadableDuration()
             ],
             'Duration: exactly 1 hour'                     => [
                 'duration' => 3600000,
-                'expected' => '60 mins, 0 secs',
+                'expected' => '60 mins',
             ],
             'Duration: 89.4 mins'                          => [
                 'duration' => 5364000,