ConnectionPanel::initialize() replaces Helpers::initializeTracy()

nette · Jan 19, 2022 · 0df6e7f · 0df6e7f
1 parent 296f9e2
commit 0df6e7f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/src/Bridges/DatabaseDI/DatabaseExtension.php b/src/Bridges/DatabaseDI/DatabaseExtension.php
@@ -69,7 +69,10 @@ public function beforeCompile()
 		foreach ($this->config as $name => $config) {
 			if ($config->debugger ?? $builder->getByType(Tracy\BlueScreen::class)) {
 				$connection = $builder->getDefinition($this->prefix("$name.connection"));
-				$connection->addSetup([Nette\Database\Helpers::class, 'initializeTracy'], [$connection, $this->debugMode, $name, !empty($config->explain)]);
+				$connection->addSetup(
+					[Nette\Bridges\DatabaseTracy\ConnectionPanel::class, 'initialize'],
+					[$connection, $this->debugMode, $name, !empty($config->explain)]
+				);
 			}
 		}
 	}

diff --git a/src/Bridges/DatabaseTracy/ConnectionPanel.php b/src/Bridges/DatabaseTracy/ConnectionPanel.php
@@ -50,6 +50,29 @@ class ConnectionPanel implements Tracy\IBarPanel
 	private $blueScreen;
 
 
+	public static function initialize(
+		Connection $connection,
+		bool $addBarPanel = false,
+		string $name = '',
+		bool $explain = true,
+		?Tracy\Bar $bar = null,
+		?Tracy\BlueScreen $blueScreen = null
+	): ?self {
+		$blueScreen = $blueScreen ?? Tracy\Debugger::getBlueScreen();
+		$blueScreen->addPanel([self::class, 'renderException']);
+
+		if ($addBarPanel) {
+			$panel = new self($connection, $blueScreen);
+			$panel->explain = $explain;
+			$panel->name = $name;
+			$bar = $bar ?? Tracy\Debugger::getBar();
+			$bar->addPanel($panel);
+		}
+
+		return $panel ?? null;
+	}
+
+
 	public function __construct(Connection $connection, Tracy\BlueScreen $blueScreen)
 	{
 		$connection->onQuery[] = \Closure::fromCallable([$this, 'logQuery']);

diff --git a/src/Database/Helpers.php b/src/Database/Helpers.php
@@ -294,18 +294,19 @@ public static function loadFromFile(Connection $connection, string $file, ?calla
 	}
 
 
-	/** @deprecated  use Helpers::initializeTracy() */
+	/** @deprecated  use Nette\Bridges\DatabaseTracy\ConnectionPanel::initialize() */
 	public static function createDebugPanel(
 		Connection $connection,
 		bool $explain,
 		string $name,
 		Tracy\Bar $bar,
 		Tracy\BlueScreen $blueScreen
 	): ?ConnectionPanel {
-		return self::initializeTracy($connection, true, $name, $explain, $bar, $blueScreen);
+		return ConnectionPanel::initialize($connection, true, $name, $explain, $bar, $blueScreen);
 	}
 
 
+	/** @deprecated  use Nette\Bridges\DatabaseTracy\ConnectionPanel::initialize() */
 	public static function initializeTracy(
 		Connection $connection,
 		bool $addBarPanel = false,
@@ -314,18 +315,7 @@ public static function initializeTracy(
 		?Tracy\Bar $bar = null,
 		?Tracy\BlueScreen $blueScreen = null
 	): ?ConnectionPanel {
-		$blueScreen = $blueScreen ?? Tracy\Debugger::getBlueScreen();
-		$blueScreen->addPanel([ConnectionPanel::class, 'renderException']);
-
-		if ($addBarPanel) {
-			$panel = new ConnectionPanel($connection, $blueScreen);
-			$panel->explain = $explain;
-			$panel->name = $name;
-			$bar = $bar ?? Tracy\Debugger::getBar();
-			$bar->addPanel($panel);
-		}
-
-		return $panel ?? null;
+		return ConnectionPanel::initialize($connection, true, $name, $explain, $bar, $blueScreen);
 	}