From 898adc6ef9c8568af45b9cc36f989f537ce3eeb5 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 25 Jun 2010 16:40:36 +0200
Subject: [PATCH] created a new collectors.xml file for a better separation

---
 .../DependencyInjection/WebExtension.php      |  1 +
 .../Resources/config/collectors.xml           | 34 +++++++++++++++++++
 .../Resources/config/profiling.xml            | 23 -------------
 3 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 src/Symfony/Framework/FoundationBundle/Resources/config/collectors.xml

diff --git a/src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php b/src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
index 05d133d261..8caf1f864f 100644
--- a/src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
+++ b/src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
@@ -73,6 +73,7 @@ class WebExtension extends LoaderExtension
                 if (!$configuration->hasDefinition('profiler')) {
                     $loader = new XmlFileLoader(__DIR__.'/../Resources/config');
                     $configuration->merge($loader->load('profiling.xml'));
+                    $configuration->merge($loader->load('collectors.xml'));
                 }
             } elseif ($configuration->hasDefinition('profiler')) {
                 $configuration->getDefinition('profiling')->clearAnnotations();
diff --git a/src/Symfony/Framework/FoundationBundle/Resources/config/collectors.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/collectors.xml
new file mode 100644
index 0000000000..7204aeac01
--- /dev/null
+++ b/src/Symfony/Framework/FoundationBundle/Resources/config/collectors.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="data_collector.config.class">Symfony\Framework\FoundationBundle\DataCollector\ConfigDataCollector</parameter>
+        <parameter key="data_collector.app.class">Symfony\Framework\FoundationBundle\DataCollector\AppDataCollector</parameter>
+        <parameter key="data_collector.timer.class">Symfony\Framework\FoundationBundle\DataCollector\TimerDataCollector</parameter>
+        <parameter key="data_collector.memory.class">Symfony\Components\HttpKernel\Profiler\DataCollector\MemoryDataCollector</parameter>
+    </parameters>
+
+    <services>
+        <service id="data_collector.config" class="%data_collector.config.class%">
+            <annotation name="data_collector" core="true" />
+            <argument type="service" id="service_container" />
+        </service>
+
+        <service id="data_collector.app" class="%data_collector.app.class%">
+            <annotation name="data_collector" core="true" />
+            <argument type="service" id="service_container" />
+        </service>
+
+        <service id="data_collector.timer" class="%data_collector.timer.class%">
+            <annotation name="data_collector" core="true" />
+            <argument type="service" id="service_container" />
+        </service>
+
+        <service id="data_collector.memory" class="%data_collector.memory.class%">
+            <annotation name="data_collector" core="true" />
+        </service>
+    </services>
+</container>
diff --git a/src/Symfony/Framework/FoundationBundle/Resources/config/profiling.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/profiling.xml
index bbed4add29..05e044041a 100644
--- a/src/Symfony/Framework/FoundationBundle/Resources/config/profiling.xml
+++ b/src/Symfony/Framework/FoundationBundle/Resources/config/profiling.xml
@@ -10,10 +10,6 @@
         <parameter key="profiler.storage.file">%kernel.cache_dir%/profiler.db</parameter>
         <parameter key="profiler.storage.lifetime">86400</parameter>
         <parameter key="profiling.class">Symfony\Components\HttpKernel\Listener\Profiling</parameter>
-        <parameter key="data_collector.config.class">Symfony\Framework\FoundationBundle\DataCollector\ConfigDataCollector</parameter>
-        <parameter key="data_collector.app.class">Symfony\Framework\FoundationBundle\DataCollector\AppDataCollector</parameter>
-        <parameter key="data_collector.timer.class">Symfony\Framework\FoundationBundle\DataCollector\TimerDataCollector</parameter>
-        <parameter key="data_collector.memory.class">Symfony\Components\HttpKernel\Profiler\DataCollector\MemoryDataCollector</parameter>
     </parameters>
 
     <services>
@@ -33,24 +29,5 @@
             <annotation name="kernel.listener" />
             <argument type="service" id="profiler" />
         </service>
-
-        <service id="data_collector.config" class="%data_collector.config.class%">
-            <annotation name="data_collector" core="true" />
-            <argument type="service" id="service_container" />
-        </service>
-
-        <service id="data_collector.app" class="%data_collector.app.class%">
-            <annotation name="data_collector" core="true" />
-            <argument type="service" id="service_container" />
-        </service>
-
-        <service id="data_collector.timer" class="%data_collector.timer.class%">
-            <annotation name="data_collector" core="true" />
-            <argument type="service" id="service_container" />
-        </service>
-
-        <service id="data_collector.memory" class="%data_collector.memory.class%">
-            <annotation name="data_collector" core="true" />
-        </service>
     </services>
 </container>