Merge pull request #9 from ppavlovic/master

Added __dbprofiler=2 to order profiler items by time

Author: ppavlovic

composer.json

@@ -30,7 +30,7 @@
         "g4/clean-core"  : "*",
         "g4/http"        : "*",
         "g4/di"          : "*",
-        "g4/profiler"    : ">=1.10.0",
+        "g4/profiler"    : ">=1.11.0",
         "g4/factory"     : "1.*",
         "twig/twig"      : "1.*",
         "twig/extensions": "^1.2",

src/Presenter/Formatter/FormatterAbstract.php

@@ -47,7 +47,12 @@ public function getDataTransfer()
     public function getProfilerData()
     {
         return $this->isProfilerEnabled()
-            ? ['profiler' =>  $this->getDataTransfer()->getProfiler()->getProfilerOutput($this->getDataTransfer()->getResponse()->getHttpResponseCode())]
+            ? [
+                'profiler' =>  $this->getDataTransfer()->getProfiler()->getProfilerOutput(
+                    $this->getDataTransfer()->getResponse()->getHttpResponseCode(),
+                    $this->getDbProfilerRequestParam()
+                )
+            ]
             : [];
     }
 
@@ -58,8 +63,17 @@ public function setDataTransfer(DataTransfer $dataTransfer)
     }
 
     private function isProfilerEnabled()
+    {
+        return $this->getDbProfilerRequestParam() !== null;
+    }
+
+    /**
+     * @return int|null
+     */
+    protected function getDbProfilerRequestParam()
     {
         return $this->getDataTransfer()->getHttpRequest()->has(Override::DB_PROFILER)
-            && $this->getDataTransfer()->getHttpRequest()->get(Override::DB_PROFILER) == 1;
+            ? (int) $this->getDataTransfer()->getHttpRequest()->get(Override::DB_PROFILER)
+            : null;
     }
-}
+}

src/Profiler.php

@@ -15,6 +15,11 @@ class Profiler
      */
     private $formatted;
 
+    /**
+     * @var array
+     */
+    private $timeline;
+
     /**
      * @var array|TickerAbstract[]
      */
@@ -57,10 +62,10 @@ public function setLogLevel($logLevel)
     /**
      * @return array
      */
-    public function getProfilerOutput($httpCode)
+    public function getProfilerOutput($httpCode, $dbProfiler = 0)
     {
         return $this->hasProfilers() && $this->shouldLogProfiler($httpCode)
-            ? $this->getFormatted()
+            ? $this->getFormatted($dbProfiler)
             : [];
     }
 
@@ -83,15 +88,32 @@ private function shouldLogProfiler($httpCode)
     /**
      * @return array
      */
-    private function getFormatted()
+    private function getFormatted($dbProfiler)
     {
         if (!$this->hasFormatted()) {
             $this->formatted = [];
-            foreach($this->profilers as $profiler) {
+            $this->timeline = [];
+            foreach ($this->profilers as $profiler) {
                 $this->formatted[$profiler->getName()] = $profiler->getFormatted();
+                $this->timeline[] = $profiler->getQueries();
+            }
+        }
+
+        if ((int) $dbProfiler === 1) {
+            return $this->formatted;
+        }
+
+        if ((int) $dbProfiler === 2) {
+            $timelineFormatted = [];
+            foreach ($this->timeline as $queries) {
+                foreach ($queries as $key => $query) {
+                    $timelineFormatted[$key] = $query;
+                }
             }
+            ksort($timelineFormatted, SORT_NUMERIC);
+            return $timelineFormatted;
         }
-        return $this->formatted;
+        return ['unsuported request parameter'];
     }
 
     /**