Skip to content

Commit a997072

Browse files
committed
Helpers::initializeTracy() replaces createDebugPanel()
1 parent 8c57f7f commit a997072

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

src/Bridges/DatabaseDI/DatabaseExtension.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,7 @@ public function beforeCompile()
6868
foreach ($this->config as $name => $config) {
6969
if ($config->debugger ?? $builder->getByType(\Tracy\BlueScreen::class)) {
7070
$connection = $builder->getDefinition($this->prefix("$name.connection"));
71-
$connection->addSetup('@Tracy\BlueScreen::addPanel', [
72-
[Nette\Bridges\DatabaseTracy\ConnectionPanel::class, 'renderException'],
73-
]);
74-
if ($this->debugMode) {
75-
$connection->addSetup([Nette\Database\Helpers::class, 'createDebugPanel'], [$connection, !empty($config->explain), $name]);
76-
}
71+
$connection->addSetup([Nette\Database\Helpers::class, 'initializeTracy'], [$connection, $this->debugMode, $name, !empty($config->explain)]);
7772
}
7873
}
7974
}

src/Database/Helpers.php

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,17 +240,37 @@ public static function loadFromFile(Connection $connection, string $file, callab
240240
}
241241

242242

243+
/** @deprecated use Helpers::initializeTracy() */
243244
public static function createDebugPanel(
244-
$connection,
245+
Connection $connection,
245246
bool $explain,
246247
string $name,
247248
Tracy\Bar $bar,
248249
Tracy\BlueScreen $blueScreen
249250
): Nette\Bridges\DatabaseTracy\ConnectionPanel {
251+
return self::initializeTracy($connection, true, $name, $explain, $bar, $blueScreen);
252+
}
253+
254+
255+
public static function initializeTracy(
256+
Connection $connection,
257+
bool $addBarPanel = false,
258+
string $name = '',
259+
bool $explain = true,
260+
Tracy\Bar $bar = null,
261+
Tracy\BlueScreen $blueScreen = null
262+
): Nette\Bridges\DatabaseTracy\ConnectionPanel {
263+
$blueScreen = $blueScreen ?? Tracy\Debugger::getBlueScreen();
264+
$bar = $bar ?? Tracy\Debugger::getBar();
265+
250266
$panel = new Nette\Bridges\DatabaseTracy\ConnectionPanel($connection, $blueScreen);
251267
$panel->explain = $explain;
252268
$panel->name = $name;
253-
$bar->addPanel($panel);
269+
270+
$blueScreen->addPanel([$panel, 'renderException']);
271+
if ($addBarPanel) {
272+
$bar->addPanel($panel);
273+
}
254274
return $panel;
255275
}
256276

0 commit comments

Comments
 (0)