refactored the profiler classes

src/Symfony/Components/DependencyInjection/Loader/LoaderExtension.php

@@ -49,7 +49,7 @@ public function setConfiguration($name, $resource)
     public function load($tag, array $config, BuilderConfiguration $configuration)
     {
         if (!method_exists($this, $method = $tag.'Load')) {
-            throw new \InvalidArgumentException(sprintf('The tag "%s" is not defined in the "%s" extension.', $tag, $this->getNamespace()));
+            throw new \InvalidArgumentException(sprintf('The tag "%s:%s" is not defined in the "%s" extension.', $this->getAlias(), $tag, $this->getAlias()));
         }
 
         return $this->$method($config, $configuration);

src/Symfony/Framework/ProfilerBundle/Listener/DataCollector.php → src/Symfony/Components/HttpKernel/Listener/Profiling.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Symfony\Framework\ProfilerBundle\Listener;
+namespace Symfony\Components\HttpKernel\Listener;
 
 use Symfony\Components\EventDispatcher\EventDispatcher;
 use Symfony\Components\EventDispatcher\Event;
 use Symfony\Components\HttpKernel\Response;
 use Symfony\Components\HttpKernel\HttpKernelInterface;
-use Symfony\Framework\ProfilerBundle\Profiler;
+use Symfony\Components\HttpKernel\Profiler\Profiler;
 
 /*
  * This file is part of the Symfony framework.
@@ -18,13 +18,13 @@
  */
 
 /**
- * DataCollector collects data for the current request by listening to the core.response event.
+ * Profiling collects data for the current request by listening to the core.response event.
  *
  * @package    Symfony
  * @subpackage Framework_ProfilerBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class DataCollector
+class Profiling
 {
     protected $profiler;
 

src/Symfony/Framework/ProfilerBundle/Listener/WebDebugToolbar.php → src/Symfony/Components/HttpKernel/Listener/WebDebugToolbar.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Symfony\Framework\ProfilerBundle\Listener;
+namespace Symfony\Components\HttpKernel\Listener;
 
 use Symfony\Components\DependencyInjection\ContainerInterface;
 use Symfony\Components\EventDispatcher\EventDispatcher;
 use Symfony\Components\EventDispatcher\Event;
 use Symfony\Components\HttpKernel\Response;
 use Symfony\Components\HttpKernel\HttpKernelInterface;
-use Symfony\Framework\ProfilerBundle\Profiler;
+use Symfony\Components\HttpKernel\Profiler\Profiler;
 
 /*
  * This file is part of the Symfony framework.

src/Symfony/Foundation/LoggerInterface.php → src/Symfony/Components/HttpKernel/LoggerInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Foundation;
+namespace Symfony\Components\HttpKernel;
 
 /*
  * This file is part of the Symfony framework.

src/Symfony/Framework/ProfilerBundle/DataCollector/DataCollector.php → src/Symfony/Components/HttpKernel/Profiler/DataCollector/DataCollector.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace Symfony\Framework\ProfilerBundle\DataCollector;
+namespace Symfony\Components\HttpKernel\Profiler\DataCollector;
 
-use Symfony\Components\DependencyInjection\ContainerInterface;
-use Symfony\Framework\ProfilerBundle\Profiler;
+use Symfony\Components\HttpKernel\Profiler\Profiler;
 
 /*
  * This file is part of the Symfony framework.
@@ -18,20 +17,14 @@
  * DataCollector.
  *
  * @package    Symfony
- * @subpackage Framework_ProfilerBundle
+ * @subpackage Components_HttpKernel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 abstract class DataCollector implements DataCollectorInterface
 {
     protected $profiler;
-    protected $container;
     protected $data;
 
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
     public function getData()
     {
         return $this->data;
@@ -42,8 +35,6 @@ public function setData($data)
         $this->data = $data;
     }
 
-    abstract public function collect();
-
     public function setProfiler(Profiler $profiler)
     {
         $this->profiler = $profiler;

src/Symfony/Framework/ProfilerBundle/DataCollector/DataCollectorInterface.php → src/Symfony/Components/HttpKernel/Profiler/DataCollector/DataCollectorInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Framework\ProfilerBundle\DataCollector;
+namespace Symfony\Components\HttpKernel\Profiler\DataCollector;
 
-use Symfony\Framework\ProfilerBundle\Profiler;
+use Symfony\Components\HttpKernel\Profiler\Profiler;
 
 /*
  * This file is part of the Symfony framework.
@@ -17,14 +17,18 @@
  * DataCollectorInterface.
  *
  * @package    Symfony
- * @subpackage Framework_ProfilerBundle
+ * @subpackage Components_HttpKernel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 interface DataCollectorInterface
 {
-    public function setProfiler(Profiler $profiler);
+    function getData();
 
-    public function getData();
+    function setData($data);
 
-    public function getName();
+    function getName();
+
+    function collect();
+
+    function setProfiler(Profiler $profiler);
 }

src/Symfony/Framework/ProfilerBundle/DataCollector/MemoryDataCollector.php → src/Symfony/Components/HttpKernel/Profiler/DataCollector/MemoryDataCollector.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\ProfilerBundle\DataCollector;
+namespace Symfony\Components\HttpKernel\Profiler\DataCollector;
 
 /*
  * This file is part of the Symfony framework.
@@ -15,7 +15,7 @@
  * MemoryDataCollector.
  *
  * @package    Symfony
- * @subpackage Framework_ProfilerBundle
+ * @subpackage Components_HttpKernel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class MemoryDataCollector extends DataCollector

src/Symfony/Framework/ProfilerBundle/Profiler.php → src/Symfony/Components/HttpKernel/Profiler/Profiler.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Symfony\Framework\ProfilerBundle;
+namespace Symfony\Components\HttpKernel\Profiler;
 
-use Symfony\Components\DependencyInjection\ContainerInterface;
 use Symfony\Components\HttpKernel\Response;
-use Symfony\Framework\ProfilerBundle\ProfilerStorage;
-use Symfony\Foundation\LoggerInterface;
+use Symfony\Components\HttpKernel\Profiler\ProfilerStorage;
+use Symfony\Components\HttpKernel\Profiler\DataCollector\DataCollectorInterface;
+use Symfony\Components\HttpKernel\LoggerInterface;
 
 /*
  * This file is part of the Symfony framework.
@@ -20,24 +20,21 @@
  * Profiler.
  *
  * @package    Symfony
- * @subpackage Framework_ProfilerBundle
+ * @subpackage Components_HttpKernel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class Profiler implements \ArrayAccess
 {
-    protected $container;
     protected $profilerStorage;
     protected $collectors;
     protected $response;
     protected $logger;
 
-    public function __construct(ContainerInterface $container, ProfilerStorage $profilerStorage, LoggerInterface $logger = null)
+    public function __construct(ProfilerStorage $profilerStorage, LoggerInterface $logger = null)
     {
-        $this->container = $container;
         $this->profilerStorage = $profilerStorage;
         $this->logger = $logger;
-        $this->initCollectors();
-        $this->loadCollectorData();
+        $this->collectors = array();
     }
 
     public function __clone()
@@ -81,16 +78,6 @@ public function collect(Response $response)
         }
     }
 
-    public function getProfilerStorage()
-    {
-        return $this->profilerStorage;
-    }
-
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
     public function loadCollectorData()
     {
         try {
@@ -104,11 +91,34 @@ public function loadCollectorData()
         }
     }
 
+    public function getProfilerStorage()
+    {
+        return $this->profilerStorage;
+    }
+
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
     public function getCollectors()
     {
         return $this->collectors;
     }
 
+    public function setCollectors(array $collectors = array())
+    {
+        $this->collectors = array();
+        foreach ($collectors as $name => $collector) {
+            $this->setCollector($name, $collector);
+        }
+    }
+
+    public function setCollector($name, DataCollectorInterface $collector)
+    {
+        $this->collectors[$name] = $collector;
+    }
+
     public function hasCollector($name)
     {
         return isset($this->collectors[$name]);
@@ -169,24 +179,4 @@ public function offsetUnset($name)
     {
         throw new \LogicException('The Collectors cannot be removed.');
     }
-
-    protected function initCollectors()
-    {
-        $config = $this->container->findAnnotatedServiceIds('data_collector');
-        $ids = array();
-        $coreCollectors = array();
-        $userCollectors = array();
-        foreach ($config as $id => $attributes) {
-            $collector = $this->container->getService($id);
-            $collector->setProfiler($this);
-
-            if (isset($attributes[0]['core']) && $attributes[0]['core']) {
-                $coreCollectors[$collector->getName()] = $collector;
-            } else {
-                $userCollectors[$collector->getName()] = $collector;
-            }
-        }
-
-        $this->collectors = array_merge($coreCollectors, $userCollectors);
-    }
 }

src/Symfony/Framework/ProfilerBundle/ProfilerStorage.php → src/Symfony/Components/HttpKernel/Profiler/ProfilerStorage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\ProfilerBundle;
+namespace Symfony\Components\HttpKernel\Profiler;
 
 /*
  * This file is part of the Symfony framework.
@@ -15,7 +15,7 @@
  * ProfilerStorage.
  *
  * @package    Symfony
- * @subpackage Framework_ProfilerBundle
+ * @subpackage Components_HttpKernel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
 class ProfilerStorage
@@ -100,7 +100,7 @@ protected function initDb($readOnly = true)
         } elseif (class_exists('\PDO') && in_array('sqlite', \PDO::getAvailableDrivers(), true)) {
             $db = new \PDO('sqlite:'.$this->store);
         } else {
-            throw new \RuntimeException('You need to enable either the SQLite or PDO_SQLite extension for the ProfilerBundle to run properly.');
+            throw new \RuntimeException('You need to enable either the SQLite or PDO_SQLite extension for the profiler to run properly.');
         }
 
         $db->exec('CREATE TABLE IF NOT EXISTS data (token STRING, data STRING, created_at INTEGER)');

src/Symfony/Foundation/Debug/EventDispatcher.php

@@ -5,7 +5,7 @@
 use Symfony\Foundation\EventDispatcher as BaseEventDispatcher;
 use Symfony\Components\EventDispatcher\EventDispatcherInterface;
 use Symfony\Components\EventDispatcher\Event;
-use Symfony\Foundation\LoggerInterface;
+use Symfony\Components\HttpKernel\LoggerInterface;
 use Symfony\Components\DependencyInjection\ContainerInterface;
 
 /*

src/Symfony/Framework/DoctrineBundle/DataCollector/DoctrineDataCollector.php

@@ -2,7 +2,8 @@
 
 namespace Symfony\Framework\DoctrineBundle\DataCollector;
 
-use Symfony\Framework\ProfilerBundle\DataCollector\DataCollector;
+use Symfony\Components\HttpKernel\Profiler\DataCollector\DataCollector;
+use Symfony\Components\DependencyInjection\ContainerInterface;
 
 /*
  * This file is part of the Symfony framework.
@@ -22,6 +23,13 @@
  */
 class DoctrineDataCollector extends DataCollector
 {
+    protected $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
     public function collect()
     {
         $this->data = array();

src/Symfony/Framework/DoctrineBundle/Logger/DbalLogger.php

@@ -2,7 +2,7 @@
 
 namespace Symfony\Framework\DoctrineBundle\Logger;
 
-use Symfony\Foundation\LoggerInterface;
+use Symfony\Components\HttpKernel\LoggerInterface;
 use Doctrine\DBAL\Logging\DebugStack;
 
 /*