Remove localised_date Twig extension

kamil-tekiela · MauricioFauth · commit 525009b2fdaf · 2023-03-03T20:42:27.000-03:00
Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;
diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php
@@ -34,6 +34,7 @@
 use function in_array;
 use function is_string;
 use function str_contains;
+use function strtotime;
 
 /**
  * Displays table structure infos like columns, indexes, size, rows
@@ -361,6 +362,18 @@ protected function getTableStats(bool $isSystemSchema): string
             ];
         }
 
+        if (isset($GLOBALS['showtable']['Create_time'])) {
+            $GLOBALS['showtable']['Create_time'] = Util::localisedDate(strtotime($GLOBALS['showtable']['Create_time']));
+        }
+
+        if (isset($GLOBALS['showtable']['Update_time'])) {
+            $GLOBALS['showtable']['Update_time'] = Util::localisedDate(strtotime($GLOBALS['showtable']['Update_time']));
+        }
+
+        if (isset($GLOBALS['showtable']['Check_time'])) {
+            $GLOBALS['showtable']['Check_time'] = Util::localisedDate(strtotime($GLOBALS['showtable']['Check_time']));
+        }
+
         return $this->template->render('table/structure/display_table_stats', [
             'db' => $GLOBALS['db'],
             'table' => $GLOBALS['table'],
diff --git a/libraries/classes/Twig/UtilExtension.php b/libraries/classes/Twig/UtilExtension.php
@@ -100,10 +100,6 @@ public function getFunctions(): array
                 Generator::linkToVarDocumentation(...),
                 ['is_safe' => ['html']],
             ),
-            new TwigFunction(
-                'localised_date',
-                Util::localisedDate(...),
-            ),
             new TwigFunction(
                 'show_hint',
                 Generator::showHint(...),
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -2495,6 +2495,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Table/StructureController.php
 
+		-
+			message: "#^Parameter \\#1 \\$timestamp of static method PhpMyAdmin\\\\Util\\:\\:localisedDate\\(\\) expects int, \\(int\\|false\\) given\\.$#"
+			count: 3
+			path: libraries/classes/Controllers/Table/StructureController.php
+
 		-
 			message: "#^Parameter \\#1 \\$value of static method PhpMyAdmin\\\\Util\\:\\:formatByteDown\\(\\) expects float\\|int\\|string\\|null, \\(array\\|float\\|int\\) given\\.$#"
 			count: 2
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -4409,6 +4409,8 @@
       <code><![CDATA[$GLOBALS['tbl_is_view']]]></code>
     </InvalidArrayOffset>
     <MixedArgument>
+      <code><![CDATA[$GLOBALS['showtable']['Check_time']]]></code>
+      <code><![CDATA[$GLOBALS['showtable']['Create_time']]]></code>
       <code><![CDATA[$GLOBALS['showtable']['Data_free']]]></code>
       <code><![CDATA[$GLOBALS['showtable']['Data_length']]]></code>
       <code><![CDATA[$GLOBALS['showtable']['Data_length']
@@ -4418,6 +4420,7 @@
                 - $GLOBALS['showtable']['Data_free']]]></code>
       <code><![CDATA[$GLOBALS['showtable']['Data_length'] + $GLOBALS['showtable']['Index_length']]]></code>
       <code><![CDATA[$GLOBALS['showtable']['Index_length']]]></code>
+      <code><![CDATA[$GLOBALS['showtable']['Update_time']]]></code>
       <code><![CDATA[$GLOBALS['tbl_collation']]]></code>
       <code><![CDATA[$field['Collation'] ?? '']]></code>
       <code><![CDATA[$field['Extra']]]></code>
diff --git a/templates/table/structure/display_table_stats.twig b/templates/table/structure/display_table_stats.twig
@@ -152,21 +152,21 @@
                 {% if showtable['Create_time'] is defined %}
                     <tr>
                     <th class="name">{% trans 'Creation' %}</th>
-                    <td class="value">{{ localised_date(showtable['Create_time']|date('U')) }}</td>
+                    <td class="value">{{ showtable['Create_time'] }}</td>
                     </tr>
                 {% endif %}
 
                 {% if showtable['Update_time'] is defined %}
                     <tr>
                     <th class="name">{% trans 'Last update' %}</th>
-                    <td class="value">{{ localised_date(showtable['Update_time']|date('U')) }}</td>
+                    <td class="value">{{ showtable['Update_time'] }}</td>
                     </tr>
                 {% endif %}
 
                 {% if showtable['Check_time'] is defined %}
                     <tr>
                     <th class="name">{% trans 'Last check' %}</th>
-                    <td class="value">{{ localised_date(showtable['Check_time']|date('U')) }}</td>
+                    <td class="value">{{ showtable['Check_time'] }}</td>
                     </tr>
                 {% endif %}
             </tbody>
