made data collectors private

src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml

@@ -23,8 +23,8 @@
             <argument type="service" id="logger" on-invalid="null" />
         </service>
 
-        <service id="doctrine.data_collector" class="%doctrine.data_collector.class%">
-            <tag name="data_collector" template="DoctrineBundle:Collector:db" />
+        <service id="doctrine.data_collector" class="%doctrine.data_collector.class%" public="false">
+            <tag name="data_collector" template="DoctrineBundle:Collector:db" id="db" />
             <argument type="service" id="doctrine.dbal.logger" />
         </service>
     </services>

src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml

@@ -80,8 +80,8 @@
     <service id="doctrine.odm.mongodb.logger" class="%doctrine.odm.mongodb.logger_class%">
       <argument type="service" id="logger" on-invalid="null" />
      </service>
-    <service id="doctrine.odm.mongodb.data_collector" class="%doctrine.odm.mongodb.data_collector_class%">
-      <tag name="data_collector" template="DoctrineMongoDBBundle:Collector:mongodb" />
+    <service id="doctrine.odm.mongodb.data_collector" class="%doctrine.odm.mongodb.data_collector_class%" public="false">
+      <tag name="data_collector" template="DoctrineMongoDBBundle:Collector:mongodb" id="mongodb" />
       <argument type="service" id="doctrine.odm.mongodb.logger" />
     </service>
 

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php

@@ -36,8 +36,10 @@ class ProfilerPass implements CompilerPassInterface
         foreach ($container->findTaggedServiceIds('data_collector') as $id => $attributes) {
             $priorities[] = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
             $collectors[] = $id;
-            if (isset($attributes[0]['template'])) {
-                $templates[] = $attributes[0]['template'];
+            if (isset($attributes[0]['template']) && isset($attributes[0]['id'])) {
+                $templates[] = array($attributes[0]['id'], $attributes[0]['template']);
+            } else {
+                $templates[] = null;
             }
         }
 

src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml

@@ -16,44 +16,44 @@
     </parameters>
 
     <services>
-        <service id="data_collector.config" class="%data_collector.config.class%">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:config" priority="255" />
+        <service id="data_collector.config" class="%data_collector.config.class%" public="false">
+            <tag name="data_collector" template="WebProfilerBundle:Collector:config" id="config" priority="255" />
             <argument type="service" id="kernel" />
             <argument type="service" id="router" on-invalid="ignore" />
         </service>
 
-        <service id="data_collector.request" class="%data_collector.request.class%">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:request" priority="250" />
+        <service id="data_collector.request" class="%data_collector.request.class%" public="false">
+            <tag name="data_collector" template="WebProfilerBundle:Collector:request" id="request" priority="250" />
         </service>
 
-        <service id="data_collector.security" class="%data_collector.security.class%">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:security" priority="245" />
+        <service id="data_collector.security" class="%data_collector.security.class%" public="false">
+            <tag name="data_collector" template="WebProfilerBundle:Collector:security" id="security" priority="245" />
             <argument type="service" id="security.context" on-invalid="ignore" />
         </service>
 
-        <service id="data_collector.exception" class="%data_collector.exception.class%">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:exception" priority="240" />
+        <service id="data_collector.exception" class="%data_collector.exception.class%" public="false">
+            <tag name="data_collector" template="WebProfilerBundle:Collector:exception" id="exception" priority="240" />
         </service>
 
-        <service id="data_collector.events" class="%data_collector.events.class%">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:events" priority="235" />
+        <service id="data_collector.events" class="%data_collector.events.class%" public="false">
+            <tag name="data_collector" template="WebProfilerBundle:Collector:events" id="events" priority="235" />
             <call method="setEventDispatcher">
                 <argument type="service" id="event_dispatcher" />
             </call>
         </service>
 
-        <service id="data_collector.logger" class="%data_collector.logger.class%">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:logger" priority="230" />
+        <service id="data_collector.logger" class="%data_collector.logger.class%" public="false">
+            <tag name="data_collector" template="WebProfilerBundle:Collector:logger" id="logger" priority="230" />
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
-        <service id="data_collector.timer" class="%data_collector.timer.class%">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:timer" priority="225" />
+        <service id="data_collector.timer" class="%data_collector.timer.class%" public="false">
+            <tag name="data_collector" template="WebProfilerBundle:Collector:timer" id="timer" priority="225" />
             <argument type="service" id="kernel" />
         </service>
 
-        <service id="data_collector.memory" class="%data_collector.memory.class%">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:memory" priority="220" />
+        <service id="data_collector.memory" class="%data_collector.memory.class%" public="false">
+            <tag name="data_collector" template="WebProfilerBundle:Collector:memory" id="memory" priority="220" />
         </service>
     </services>
 </container>

src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php

@@ -241,12 +241,12 @@ class ProfilerController extends ContainerAware
     protected function getTemplateNames($profiler)
     {
         $templates = array();
-        foreach ($this->container->getParameter('data_collector.templates') as $id => $template) {
-            if (!$this->container->has($id)) {
+        foreach ($this->container->getParameter('data_collector.templates') as $id => $arguments) {
+            if (null === $arguments) {
                 continue;
             }
 
-            $name = $this->container->get($id)->getName();
+            list($name, $template) = $arguments;
             if (!$profiler->has($name) || !$this->container->get('templating')->exists($template.'.twig.html')) {
                 continue;
             }