Debug - Toolbar - Use Kint to dump vars

codeigniter4 · Apr 22, 2021 · 66c72c4 · 66c72c4
1 parent 519d3e1
commit 66c72c4
Showing 1 changed file with 28 additions and 24 deletions.
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -22,6 +22,7 @@
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 use Config\Toolbar as ToolbarConfig;
+use Kint\Kint;
 
 /**
  * Debug Toolbar
@@ -109,7 +110,26 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
 			{
 				foreach ($items as $key => $value)
 				{
-					$varData[esc($key)] = is_string($value) ? esc($value) : '<pre>' . esc($this->processVar($value)) . '</pre>';
+					if (is_string($value))
+					{
+						$varData[esc($key)] = esc($value);
+					}
+					else
+					{
+						$oldKintMode       = Kint::$mode_default;
+						$oldKintCalledFrom = Kint::$display_called_from;
+
+						Kint::$mode_default        = Kint::MODE_RICH;
+						Kint::$display_called_from = false;
+
+						$kint = @Kint::dump($value);
+						$kint = substr($kint, strpos($kint, '</style>') + 8 );
+
+						Kint::$mode_default        = $oldKintMode;
+						Kint::$display_called_from = $oldKintCalledFrom;
+
+						$varData[esc($key)] = $kint;
+					}
 				}
 			}
 
@@ -343,12 +363,19 @@ public function prepare(RequestInterface $request = null, ResponseInterface $res
 				return;
 			}
 
+			$oldKintMode        = Kint::$mode_default;
+			Kint::$mode_default = Kint::MODE_RICH;
+			$kintScript         = @Kint::dump('');
+			Kint::$mode_default = $oldKintMode;
+			$kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8 );
+
 			$script = PHP_EOL
 					. '<script type="text/javascript" {csp-script-nonce} id="debugbar_loader" '
 					. 'data-time="' . $time . '" '
 					. 'src="' . site_url() . '?debugbar"></script>'
 					. '<script type="text/javascript" {csp-script-nonce} id="debugbar_dynamic_script"></script>'
 					. '<style type="text/css" {csp-style-nonce} id="debugbar_dynamic_style"></style>'
+					. $kintScript
 					. PHP_EOL;
 
 			if (strpos($response->getBody(), '<head>') !== false)
@@ -468,27 +495,4 @@ protected function format(string $data, string $format = 'html'): string
 
 		return $output;
 	}
-
-	/**
-	 * Process the varable to string for display
-	 *
-	 * @param mixed $var Variable
-	 *
-	 * @return boolean|string
-	 */
-	protected function processVar($var)
-	{
-		if (is_object($var))
-		{
-			$var = is_callable([$var, 'toArray']) ? $var->toArray() : get_class($var);
-		}
-		if (is_array($var))
-		{
-			foreach ($var as &$aVar)
-			{
-				$aVar = $this->processVar($aVar);
-			}
-		}
-		return print_r($var, true);
-	}
 }