Update font awesome, use vardumper layout

barryvdh · barryvdh · commit e5257dc121cb · 2017-07-21T15:50:18.000+02:00
diff --git a/src/DataCollector/RequestCollector.php b/src/DataCollector/RequestCollector.php
@@ -12,7 +12,7 @@
  * Based on \Symfony\Component\HttpKernel\DataCollector\RequestDataCollector by Fabien Potencier <fabien@symfony.com>
  *
  */
-class SymfonyRequestCollector extends DataCollector implements DataCollectorInterface, Renderable
+class RequestCollector extends DataCollector implements DataCollectorInterface, Renderable
 {
     /** @var \Symfony\Component\HttpFoundation\Request $request */
     protected $request;
diff --git a/src/DataCollector/RouteCollector.php b/src/DataCollector/RouteCollector.php
@@ -14,7 +14,7 @@
  * https://github.com/laravel/framework/blob/master/src/Illuminate/Foundation/Console/RoutesCommand.php
  *
  */
-class IlluminateRouteCollector extends DataCollector implements Renderable
+class RouteCollector extends DataCollector implements Renderable
 {
     /**
      * The router instance.
diff --git a/src/JavascriptRenderer.php b/src/JavascriptRenderer.php
@@ -56,9 +56,24 @@ public function renderHead()
             $html .= '<script type="text/javascript">jQuery.noConflict(true);</script>' . "\n";
         }
 
+        $html .= $this->getInlineHtml();
+
+
         return $html;
     }
 
+    protected function getInlineHtml()
+    {
+        $html = '';
+
+        foreach (['head', 'css', 'js'] as $asset) {
+            foreach ($this->getAssets('inline_' . $asset) as $item) {
+                $html .= $item . "\n";
+            }
+        }
+
+        return $html;
+    }
     /**
      * Get the last modified time of any assets.
      *
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -9,13 +9,14 @@
 use Barryvdh\Debugbar\DataCollector\MultiAuthCollector;
 use Barryvdh\Debugbar\DataCollector\QueryCollector;
 use Barryvdh\Debugbar\DataCollector\SessionCollector;
-use Barryvdh\Debugbar\DataCollector\SymfonyRequestCollector;
+use Barryvdh\Debugbar\DataCollector\RequestCollector;
 use Barryvdh\Debugbar\DataCollector\ViewCollector;
 use Barryvdh\Debugbar\Storage\FilesystemStorage;
 use DebugBar\Bridge\MonologCollector;
 use DebugBar\Bridge\SwiftMailer\SwiftLogCollector;
 use DebugBar\Bridge\SwiftMailer\SwiftMailCollector;
 use DebugBar\DataCollector\ConfigCollector;
+use DebugBar\DataCollector\DataCollectorInterface;
 use DebugBar\DataCollector\ExceptionsCollector;
 use DebugBar\DataCollector\MemoryCollector;
 use DebugBar\DataCollector\MessagesCollector;
@@ -222,7 +223,7 @@ function ($view, $data = []) use ($debugbar) {
 
         if (!$this->isLumen() && $this->shouldCollect('route')) {
             try {
-                $this->addCollector($this->app->make('Barryvdh\Debugbar\DataCollector\IlluminateRouteCollector'));
+                $this->addCollector($this->app->make('Barryvdh\Debugbar\DataCollector\RouteCollector'));
             } catch (\Exception $e) {
                 $this->addThrowable(
                     new Exception(
@@ -473,6 +474,25 @@ public function shouldCollect($name, $default = false)
         return $this->app['config']->get('debugbar.collectors.' . $name, $default);
     }
 
+    /**
+     * Adds a data collector
+     *
+     * @param DataCollectorInterface $collector
+     *
+     * @throws DebugBarException
+     * @return $this
+     */
+    public function addCollector(DataCollectorInterface $collector)
+    {
+        parent::addCollector($collector);
+
+        if (method_exists($collector, 'useHtmlVarDumper')) {
+            $collector->useHtmlVarDumper();
+        }
+
+        return $this;
+    }
+
     /**
      * Handle silenced errors
      *
@@ -626,7 +646,7 @@ public function modifyResponse(Request $request, Response $response)
 
         if ($this->shouldCollect('symfony_request', true) && !$this->hasCollector('request')) {
             try {
-                $this->addCollector(new SymfonyRequestCollector($request, $response, $sessionManager));
+                $this->addCollector(new RequestCollector($request, $response, $sessionManager));
             } catch (\Exception $e) {
                 $this->addThrowable(
                     new Exception(
diff --git a/src/Resources/laravel-debugbar.css b/src/Resources/laravel-debugbar.css
@@ -18,14 +18,23 @@ a.phpdebugbar-restore-btn {
     border-right-color: #ddd !important;
 }
 
-div.phpdebugbar code, div.phpdebugbar pre {
+div.phpdebugbar code, div.phpdebugbar pre, div.phpdebugbar samp {
     background: none;
-    font-family: monospace;
+    font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
     font-size: 1em;
     border: 0;
     padding: 0;
 }
 
+div.phpdebugbar code, div.phpdebugbar pre {
+    color: #000;
+}
+
+div.phpdebugbar pre.sf-dump {
+    color: #a0a000;
+    outline: 0;
+}
+
 div.phpdebugbar-body {
     border-top: none;
 }
diff --git a/src/Resources/vendor/font-awesome/style.css b/src/Resources/vendor/font-awesome/style.css

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Based on \Symfony\Component\HttpKernel\DataCollector\RequestDataCollector by Fabien Potencier <fabien@symfony.com>`
`13`	`13`	`*`
`14`	`14`	`*/`
`15`		`-class SymfonyRequestCollector extends DataCollector implements DataCollectorInterface, Renderable`
	`15`	`+class RequestCollector extends DataCollector implements DataCollectorInterface, Renderable`
`16`	`16`	`{`
`17`	`17`	`/** @var \Symfony\Component\HttpFoundation\Request $request */`
`18`	`18`	`protected $request;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* https://github.com/laravel/framework/blob/master/src/Illuminate/Foundation/Console/RoutesCommand.php`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`		`-class IlluminateRouteCollector extends DataCollector implements Renderable`
	`17`	`+class RouteCollector extends DataCollector implements Renderable`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`	`20`	`* The router instance.`