debugbar logging requests using microtime

admin/css/debug-toolbar/toolbar.scss

@@ -488,8 +488,8 @@
     width: 70px;
 }
 
-.debug-bar-width140p {
-    width: 140px;
+.debug-bar-width190p {
+    width: 190px;
 }
 
 .debug-bar-width20e {

system/Debug/Toolbar.php

@@ -374,7 +374,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
             helper('filesystem');
 
             // Updated to time() so we can get history
-            $time = time();
+            $time = number_format(microtime(true), 4, '.', '');
 
             if (! is_dir(WRITEPATH . 'debugbar')) {
                 mkdir(WRITEPATH . 'debugbar', 0777);

system/Debug/Toolbar/Collectors/History.php

@@ -11,6 +11,8 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
+use DateTime;
+
 /**
  * History collector
  */
@@ -56,10 +58,10 @@ class History extends BaseCollector
     /**
      * Specify time limit & file count for debug history.
      *
-     * @param int $current Current history time
-     * @param int $limit   Max history files
+     * @param float $current Current history time
+     * @param int   $limit   Max history files
      */
-    public function setFiles(int $current, int $limit = 20)
+    public function setFiles(float $current, int $limit = 20)
     {
         $filenames = glob(WRITEPATH . 'debugbar/debugbar_*.json');
 
@@ -81,14 +83,21 @@ public function setFiles(int $current, int $limit = 20)
 
             $contents = @json_decode($contents);
             if (json_last_error() === JSON_ERROR_NONE) {
-                preg_match_all('/\d+/', $filename, $time);
-                $time = (int) end($time[0]);
+                preg_match_all('/debugbar_(.*)\.json/s', $filename, $time, PREG_SET_ORDER);
+                $time = number_format((float) end($time[0]), 4, '.', '');
+
+                // Prevent throw exception is old debugbar time format
+                if ($dateTime = DateTime::createFromFormat('U.u', $time)) {
+                    $dateTime = $dateTime->format('Y-m-d H:i:s.u');
+                } else {
+                    $dateTime = date('Y-m-d H:i:s.u', (int) $time);
+                }
 
                 // Debugbar files shown in History Collector
                 $files[] = [
                     'time'        => $time,
-                    'datetime'    => date('Y-m-d H:i:s', $time),
-                    'active'      => $time === $current,
+                    'datetime'    => $dateTime,
+                    'active'      => (float) $time === $current,
                     'status'      => $contents->vars->response->statusCode,
                     'method'      => $contents->method,
                     'url'         => $contents->url,

system/Debug/Toolbar/Views/_history.tpl

@@ -16,7 +16,7 @@
         	<td class="debug-bar-width70p">
             	<button class="ci-history-load" data-time="{time}">Load</button>
             </td>
-            <td class="debug-bar-width140p">{datetime}</td>
+            <td class="debug-bar-width190p">{datetime}</td>
             <td>{status}</td>
             <td>{method}</td>
             <td>{url}</td>

system/Debug/Toolbar/Views/toolbar.css

@@ -631,8 +631,8 @@
 .debug-bar-width70p {
   width: 70px; }
 
-.debug-bar-width140p {
-  width: 140px; }
+.debug-bar-width190p {
+  width: 190px;}
 
 .debug-bar-width20e {
   width: 20em; }

tests/system/Debug/Toolbar/Collectors/HistoryTest.php

@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use DateTime;
+
+/**
+ * @internal
+ */
+final class HistoryTest extends CIUnitTestCase
+{
+    private const STEP = 0.0001;
+
+    protected float $time;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->time = number_format(microtime(true), 4, '.', '');
+    }
+
+    protected function createDummyDebugbarJson()
+    {
+        $time = $this->time;
+        $path = WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$time}.json";
+
+        $dummyData = [
+            'vars' => [
+                'response' => [
+                    'statusCode'  => 200,
+                    'contentType' => 'text/html; charset=UTF-8',
+                ],
+            ],
+            'method' => 'get',
+            'url'    => 'localhost',
+            'isAJAX' => false,
+        ];
+        // create 10 dummy debugbar json files
+        for ($i = 0; $i < 20; $i++) {
+            $path = str_replace($time, number_format($time - self::STEP, 4, '.', ''), $path);
+            file_put_contents($path, json_encode($dummyData));
+            $time = number_format($time - self::STEP, 4, '.', '');
+        }
+    }
+
+    protected function tearDown(): void
+    {
+        command('debugbar:clear');
+    }
+
+    public function testSetFiles()
+    {
+        $time = $this->time;
+        // test dir is now populated with json
+        $this->createDummyDebugbarJson();
+
+        $history = new History();
+        $history->setFiles($this->time, 20);
+        $this->assertIsArray($history->display());
+        $this->assertArrayHasKey('files', $history->display());
+        $this->assertNotEmpty($history->display(), 'Dummy Debugbar data is empty');
+
+        $time = number_format($time - self::STEP, 4, '.', '');
+
+        foreach ($history->display()['files'] as $request) {
+            $this->assertSame($request, [
+                'time'        => $time,
+                'datetime'    => DateTime::createFromFormat('U.u', $time)->format('Y-m-d H:i:s.u'),
+                'active'      => false,
+                'status'      => 200,
+                'method'      => 'get',
+                'url'         => 'localhost',
+                'isAJAX'      => 'No',
+                'contentType' => 'text/html; charset=UTF-8',
+
+            ], 'Date format fail');
+            $time = number_format($time - self::STEP, 4, '.', '');
+        }
+    }
+}