Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit 1efcdbaf99f1 · 2014-07-03T15:29:28.000-05:00
diff --git a/book/testing.rst b/book/testing.rst
@@ -487,6 +487,52 @@ To get the Profiler for the last request, do the following::
 For specific details on using the profiler inside a test, see the
 :doc:`/cookbook/testing/profiling` cookbook entry.
 
+To avoid collecting data in each test you can set the ``collect`` parameter
+in the configuration:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config_test.yml
+
+        # ...
+        framework:
+            profiler:
+                enabled: true
+                collect: false
+
+    .. code-block:: xml
+
+        <!-- app/config/config.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:framework="http://symfony.com/schema/dic/symfony"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+            <!-- ... -->
+
+            <framework:config>
+                <framework:profiler enabled="true" collect="false" />
+            </framework:config>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+
+        // ...
+        $container->loadFromExtension('framework', array(
+            'profiler' => array(
+                'enabled' => true,
+                'collect' => false,
+            ),
+        ));
+
+In this way only tests that call ``enableProfiler()`` will collect data.
+
 Redirecting
 ~~~~~~~~~~~
 
diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst
@@ -52,11 +52,15 @@ Active Core Members
     Process_ component;
 
   * **Nicolas Grekas** (:merger:`nicolas-grekas`) can merge into the Debug_
-    component.
+    component;
+
+  * **Christophe Coevoet** (:merger:`stof`) can merge into the BrowserKit_,
+    Config_, Console_, DependencyInjection_, DomCrawler_, EventDispatcher_,
+    HttpFoundation_, HttpKernel_, Serializer_, Stopwatch_, DoctrineBridge_,
+    MonologBridge_, and TwigBridge_ components.
 
 * **Deciders**:
 
-  * **Christophe Coevoet** (:decider:`stof`);
   * **Jakub Zalas** (:decider:`jakzal`);
   * **Jordi Boggiano** (:decider:`seldaek`);
   * **Lukas Kahwe Smith** (:decider:`lsmith77`).
@@ -137,13 +141,26 @@ discretion of the **Project Leader**.
 .. [1] Minor changes comprise typos, DocBlock fixes, code standards
        violations, and minor CSS, JavaScript and HTML modifications.
 
+.. _BrowserKit: https://github.com/symfony/BrowserKit
+.. _Config: https://github.com/symfony/Config
+.. _Console: https://github.com/symfony/Console
+.. _Debug: https://github.com/symfony/Debug
+.. _DependencyInjection: https://github.com/symfony/DependencyInjection
+.. _DoctrineBridge: https://github.com/symfony/DoctrineBridge
+.. _EventDispatcher: https://github.com/symfony/EventDispatcher
+.. _DomCrawler: https://github.com/symfony/DomCrawler
 .. _Form: https://github.com/symfony/Form
-.. _Validator: https://github.com/symfony/Validator
+.. _HttpFoundation: https://github.com/symfony/HttpFoundation
+.. _HttpKernel: https://github.com/symfony/HttpKernel
 .. _Icu: https://github.com/symfony/Icu
 .. _Intl: https://github.com/symfony/Intl
 .. _Locale: https://github.com/symfony/Locale
+.. _MonologBridge: https://github.com/symfony/MonologBridge
 .. _OptionsResolver: https://github.com/symfony/OptionsResolver
+.. _Process: https://github.com/symfony/Process
 .. _PropertyAccess: https://github.com/symfony/PropertyAccess
 .. _Routing: https://github.com/symfony/Routing
-.. _Process: https://github.com/symfony/Process
-.. _Debug: https://github.com/symfony/Debug
+.. _Serializer: https://github.com/symfony/Serializer
+.. _Stopwatch: https://github.com/symfony/Stopwatch
+.. _TwigBridge: https://github.com/symfony/TwigBridge
+.. _Validator: https://github.com/symfony/Validator
