`. If you want to inject the Debugbar yourself,
set the config option 'inject' to false and use the renderer yourself and follow http://phpdebugbar.com/docs/rendering.html
- $renderer = Debugbar::getJavascriptRenderer();
+```php
+$renderer = Debugbar::getJavascriptRenderer();
+```
Note: Not using the auto-inject, will disable the Request information, because that is added After the response.
You can add the default_request datacollector in the config as alternative.
@@ -115,8 +135,10 @@ You can add the default_request datacollector in the config as alternative.
## Enabling/Disabling on run time
You can enable or disable the debugbar during run time.
- \Debugbar::enable();
- \Debugbar::disable();
+```php
+\Debugbar::enable();
+\Debugbar::disable();
+```
NB. Once enabled, the collectors are added (and could produce extra overhead), so if you want to use the debugbar in production, disable in the config and only enable when needed.
@@ -125,19 +147,26 @@ NB. Once enabled, the collectors are added (and could produce extra overhead), s
Laravel Debugbar comes with two Twig Extensions. These are tested with [rcrowe/TwigBridge](https://github.com/rcrowe/TwigBridge) 0.6.x
-Add the following extensions to you TwigBridge config/extensions.php (or register the extensions manually)
+Add the following extensions to your TwigBridge config/extensions.php (or register the extensions manually)
- 'Barryvdh\Debugbar\Twig\Extension\Debug',
- 'Barryvdh\Debugbar\Twig\Extension\Stopwatch',
+```php
+'Barryvdh\Debugbar\Twig\Extension\Debug',
+'Barryvdh\Debugbar\Twig\Extension\Dump',
+'Barryvdh\Debugbar\Twig\Extension\Stopwatch',
+```
-The Debug extension will replace the [dump function](http://twig.sensiolabs.org/doc/functions/dump.html) to output variables to the Messages,
+The Dump extension will replace the [dump function](http://twig.sensiolabs.org/doc/functions/dump.html) to output variables using the DataFormatter. The Debug extension adds a `debug()` function which passes variables to the Message Collector,
instead of showing it directly in the template. It dumps the arguments, or when empty; all context variables.
- {{ dump() }}
- {{ dump(user, categories) }}
+```
+{{ debug() }}
+{{ debug(user, categories) }}
+```
The Stopwatch extension adds a [stopwatch tag](http://symfony.com/blog/new-in-symfony-2-4-a-stopwatch-tag-for-twig) similar to the one in Symfony/Silex Twigbridge.
- {% stopwatch "foo" %}
- ... some things that gets timed
- {% endstopwatch %}
+```
+{% stopwatch "foo" %}
+ …some things that gets timed
+{% endstopwatch %}
+```
diff --git a/vendor/barryvdh/laravel-debugbar/src/Controllers/BaseController.php b/vendor/barryvdh/laravel-debugbar/src/Controllers/BaseController.php
index 68cbea06..06dd1530 100644
--- a/vendor/barryvdh/laravel-debugbar/src/Controllers/BaseController.php
+++ b/vendor/barryvdh/laravel-debugbar/src/Controllers/BaseController.php
@@ -18,7 +18,7 @@ public function __construct(Application $app)
$this->app = $app;
}
}
-} else {
+} else if (class_exists('Illuminate\Routing\Controllers\Controller')) {
// Laravel 4.0 Controller
class BaseController extends \Illuminate\Routing\Controllers\Controller
{
@@ -34,4 +34,20 @@ public function __construct()
$this->app = app();
}
}
+} else {
+ // Laravel 5 Controller, Plain Old PHP Object
+ class BaseController
+ {
+ /**
+ * The application instance.
+ *
+ * @var \Illuminate\Foundation\Application
+ */
+ protected $app;
+
+ public function __construct(Application $app)
+ {
+ $this->app = $app;
+ }
+ }
}
diff --git a/vendor/barryvdh/laravel-debugbar/src/DataCollector/QueryCollector.php b/vendor/barryvdh/laravel-debugbar/src/DataCollector/QueryCollector.php
index 5b844b52..c20c0713 100644
--- a/vendor/barryvdh/laravel-debugbar/src/DataCollector/QueryCollector.php
+++ b/vendor/barryvdh/laravel-debugbar/src/DataCollector/QueryCollector.php
@@ -14,6 +14,9 @@ class QueryCollector extends PDOCollector
protected $queries = array();
protected $renderSqlWithParams = false;
protected $findSource = false;
+ protected $explainQuery = false;
+ protected $explainTypes = array('SELECT'); // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
+ protected $showHints = false;
/**
* @param TimeDataCollector $timeCollector
@@ -24,7 +27,7 @@ public function __construct(TimeDataCollector $timeCollector = null)
}
/**
- * Renders the SQL of traced statements with params embeded
+ * Renders the SQL of traced statements with params embedded
*
* @param boolean $enabled
* @param string $quotationChar NOT USED
@@ -34,6 +37,16 @@ public function setRenderSqlWithParams($enabled = true, $quotationChar = "'")
$this->renderSqlWithParams = $enabled;
}
+ /**
+ * Show or hide the hints in the parameters
+ *
+ * @param boolean $enabled
+ */
+ public function setShowHints($enabled = true)
+ {
+ $this->showHints = $enabled;
+ }
+
/**
* Enable/disable finding the source
*
@@ -44,6 +57,20 @@ public function setFindSource($value = true)
$this->findSource = (bool) $value;
}
+ /**
+ * Enable/disable the EXPLAIN queries
+ *
+ * @param bool $enabled
+ * @param array|null $types Array of types to explain queries (select/insert/update/delete)
+ */
+ public function setExplainSource($enabled, $types)
+ {
+ $this->explainQuery = $enabled;
+ if($types){
+ $this->explainTypes = $types;
+ }
+ }
+
/**
*
* @param string $query
@@ -53,12 +80,22 @@ public function setFindSource($value = true)
*/
public function addQuery($query, $bindings, $time, $connection)
{
+ $explainResults = array();
$time = $time / 1000;
$endTime = microtime(true);
$startTime = $endTime - $time;
+ $hints = $this->performQueryAnalysis($query);
$pdo = $connection->getPdo();
$bindings = $connection->prepareBindings($bindings);
+
+ // Run EXPLAIN on this query (if needed)
+ if ($this->explainQuery && preg_match('/^('.implode($this->explainTypes).') /i', $query)) {
+ $statement = $pdo->prepare('EXPLAIN ' . $query);
+ $statement->execute($bindings);
+ $explainResults = $statement->fetchAll(\PDO::FETCH_CLASS);
+ }
+
$bindings = $this->checkBindings($bindings);
if (!empty($bindings) && $this->renderSqlWithParams) {
foreach ($bindings as $binding) {
@@ -79,6 +116,8 @@ public function addQuery($query, $bindings, $time, $connection)
'bindings' => $this->escapeBindings($bindings),
'time' => $time,
'source' => $source,
+ 'explain' => $explainResults,
+ 'hints' => $this->showHints ? $hints : null,
);
if ($this->timeCollector !== null) {
@@ -115,6 +154,46 @@ protected function escapeBindings($bindings)
}
return $bindings;
}
+
+ /**
+ * Explainer::performQueryAnalysis()
+ *
+ * Perform simple regex analysis on the code
+ *
+ * @package xplain (https://github.com/rap2hpoutre/mysql-xplain-xplain)
+ * @author e-doceo
+ * @copyright 2014
+ * @version $Id$
+ * @access public
+ * @param string $query
+ * @return string
+ */
+ protected function performQueryAnalysis($query)
+ {
+ $hints = array();
+ if (preg_match('/^\\s*SELECT\\s*`?[a-zA-Z0-9]*`?\\.?\\*/i', $query)) {
+ $hints[] = 'Use