refactored debug module

extensions/yii/debug/panels/ConfigPanel.php

@@ -30,31 +30,12 @@ class ConfigPanel extends Panel
 
 	public function getSummary()
 	{
-		return  Yii::$app->view->render('panels/config/summary', [
+		return Yii::$app->view->render('panels/config/summary', ['panel' => $this]);
-			'panel' => $this,
-			'data' => $this->data,
-		]);
 	}
 
 	public function getDetail()
 	{
-		return  Yii::$app->view->render('panels/config/detail', [
+		return Yii::$app->view->render('panels/config/detail', ['panel' => $this]);
-			'panel' => $this,
-			'data' => $this->data,
-			'app' => [
-				'Yii Version' => $this->data['application']['yii'],
-				'Application Name' => $this->data['application']['name'],
-				'Environment' => $this->data['application']['env'],
-				'Debug Mode' => $this->data['application']['debug'] ? 'Yes' : 'No',
-			],
-			'php' => [
-				'PHP Version' => $this->data['php']['version'],
-				'Xdebug' => $this->data['php']['xdebug'] ? 'Enabled' : 'Disabled',
-				'APC' => $this->data['php']['apc'] ? 'Enabled' : 'Disabled',
-				'Memcache' => $this->data['php']['memcache'] ? 'Enabled' : 'Disabled',
-			],
-			'extensions' => $this->getExtensions(),
-		]);
 	}
 
 	public function getExtensions()

extensions/yii/debug/panels/RequestPanel.php

@@ -26,22 +26,12 @@ class RequestPanel extends Panel
 
 	public function getSummary()
 	{
-		return  Yii::$app->view->render('panels/request/summary', [
+		return Yii::$app->view->render('panels/request/summary', ['panel' => $this]);
-			'panel' => $this,
-			'data' => $this->data,
-		]);
 	}
 
 	public function getDetail()
 	{
-		return  Yii::$app->view->render('panels/request/detail', [
+		return Yii::$app->view->render('panels/request/detail', ['panel' => $this]);
-			'panel' => $this,
-			'data' => [
-				'Route' => $this->data['route'],
-				'Action' => $this->data['action'],
-				'Parameters' => $this->data['actionParams'],
-			],
-		]);
 	}
 
 	public function save()

extensions/yii/debug/views/default/panels/config/_data_table.php

@@ -1,24 +0,0 @@
-<?php
-use yii\helpers\Html;
-
-if (empty($values)): ?>
-<h3><?php echo $caption; ?></h3>
-<p>Empty.</p>
-<?php else:	?>
-<h3><?php echo $caption; ?></h3>
-<table class="table table-condensed table-bordered table-striped table-hover" style="table-layout: fixed;">
-	<thead>
-		<tr>
-			<th style="width: 200px;">Name</th>
-			<th>Value</th>
-		</tr>
-	</thead>
-	<?php foreach($values as $name => $value): ?>
-		<tr>
-			<th style="width: 200px;"><?php echo Html::encode($name); ?></th>
-			<td style="overflow:auto"><?php echo Html::encode($value); ?></td>
-		</tr>
-	<?php endforeach; ?>
-</tbody>
-</table>
-<?php endif; ?>

extensions/yii/debug/views/default/panels/config/detail.php

@@ -1,14 +1,38 @@
 <?php
 use yii\helpers\Html;
+
+/**
+ * @var yii\debug\panels\ConfigPanel $panel
+ */
+$extensions = $panel->getExtensions();
 ?>
 <h1>Configuration</h1>
 <?php
-echo $this->context->renderPartial('panels/config/_data_table',[ 'caption' => 'Application Configuration', 'values' => $app]);
+echo $this->render('panels/config/table', [
+	'caption' => 'Application Configuration',
+	'values' => [
+		'Yii Version' => $panel->data['application']['yii'],
+		'Application Name' => $panel->data['application']['name'],
+		'Environment' => $panel->data['application']['env'],
+		'Debug Mode' => $panel->data['application']['debug'] ? 'Yes' : 'No',
+	],
+]);
 
 if (!empty($extensions)) {
-	echo $this->context->renderPartial('panels/config/_data_table',[ 'caption' => 'Installed Extensions', 'values' => $extensions]);	
+	echo $this->render('panels/config/table', [
+		'caption' => 'Installed Extensions',
+		'values' => $extensions,
+	]);
 }
 
-echo $this->context->renderPartial('panels/config/_data_table',[ 'caption' => 'PHP Configuration', 'values' => $php]);
+echo $this->render('panels/config/table', [
+	'caption' => 'PHP Configuration',
+	'values' => [
+		'PHP Version' => $panel->data['php']['version'],
+		'Xdebug' => $panel->data['php']['xdebug'] ? 'Enabled' : 'Disabled',
+		'APC' => $panel->data['php']['apc'] ? 'Enabled' : 'Disabled',
+		'Memcache' => $panel->data['php']['memcache'] ? 'Enabled' : 'Disabled',
+	],
+]);
 ?>
-<div><?php echo Html::a('Show phpinfo »', ['phpinfo'], ['class' => 'btn btn-primary']); ?></div>
+<div><?= Html::a('Show phpinfo() »', ['phpinfo'], ['class' => 'btn btn-primary']) ?></div>

extensions/yii/debug/views/default/panels/config/summary.php

@@ -1,9 +1,17 @@
+<?php
+
+use yii\helpers\Html;
+
+/**
+ * @var yii\debug\panels\ConfigPanel $panel
+ */
+?>
 <div class="yii-debug-toolbar-block">
-	<a href="<?php echo $panel->getUrl(); ?>">
+	<a href="<?= $panel->getUrl() ?>">
-		<img width="29" height="30" alt="" src="<?php echo $panel->getYiiLogo();?>">
+		<img width="29" height="30" alt="" src="<?= $panel->getYiiLogo() ?>">
-		<span><?php echo $data['application']['yii'];?></span>
+		<span><?= $panel->data['application']['yii'] ?></span>
 	</a>
 </div>
 <div class="yii-debug-toolbar-block">
-	<a href="<?php echo $this->context->createUrl('phpinfo');?>" title="Show phpinfo()">PHP <?php echo $data['php']['version'];?></a>
+	<?= Html::a('PHP ' . $panel->data['php']['version'], ['phpinfo'], ['title' => 'Show phpinfo()']) ?>
 </div>

extensions/yii/debug/views/default/panels/config/table.php

@@ -0,0 +1,35 @@
+<?php
+use yii\helpers\Html;
+
+/**
+ * @var string $caption
+ * @var array $values
+ */
+?>
+
+<h3><?= $caption ?></h3>
+
+<?php if (empty($values)): ?>
+
+	<p>Empty.</p>
+
+<?php else:	?>
+
+	<table class="table table-condensed table-bordered table-striped table-hover" style="table-layout: fixed;">
+		<thead>
+			<tr>
+				<th style="width: 200px;">Name</th>
+				<th>Value</th>
+			</tr>
+		</thead>
+		<tbody>
+		<?php foreach($values as $name => $value): ?>
+			<tr>
+				<th style="width: 200px;"><?= Html::encode($name) ?></th>
+				<td style="overflow:auto"><?= Html::encode($value) ?></td>
+			</tr>
+		<?php endforeach; ?>
+		</tbody>
+	</table>
+
+<?php endif; ?>

extensions/yii/debug/views/default/panels/db/summary.php

@@ -1,7 +1,7 @@
 <?php if ($queryCount): ?>
 <div class="yii-debug-toolbar-block">
-	<a href="<?php echo $panel->getUrl();?>" title="Executed <?php echo $queryCount; ?> database queries which took <?php echo $queryTime; ?>.">
+	<a href="<?= $panel->getUrl() ?>" title="Executed <?php echo $queryCount; ?> database queries which took <?= $queryTime ?>.">
-		DB <span class="label"><?php echo $queryCount; ?></span> <span class="label"><?php echo $queryTime; ?></span>
+		DB <span class="label"><?= $queryCount ?></span> <span class="label"><?= $queryTime ?></span>
 	</a>
 </div>
 <?php endif; ?>

extensions/yii/debug/views/default/panels/log/summary.php

@@ -21,8 +21,8 @@ if ($warningCount) {
 ?>
 
 <div class="yii-debug-toolbar-block">
-	<a href="<?php echo $panel->getUrl(); ?>" title="<?php echo $title ?>">Log
+	<a href="<?= $panel->getUrl() ?>" title="<?= $title ?>">Log
-		<span class="label"><?php echo count($data['messages']); ?></span>
+		<span class="label"><?= count($data['messages']) ?></span>
-		<?php echo implode('&nbsp;', $output); ?>
+		<?= implode('&nbsp;', $output) ?>
 	</a>
 </div>

extensions/yii/debug/views/default/panels/profile/detail.php

@@ -3,7 +3,7 @@ use yii\grid\GridView;
 use yii\helpers\Html;
 ?>
 <h1>Performance Profiling</h1>
-<p>Total processing time: <b><?php echo $time; ?></b>; Peak memory: <b><?php echo $memory; ?></b>.</p>
+<p>Total processing time: <b><?= $time ?></b>; Peak memory: <b><?= $memory ?></b>.</p>
 <?php
 echo GridView::widget([
 	'dataProvider' => $dataProvider,

extensions/yii/debug/views/default/panels/profile/summary.php

@@ -1,6 +1,6 @@
 <div class="yii-debug-toolbar-block">
-	<a href="<?php echo $panel->getUrl(); ?>" title="Total request processing time was <?php echo $time; ?>">Time <span class="label"><?php echo $time; ?></span></a>
+	<a href="<?= $panel->getUrl() ?>" title="Total request processing time was <?= $time ?>">Time <span class="label"><?= $time ?></span></a>
 </div>
 <div class="yii-debug-toolbar-block">
-	<a href="<?php echo $panel->getUrl(); ?>" title="Peak memory consumption">Memory <span class="label"><?php echo $memory; ?></span></a>
+	<a href="<?= $panel->getUrl() ?>" title="Peak memory consumption">Memory <span class="label"><?= $memory ?></span></a>
 </div>

extensions/yii/debug/views/default/panels/request/_data_table.php

@@ -1,24 +0,0 @@
-<?php
-use yii\helpers\Html;
-
-if (empty($values)): ?>
-<h3><?php echo $caption; ?></h3>
-<p>Empty.</p>
-<?php else:	?>
-<h3><?php echo $caption; ?></h3>
-<table class="table table-condensed table-bordered table-striped table-hover" style="table-layout: fixed;">
-	<thead>
-		<tr>
-			<th style="width: 200px;">Name</th>
-			<th>Value</th>
-		</tr>
-	</thead>
-	<?php foreach($values as $name => $value): ?>
-		<tr>
-			<th style="width: 200px;"><?php echo Html::encode($name); ?></th>
-			<td><?php echo htmlspecialchars(var_export($value, true), ENT_QUOTES|ENT_SUBSTITUTE, \Yii::$app->charset, TRUE); ?></td>
-		</tr>
-	<?php endforeach; ?>
-</tbody>
-</table>
-<?php endif; ?>

extensions/yii/debug/views/default/panels/request/detail.php

@@ -1,30 +1,34 @@
 <?php 
 use yii\bootstrap\Tabs;
 
+/**
+ * @var yii\debug\panels\RequestPanel $panel
+ */
+
 echo Tabs::widget([
 	'items' => [
 		[
 			'label' => 'Parameters',
-			'content' =>  $this->context->renderPartial('panels/request/_data_table', ['caption' => 'Routing', 'values' => $data])
+			'content' =>  $this->render('panels/request/table', ['caption' => 'Routing', 'values' => ['Route' => $panel->data['route'], 'Action' => $panel->data['action'], 'Parameters' => $panel->data['actionParams']]])
-						. $this->context->renderPartial('panels/request/_data_table', ['caption' => '$_GET', 'values' => $panel->data['GET']])
+						. $this->render('panels/request/table', ['caption' => '$_GET', 'values' => $panel->data['GET']])
-						. $this->context->renderPartial('panels/request/_data_table', ['caption' => '$_POST', 'values' => $panel->data['POST']])
+						. $this->render('panels/request/table', ['caption' => '$_POST', 'values' => $panel->data['POST']])
-						. $this->context->renderPartial('panels/request/_data_table', ['caption' => '$_FILES', 'values' => $panel->data['FILES']])
+						. $this->render('panels/request/table', ['caption' => '$_FILES', 'values' => $panel->data['FILES']])
-						. $this->context->renderPartial('panels/request/_data_table', ['caption' => '$_COOKIE', 'values' => $panel->data['COOKIE']]),
+						. $this->render('panels/request/table', ['caption' => '$_COOKIE', 'values' => $panel->data['COOKIE']]),
 			'active' => true,
 		],
 		[
 			'label' => 'Headers',
-			'content' =>  $this->context->renderPartial('panels/request/_data_table', ['caption' => 'Request Headers', 'values' => $panel->data['requestHeaders']])
+			'content' =>  $this->render('panels/request/table', ['caption' => 'Request Headers', 'values' => $panel->data['requestHeaders']])
-						. $this->context->renderPartial('panels/request/_data_table', ['caption' => 'Response Headers', 'values' => $panel->data['responseHeaders']])
+						. $this->render('panels/request/table', ['caption' => 'Response Headers', 'values' => $panel->data['responseHeaders']])
 		],
 		[
 			'label' => 'Session',
-			'content' =>  $this->context->renderPartial('panels/request/_data_table', ['caption' => '$_SESSION', 'values' => $panel->data['SESSION']])
+			'content' =>  $this->render('panels/request/table', ['caption' => '$_SESSION', 'values' => $panel->data['SESSION']])
-						. $this->context->renderPartial('panels/request/_data_table', ['caption' => 'Flashes', 'values' => $panel->data['flashes']])
+						. $this->render('panels/request/table', ['caption' => 'Flashes', 'values' => $panel->data['flashes']])
 		],
 		[
 			'label' => '$_SERVER',
-			'content' => $this->context->renderPartial('panels/request/_data_table', ['caption' => '$_SERVER', 'values' => $panel->data['SERVER']]),
+			'content' => $this->render('panels/request/table', ['caption' => '$_SERVER', 'values' => $panel->data['SERVER']]),
 		],
 	],
 ]);

extensions/yii/debug/views/default/panels/request/summary.php

@@ -2,7 +2,11 @@
 use yii\helpers\Html;
 use yii\web\Response;
 
-$statusCode = $data['statusCode'];
+/**
+ * @var yii\debug\panels\RequestPanel $panel
+ */
+
+$statusCode = $panel->data['statusCode'];
 if ($statusCode === null) {
 	$statusCode = 200;
 }
@@ -16,8 +20,8 @@ if ($statusCode >= 200 && $statusCode < 300) {
 $statusText = Html::encode(isset(Response::$httpStatuses[$statusCode]) ? Response::$httpStatuses[$statusCode] : '');
 ?>
 <div class="yii-debug-toolbar-block">
-	<a href="<?php echo $panel->getUrl(); ?>" title="Status code: <?php echo $statusCode; ?> <?php echo $statusText; ?>">Status <span class="label <?php echo $class; ?>"><?php echo $statusCode; ?></span></a>
+	<a href="<?= $panel->getUrl() ?>" title="Status code: <?= $statusCode ?> <?= $statusText ?>">Status <span class="label <?= $class ?>"><?= $statusCode ?></span></a>
 </div>
 <div class="yii-debug-toolbar-block">
-	<a href="<?php echo $panel->getUrl(); ?>">Action <span class="label"><?php echo $data['action']; ?></span></a>
+	<a href="<?= $panel->getUrl() ?>">Action <span class="label"><?= $panel->data['action'] ?></span></a>
 </div>

extensions/yii/debug/views/default/panels/request/table.php

@@ -0,0 +1,34 @@
+<?php
+use yii\helpers\Html;
+
+/**
+ * @var string $caption
+ * @var array $values
+ */
+?>
+<h3><?= $caption ?></h3>
+
+<?php if (empty($values)): ?>
+
+	<p>Empty.</p>
+
+<?php else:	?>
+
+	<table class="table table-condensed table-bordered table-striped table-hover" style="table-layout: fixed;">
+		<thead>
+			<tr>
+				<th style="width: 200px;">Name</th>
+				<th>Value</th>
+			</tr>
+		</thead>
+		<tbody>
+		<?php foreach($values as $name => $value): ?>
+			<tr>
+				<th style="width: 200px;"><?= Html::encode($name) ?></th>
+				<td><?= htmlspecialchars(var_export($value, true), ENT_QUOTES|ENT_SUBSTITUTE, \Yii::$app->charset, true) ?></td>
+			</tr>
+		<?php endforeach; ?>
+		</tbody>
+	</table>
+
+<?php endif; ?>