merged noelg/profiler

Author: fabpot

Profiler/PdoProfilerStorage.php

@@ -53,23 +53,36 @@ public function find($ip, $url, $limit)
         $criteria = $criteria ? 'WHERE '.implode(' AND ', $criteria) : '';
 
         $db = $this->initDb();
-        $tokens = $this->fetch($db, 'SELECT token, ip, url, time FROM data '.$criteria.' ORDER BY time DESC LIMIT '.((integer) $limit), $args);
+        $tokens = $this->fetch($db, 'SELECT token, ip, url, time, parent FROM data '.$criteria.' ORDER BY time DESC LIMIT '.((integer) $limit), $args);
         $this->close($db);
 
         return $tokens;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+     public function findChildren($token)
+     {
+         $db = $this->initDb();
+         $args = array(':token' => $token);
+         $tokens = $this->fetch($db, 'SELECT token FROM data WHERE parent = :token LIMIT 1', $args);
+         $this->close($db);
+
+        return $tokens;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function read($token)
     {
         $db = $this->initDb();
         $args = array(':token' => $token);
-        $data = $this->fetch($db, 'SELECT data, ip, url, time FROM data WHERE token = :token LIMIT 1', $args);
+        $data = $this->fetch($db, 'SELECT data, parent, ip, url, time FROM data WHERE token = :token LIMIT 1', $args);
         $this->close($db);
         if (isset($data[0]['data'])) {
-            return array($data[0]['data'], $data[0]['ip'], $data[0]['url'], $data[0]['time']);
+            return array($data[0]['data'], $data[0]['parent'], $data[0]['ip'], $data[0]['url'], $data[0]['time']);
         }
 
         return false;

Profiler/Profiler.php

@@ -35,6 +35,7 @@ class Profiler
     protected $url;
     protected $time;
     protected $empty;
+    protected $children;
 
     /**
      * Constructor.
@@ -142,7 +143,7 @@ public function setToken($token)
         $this->token = $token;
 
         if (false !== $items = $this->storage->read($token)) {
-            list($data, $this->ip, $this->url, $this->time) = $items;
+            list($data, $this->parent, $this->ip, $this->url, $this->time) = $items;
             $this->set(unserialize(base64_decode($data)));
 
             $this->empty = false;
@@ -151,6 +152,30 @@ public function setToken($token)
         }
     }
 
+    /**
+     * Sets the parent token
+     *
+     * @param string $parent The parent token
+     */
+    public function setParent($parent)
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Returns an instance of the parent token
+     *
+     * @return Profiler
+     */
+    public function getParentToken()
+    {
+        if (null !== $this->parent) {
+            return $this->loadFromToken($this->parent);
+        }
+
+        return null;
+    }
+
     /**
      * Gets the token.
      *
@@ -229,6 +254,23 @@ public function find($ip, $url, $limit)
         return $this->storage->find($ip, $url, $limit);
     }
 
+    /**
+     * Finds children profilers.
+     *
+     * @return array An array of Profiler
+     */
+    public function getChildren()
+    {
+        if (null === $this->children) {
+            $this->children = array();
+            foreach ($this->storage->findChildren($this->token) as $token) {
+                $this->children[] = $this->loadFromToken($token['token']);
+            }
+        }
+
+        return $this->children;
+    }
+
     /**
      * Collects data for the given Response.
      *
@@ -248,7 +290,6 @@ public function collect(Request $request, Response $response, \Exception $except
             $collector->collect($request, $response, $exception);
         }
 
-        $this->parent = '';
         $this->ip     = $request->server->get('REMOTE_ADDR');
         $this->url    = $request->getUri();
         $this->time   = time();

Profiler/ProfilerStorageInterface.php

@@ -29,6 +29,15 @@ interface ProfilerStorageInterface
      */
     function find($ip, $url, $limit);
 
+    /**
+     * Finds profiler tokens for the given parent token.
+     *
+     * @param string $token    The parent token
+     *
+     * @return array An array of tokens
+     */
+    function findChildren($token);
+
     /**
      * Reads data associated with the given token.
      *