dev 2020-10

src/Database/Sql/SqlQuery.php

@@ -164,15 +164,17 @@ class SqlQuery
 				$debugbar['sql_queries']->addQuery([
 					'sql' => preg_replace('/\s+/', ' ', $query),
 					'duration' => $this->duration,
-					'duration_str' => round($this->duration, 4) . " sec.",
+					'duration_str' => formatDuration($this->duration),
 					'row_count' => $rs->getRowsCount(),
 					//'stmt_id' => null,
 					//'prepared_stmt' => null,
 					'params' => $params,
 					'memory' => $memory_used,
-					'memory_str' => round($memory_used/1000000, 1) . "Mo",
+					//'memory_str' => round($memory_used/1000000, 1) . "Mo",
+					'memory_str' => formatSize($memory_used),
 					'end_memory' => $mem_end,
-					'end_memory_str' => round($mem_end/1000000, 1) . "Mo",
+					//'end_memory_str' => round($mem_end/1000000, 1) . "Mo",
+					'end_memory_str' => formatSize($mem_end),
 					'is_success' => $is_success,
 					'error_code' => $error_code,
 					'error_message' => $error_msg,

src/Templates/PhpTemplate.php

@@ -256,8 +256,10 @@ class PhpTemplate
 				'tpl' => $tpl,
 				'layout' => $layout_old,
 				'content_length' => strlen($content),
+				'content_length_str' => formatSize(strlen($content)),
 				'duration' => $duration,
-				'duration_str' => round($duration, 5),
+				'duration_str' => formatDuration($duration),
+				'vars' => $this->variables,
 			]);
 		}