V1.1.0 (#2)

* v1.1.0

Author: cheprasov

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "cheprasov/php-simple-profiler",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Simple profiler for PHP",
   "homepage": "https://github.com/cheprasov/php-simple-profiler",
   "minimum-stability": "stable",

src/SimpleProfiler/Profiler.php

@@ -14,7 +14,7 @@
 
 class Profiler {
 
-    const VERSION = '1.0.0';
+    const VERSION = '1.1.0';
 
     const GROUP_DELIMITER = '.';
 
@@ -59,7 +59,8 @@ public static function clear() {
      */
     public static function start($name) {
         self::$timerNames[] = $name;
-        self::$workTimers[$name] = microtime(true);
+        $link = &self::$workTimers[$name];
+        $link = microtime(true);
     }
 
     /**
@@ -77,21 +78,21 @@ public static function stop($name = null) {
             self::$timerCounters[$name] = 1;
             self::$timers[$name] = $time - self::$workTimers[$name];
         } else {
-            self::$timerCounters[$name]++;
+            ++self::$timerCounters[$name];
             self::$timers[$name] += $time - self::$workTimers[$name];
         }
         unset(self::$workTimers[$name]);
     }
 
     /**
      * @param string $name
-     * @param int $incr
+     * @param int $count
      */
-    public static function count($name, $incr = 1) {
+    public static function count($name, $count = 1) {
         if (isset(self::$counters[$name])) {
-            self::$counters[$name] += $incr;
+            self::$counters[$name] += $count;
         } else {
-            self::$counters[$name] = $incr;
+            self::$counters[$name] = $count;
         }
     }
 
@@ -103,7 +104,7 @@ public static function getTimerStat() {
         $groups = [];
         foreach (self::$timers as $name => $time) {
             $group = null;
-            if (strpos($name, self::GROUP_DELIMITER)) { // point pos > 0
+            if (strpos($name, self::GROUP_DELIMITER)) { // pos > 0
                 list($group, $shortName) = explode(self::GROUP_DELIMITER, $name, 2);
                 if (!isset($result[$group])) {
                     $result[$group] = [];
@@ -146,12 +147,16 @@ protected static function calculateGroupData(array &$groups) {
     }
 
     /**
-     *
+     * @param string[] $fields
+     * @return string
      */
-    public static function echoTimerStat() {
+    public static function getTimerTableStat($fields = []) {
+        if (!$fields) {
+            $fields = ['group', 'name', 'count', 'time', 'single', 'cost'];
+        }
         $stats = self::getTimerStat();
         $Table = new Console_Table();
-        $Table->setHeaders(['GROUP', 'NAME', 'COUNT', 'TIME', 'SINGLE', 'COST']);
+        $Table->setHeaders($fields);
         $first = true;
         foreach ($stats as $item) {
             if ($first) {
@@ -160,16 +165,22 @@ public static function echoTimerStat() {
                 $Table->addSeparator();
             }
             if (isset($item['name'])) {
-                self::addRowToTable($Table, $item);
+                self::addRowToTable($Table, $item, $fields);
             } else {
                 foreach ($item as $elem) {
-                    self::addRowToTable($Table, $elem);
+                    self::addRowToTable($Table, $elem, $fields);
                 }
             }
         }
-        echo "\n", $Table->getTable();
+        return trim($Table->getTable());
     }
 
+    /**
+     * @param array $fields
+     */
+    public static function echoTimerStat($fields = []) {
+        echo "\n", self::getTimerTableStat($fields), "\n";
+    }
 
     /**
      * @return array
@@ -186,23 +197,37 @@ public static function getCounterStat() {
     }
 
     /**
-     *
+     * @return string
      */
-    public static function echoCounterStat() {
+    public static function getCounterTableStat() {
         $stats = self::getCounterStat();
         $Table = new Console_Table();
-        $Table->setHeaders(['NAME', 'COUNT']);
+        $Table->setHeaders(['name', 'count']);
         foreach ($stats as $item) {
-            self::addRowToTable($Table, $item);
+            self::addRowToTable($Table, $item, ['name', 'count']);
         }
-        echo "\n", $Table->getTable();
+        return trim($Table->getTable());
+    }
+
+    /**
+     *
+     */
+    public static function echoCounterStat() {
+        echo "\n", self::getCounterTableStat(), "\n";
     }
 
     /**
      * @param Console_Table $Table
      * @param array $item
+     * @param string[] $fields
      */
-    protected static function addRowToTable(Console_Table $Table, array $item) {
-        $Table->addRow($item);
+    protected static function addRowToTable(Console_Table $Table, array $item, array $fields) {
+        $row = [];
+        foreach ($fields as $field) {
+            if (array_key_exists($field, $item)) {
+                $row[] = $item[$field];
+            }
+        }
+        $Table->addRow($row);
     }
 }

tests/Unit/ProfilerTest.php

@@ -96,6 +96,28 @@ public function testCommonGroups2() {
         $this->checkTimer('one', 10, '0.15', '0.015', $result['bar']['one']);
     }
 
+    public function testTableCommonGroups() {
+        for ($i = 0; $i < 10; ++$i) {
+            Profiler::start('foo.one');
+            usleep(10000);
+            Profiler::stop();
+            Profiler::start('bar.two');
+            usleep(15000);
+            Profiler::stop();
+        }
+
+        $this->assertSame(
+            "+-------+-------+------+\n" .
+            "| cost  | count | name |\n" .
+            "+-------+-------+------+\n" .
+            "| 100 % | 10    | one  |\n" .
+            "+-------+-------+------+\n" .
+            "| 100 % | 10    | two  |\n" .
+            "+-------+-------+------+",
+            Profiler::getTimerTableStat(['cost', 'count', 'name'])
+        );
+    }
+
     public function testCounter1() {
         Profiler::count('foo');
         Profiler::count('bar');