Tweaks and fixes

Author: javiereguiluz

cookbook/profiler/data_collector.rst

@@ -46,12 +46,14 @@ properties.
     store objects that cannot be serialized (like PDO objects), or you need
     to provide your own ``serialize()`` method.
 
-Most of the times, it is convenient to extend
+Most of the time, it is convenient to extend
 :class:`Symfony\\Component\\HttpKernel\\DataCollector\\DataCollector` and
 populate the ``$this->data`` property (it takes care of serializing the
 ``$this->data`` property)::
 
     // src/AppBundle/DataCollector/MyCollector.php
+    use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+
     class MyCollector extends DataCollector
     {
         public function collect(Request $request, Response $response, \Exception $exception = null)
@@ -77,8 +79,8 @@ populate the ``$this->data`` property (it takes care of serializing the
 Enabling Custom Data Collectors
 -------------------------------
 
-To enable a data collector, define it as a regular service in your application
-and tag it with ``data_collector``:
+To enable a data collector, define it as a regular service and tag it with
+``data_collector``:
 
 .. configuration-block::
 
@@ -88,21 +90,33 @@ and tag it with ``data_collector``:
         services:
             app.my_collector:
                 class: AppBundle\DataCollector\MyCollector
+                public: false
                 tags:
                     - { name: data_collector }
 
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <service id="app.my_collector" class="AppBundle\DataCollector\MyCollector">
-            <tag name="data_collector" />
-        </service>
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            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"
+        >
+            <services>
+                <service id="app.my_collector" class="AppBundle\DataCollector\MyCollector"
+                         public="false">
+                    <tag name="data_collector" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
         // app/config/services.php
         $container
             ->register('app.my_collector', 'AppBundle\DataCollector\MyCollector')
+            ->setPublic(false)
             ->addTag('data_collector')
         ;
 
@@ -117,9 +131,9 @@ In the simplest case, you just want to display the information in the toolbar
 without providing a profiler panel. This requires to define the ``toolbar``
 block and set the value of two variables called ``icon`` and ``text``:
 
-.. code-block:: jinja
+.. code-block:: html+jinja
 
-    {% extends '@WebProfiler/Profiler/layout.html.twig' %}
+    {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
     {% block toolbar %}
         {% set icon %}
@@ -167,9 +181,9 @@ block and set the value of two variables called ``icon`` and ``text``:
     You are encouraged to use the latter technique for your own toolbar panels.
 
 If the toolbar panel includes extended web profiler information, the Twig template
-must also define other blocks:
+must also define additional blocks:
 
-.. code-block:: jinja
+.. code-block:: html+jinja
 
     {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
@@ -186,14 +200,14 @@ must also define other blocks:
         {% endset %}
 
         {# the 'link' value is now set to 'true', which allows the user to click
-           on it to access to the web profiler panel. Since 'true' is the default
+           on it to access the web profiler panel. Since 'true' is the default
            value, you can omit the 'link' parameter entirely #}
         {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: true }) }}
     {% endblock %}
 
     {% block head %}
-        {# Optional, here you can link to or define your own CSS and JS contents #}
-        {# Use {{ parent() }} to keep the default styles #}
+        {# Optional, you can here link to or define your own CSS and JS contents #}
+        {# {{ parent() }} to keep the default styles #}
     {% endblock %}
 
     {% block menu %}
@@ -228,20 +242,34 @@ the ``data_collector`` tag in your service configuration:
             app.my_collector:
                 class: AppBundle\DataCollector\MyCollector
                 tags:
-                    - { name: data_collector, template: 'data_collector/template.html.twig', id: 'app.my_collector' }
+                    -
+                        name:     data_collector
+                        template: 'data_collector/template.html.twig'
+                        id:       'app.my_collector'
+                        public:   false
 
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <service id="app.my_collector" class="AppBundle\DataCollector\MyCollector">
-            <tag name="data_collector" template="data_collector/template.html.twig" id="app.my_collector" />
-        </service>
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            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"
+        >
+            <services>
+                <service id="app.my_collector" class="AppBundle\DataCollector\MyCollector">
+                    <tag name="data_collector" template="data_collector/template.html.twig" id="app.my_collector" public="false" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
         // app/config/services.php
         $container
             ->register('app.my_collector', 'AppBundle\DataCollector\MyCollector')
+            ->setPublic(false)
             ->addTag('data_collector', array(
                 'template' => 'data_collector/template.html.twig',
                 'id'       => 'app.my_collector',