From ae5f1a4282b851c690c189face3cf49edfe882e6 Mon Sep 17 00:00:00 2001
From: Ayumi Hamasaki <asianspawebsite@gmail.com>
Date: Thu, 18 Jul 2019 05:54:24 +0100
Subject: [PATCH] Clean up output of Twig dump() function (#4460)

Credit to @ayumihamsaki. Fixes #4446.
---
 modules/cms/twig/DebugExtension.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/cms/twig/DebugExtension.php b/modules/cms/twig/DebugExtension.php
index ee151b13c..242eb23a5 100644
--- a/modules/cms/twig/DebugExtension.php
+++ b/modules/cms/twig/DebugExtension.php
@@ -93,7 +93,6 @@ class DebugExtension extends TwigExtension
 
         $count = func_num_args();
         if ($count == 2) {
-
             $this->variablePrefix = true;
             $vars = [];
             foreach ($context as $key => $value) {
@@ -103,13 +102,10 @@ class DebugExtension extends TwigExtension
             }
 
             $result .= $this->dump($vars, static::PAGE_CAPTION);
-
         }
         else {
-
             $this->variablePrefix = false;
             for ($i = 2; $i < $count; $i++) {
-
                 $var = func_get_arg($i);
 
                 if ($var instanceof ComponentBase) {
@@ -127,9 +123,7 @@ class DebugExtension extends TwigExtension
 
                 $result .= $this->dump($var, $caption);
             }
-
         }
-
         return $result;
     }
 
@@ -164,9 +158,11 @@ class DebugExtension extends TwigExtension
             $output[] = $this->makeTableHeader($caption);
         }
 
+        $output[] = '<tbody>';
         foreach ($variables as $key => $item) {
             $output[] = $this->makeTableRow($key, $item);
         }
+        $output[] = '</tbody>';
         $output[] = '</table>';
 
         $html = implode(PHP_EOL, $output);
@@ -186,16 +182,18 @@ class DebugExtension extends TwigExtension
         }
 
         $output = [];
+        $output[] = '<thead>';
         $output[] = '<tr>';
-        $output[] = '<th colspan="3" colspan="100" style="'.$this->getHeaderCss().'">';
+        $output[] = '<th colspan="3" style="'.$this->getHeaderCss().'">';
         $output[] = $caption;
 
         if (isset($subcaption)) {
             $output[] = '<div style="'.$this->getSubheaderCss().'">'.$subcaption.'</div>';
         }
 
-        $output[] = '</td>';
+        $output[] = '</th>';
         $output[] = '</tr>';
+        $output[] = '</thead>';
         return implode(PHP_EOL, $output);
     }