improve Templates collector

yongchengchen · Nov 1, 2016 · 46b732a · 46b732a
1 parent fe09a9d
commit 46b732a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 139 deletions.
diff --git a/Block/Collector/EventCollector.php b/Block/Collector/EventCollector.php
@@ -10,30 +10,20 @@
 namespace Yong\Magento2DebugBar\Block\Collector;
 
 use DebugBar\DataCollector\TimeDataCollector;
-use Yong\Magento2DebugBar\Block\ValueExporter;
 
 class EventCollector extends TimeDataCollector
 {
     /** @var Dispatcher */
     protected $events;
 
-    /** @var ValueExporter */
-    protected $exporter;
-
     public function __construct()
     {
         parent::__construct();
-        $this->exporter = new ValueExporter();
     }
 
     public function addEvent($name, $starttime, $endtime, $data)
     {
-        $params = [];
-        foreach ($data as $key => $value) {
-            $params[$key] = $this->exporter->exportValue($value);
-        }
-
-        $this->addMeasure($name, $starttime, $endtime, $params);
+        $this->addMeasure($name, $starttime, $endtime, $this->getDataFormatter()->formatVar($data));
     }
 
     public function collect()

diff --git a/Block/Collector/TemplateCollector.php b/Block/Collector/TemplateCollector.php
@@ -9,20 +9,17 @@
  */
 namespace Yong\Magento2DebugBar\Block\Collector;
 
-use DebugBar\DataCollector\TimeDataCollector;
-use DebugBar\Bridge\Twig\TwigCollector;
-use Yong\Magento2DebugBar\Block\ValueExporter;
+use DebugBar\DataCollector\RequestDataCollector;
 
-class TemplateCollector extends TwigCollector {
-	protected $templates = array();
+class TemplateCollector extends RequestDataCollector {
+    protected $templates = array();
     protected $collect_data;
 
     public function __construct($collectData = true)
     {
         $this->collect_data = $collectData;
-        $this->name = 'views';
+        $this->name = 'templates';
         $this->templates = array();
-        $this->exporter = new ValueExporter();
     }
 
     /**
@@ -32,36 +29,21 @@ public function __construct($collectData = true)
      */
     public function addView($block, $fileName, $dictionary)
     {
-    	$params = array();
-        foreach ($dictionary as $key => $value) {
-            $params[$key] = $this->exporter->exportValue($value);
-        }
-
-        $params['block'] = get_class($block);
         if ($block instanceof \Magento\Framework\View\Element\AbstractBlock) {
-            $params['name'] = $block->getNameInLayout();
-            $params['child'] = implode(';', $block->getChildNames());
+	    $block_name = $block->getNameInLayout();
+            $dictionary['class'] = get_class($block);
+            $dictionary['template'] = $fileName;
+            $dictionary['children'] = $block->getChildNames();
+            $this->templates[$block_name] = $this->getDataFormatter()->formatVar($dictionary);
         }
-
-        $this->templates[] = array(
-            'name' => $fileName,
-            'param_count' => count($params),
-            'block' => $params,
-            'type' => 'php',
-        );
     }
 
     public function collect()
     {
-        $templates = $this->templates;
-
-        return array(
-            'nb_templates' => count($templates),
-            'templates' => $templates,
-        );
+        $this->templates['total_amount'] = count(array_keys($this->templates));
+        return $this->templates;
     }
 
-
     public function getName()
     {
         return 'templates';
@@ -72,14 +54,14 @@ public function getWidgets()
         return array(
             'templates' => array(
                 'icon' => 'leaf',
-                'widget' => 'PhpDebugBar.Widgets.TemplatesWidget',
+                'widget' => 'PhpDebugBar.Widgets.VariableListWidget',
                 'map' => 'templates',
                 'default' => '[]'
             ),
             'templates:badge' => array(
-                'map' => 'templates.nb_templates',
-                'default' => 0
-            )
+                'map' => 'templates.total_amount',
+                'default' => 0,
+             ),
         );
     }
 }
diff --git a/Block/ValueExporter.php b/Block/ValueExporter.php
diff --git a/Framework/Stand.php b/Framework/Stand.php
@@ -72,6 +72,7 @@ public function InitObjectManagerHijacker(ObjectManagerInterface $objectManager
                 if ($this->debugbar_enabled && !$this->debugbar_collect_suppressed) {
                     $this->_objectManager = new ObjectManager($objectManager);
                     $cache = $this->_objectManager->get('Magento\Framework\App\Cache\StateInterface');
+                    $cache->setEnabled('layout', false);
                     $cache->setEnabled('full_page', false);
                 } else {
                     $this->_objectManager = $objectManager;