Show more request info

Author: barryvdh

DataCollector/MagentoCollector.php

@@ -4,6 +4,7 @@
 
 use DebugBar\DataCollector\DataCollector;
 use DebugBar\DataCollector\Renderable;
+use Magento\Framework\App\State;
 use Magento\Framework\AppInterface;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\App\ProductMetadataInterface;
@@ -16,16 +17,21 @@ class MagentoCollector extends DataCollector implements Renderable
     /** @var ResolverInterface */
     protected $resolver;
 
+    /** @var State  */
+    protected $state;
+
     /**
      * @param ProductMetadataInterface $productMetadata
      * @param ResolverInterface $localeResolver
      */
     public function __construct(
         ProductMetadataInterface $productMetadata,
-        ResolverInterface $localeResolver
+        ResolverInterface $localeResolver,
+        State $state
     ) {
         $this->productMetadata = $productMetadata;
         $this->resolver = $localeResolver;
+        $this->state = $state;
     }
 
     /**
@@ -36,6 +42,13 @@ public function collect()
         return array(
             "version" => $this->productMetadata->getVersion(),
             "locale" => $this->resolver->getLocale(),
+            'tooltip' => [
+                'PHP Version' => phpversion(),
+                'Magento Version' => $this->productMetadata->getVersion(),
+                'Mode' => $this->state->getMode(),
+                'Area' => $this->state->getAreaCode(),
+                'Locale' => $this->resolver->getLocale(),
+            ]
         );
     }
 
@@ -59,6 +72,10 @@ public function getWidgets()
                 "map" => "magento.version",
                 "default" => ""
             ),
+            "version:tooltip" => [
+                "map" => "magento.tooltip",
+                "default" => "{}"
+            ],
             "locale" => array(
                 "icon" => "flag",
                 "tooltip" => "Current locale",
@@ -67,4 +84,4 @@ public function getWidgets()
             ),
         );
     }
-}
+}

DataCollector/RequestCollector.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace Fruitcake\MagentoDebugbar\DataCollector;
+
+use DebugBar\DataCollector\DataCollector;
+use DebugBar\DataCollector\DataCollectorInterface;
+use DebugBar\DataCollector\Renderable;
+use Magento\Framework\App\Request\Http;
+
+class RequestCollector extends DataCollector implements DataCollectorInterface, Renderable
+{
+    /** @var Http $request */
+    protected $request;
+
+    /**
+     * Create a new SymfonyRequestCollector
+     *
+     * @param Http $request
+     */
+    public function __construct(Http $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return 'request';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getWidgets()
+    {
+        $widgets = [
+            "request" => [
+                "icon" => "tags",
+                "widget" => "PhpDebugBar.Widgets.HtmlVariableListWidget",
+                "map" => "request.data",
+                "default" => "{}"
+            ]
+        ];
+
+        $widgets['currentrequest'] = [
+            "icon" => "share",
+            "map" => "request.data.fullAction",
+            "link" => "request",
+            "default" => ""
+        ];
+        $widgets['currentrequest:tooltip'] = [
+            "map" => "request.tooltip",
+            "default" => "{}"
+        ];
+
+        return $widgets;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function collect()
+    {
+        $request = $this->request;
+
+        $data = [
+            'path' => $request->getPathInfo(),
+            'baseUrl' => $request->getDistroBaseUrl(),
+            'module' => $request->getModuleName(),
+            'controller' => $request->getControllerModule(),
+            'action' => $request->getActionName(),
+            'fullAction' => $request->getFullActionName(),
+            'route' => $request->getRouteName(),
+        ];
+
+
+        $tooltip = [
+            'path' => $data['path'],
+            'module' => $data['module'],
+            'fullAction' => $data['fullAction'],
+        ];
+
+        return [
+            'data' => $data,
+            'tooltip' => array_filter($tooltip)
+        ];
+    }
+
+}

JavascriptRenderer.php

@@ -9,6 +9,8 @@ class JavascriptRenderer extends BaseJavascriptRenderer
 {
     /** @var  UrlInterface */
     protected $url;
+    protected $ajaxHandlerAutoShow = false;
+    protected $ajaxHandlerEnableTab = true;
 
     public function __construct(MagentoDebugbar $debugBar, UrlInterface $url)
     {
@@ -47,4 +49,4 @@ protected function getAssetsHash($type)
         }
         return md5(serialize($assets));
     }
-}
+}

MagentoDebugbar.php

@@ -7,6 +7,7 @@
 use Fruitcake\MagentoDebugbar\DataCollector\MessagesCollector;
 use Fruitcake\MagentoDebugbar\Provider\StateProvider;
 use Fruitcake\MagentoDebugbar\Storage\FilesystemStorage;
+use Fruitcake\MagentoDebugbar\Storage\RequestIdGenerator;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\App\Request\Http as HttpRequest;
@@ -39,12 +40,14 @@ public function __construct(
         UrlInterface $url,
         FilesystemStorage $storage,
         StateProvider $state,
-        State $appState
+        State $appState,
+        RequestIdGenerator $requestIdGenerator
     ) {
         $this->url = $url;
         $this->state = $state;
         $this->appState = $appState;
         $this->setStorage($storage);
+        $this->setRequestIdGenerator($requestIdGenerator);
     }
 
     /**

Plugin/AddRequestCollectorPlugin.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Fruitcake\MagentoDebugbar\Plugin;
+
+use Fruitcake\MagentoDebugbar\DataCollector\MagentoCollector;
+use Fruitcake\MagentoDebugbar\DataCollector\RequestCollector;
+use Fruitcake\MagentoDebugbar\MagentoDebugbar;
+
+/**
+ * Adds the Magento collector
+ *
+ */
+class AddRequestCollectorPlugin extends AbstractAddCollectorPlugin
+{
+    public function __construct(MagentoDebugbar $debugbar, RequestCollector $collector)
+    {
+        parent::__construct($debugbar, $collector);
+    }
+}

Provider/StateProvider.php

@@ -52,7 +52,7 @@ public function isDebugbarEnabled()
      */
     public function shouldDebugbarRun()
     {
-        return $this->isDebugbarEnabled() && ! $this->isInternalDebugbarRequest();
+        return $this->isDebugbarEnabled() && ! $this->isInternalDebugbarRequest() && ! $this->isSystemRequest();
     }
 
     /**
@@ -92,6 +92,17 @@ public function isAjaxRequest()
         return $this->request->isAjax();
     }
 
+    /**
+     * Ignore requests from system or other tools
+     *
+     * @return bool
+     */
+    public function isSystemRequest()
+    {
+        // TODO check which we can ignore
+        return in_array($this->request->getModuleName(), []);
+    }
+
     /**
      * Check if the current request is an internal Debugbar request.
      *

etc/adminhtml/system.xml

@@ -54,6 +54,14 @@
                         <field id="dev/debugbar/enabled">1</field>
                     </depends>
                 </field>
+                <field id="request_collector" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Request Collector</label>
+                    <source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
+                    <comment>Shows Request info</comment>
+                    <depends>
+                        <field id="dev/debugbar/enabled">1</field>
+                    </depends>
+                </field>
             </group>
         </section>
     </system>

etc/config.xml

@@ -10,6 +10,7 @@
                 <time_collector>1</time_collector>
                 <event_collector>1</event_collector>
                 <queries_collector>1</queries_collector>
+                <request_collector>1</request_collector>
             </debugbar>
         </dev>
     </default>

etc/di.xml

@@ -19,6 +19,9 @@
         <plugin name="Fruitcake\MagentoDebugbar\Plugin\AddEventCollectorPlugin"
                 type="Fruitcake\MagentoDebugbar\Plugin\AddEventCollectorPlugin"
                 sortOrder="140" />
+        <plugin name="Fruitcake\MagentoDebugbar\Plugin\AddRequestCollectorPlugin"
+                type="Fruitcake\MagentoDebugbar\Plugin\AddRequestCollectorPlugin"
+                sortOrder="150" />
     </type>
 
 </config>