Merge branch '4.3' into 4.4

* 4.3:
  fixes versionadded directive. refs #12598
  Update documentation for MercureBundle: add enable_profiler option
  Simply update the ESI initial specs date (dated 2001)
  Update doctrine.rst
  Tell user about installing twig
  fix some more typos

Author: OskarStark

.doctor-rst.yaml

@@ -80,3 +80,4 @@ whitelist:
         - '$var .= "Because of this `\xE9` octet (\\xE9),\n";'
         - "`Deploying Symfony 4 Apps on Heroku`_."
         - ".. _`Deploying Symfony 4 Apps on Heroku`: https://devcenter.heroku.com/articles/deploying-symfony4"
+        - '.. versionadded:: 0.2' # MercureBundle

_images/mercure/panel.png

@@ -112,7 +112,7 @@ Using Getters
 ~~~~~~~~~~~~~
 
 The ``getValue()`` method also supports reading using getters. The method will
-be created using common naming conventions for getters. It transform the
+be created using common naming conventions for getters. It transforms the
 property name to camelCase (``first_name`` becomes ``FirstName``) and prefixes
 it with ``get``. So the actual method becomes ``getFirstName()``::
 

components/property_access.rst

@@ -331,6 +331,6 @@ As before you can use the :doc:`Symfony Local Web Server
     cd public/
     $ symfony server:start
 
-Then see page in browser:
+Then visit the page in your browser:
 
     http://localhost:8000/random/10

configuration/micro_kernel_trait.rst

@@ -735,8 +735,8 @@ Now, you can call this method on the repository::
 
     // ...
 
-If you're in a :ref:`services-constructor-injection`, you can type-hint the
-``ProductRepository`` class and inject it like normal.
+See :ref:`services-constructor-injection` for how to inject the repository into
+any service.
 
 Querying with the Query Builder
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

doctrine.rst

@@ -12,7 +12,7 @@ have one limitation: they can only cache whole pages. If your pages contain
 dynamic sections, such as the user name or a shopping cart, you are out of
 luck. Fortunately, Symfony provides a solution for these cases, based on a
 technology called `ESI`_, or Edge Side Includes. Akamai wrote this specification
-almost 10 years ago and it allows specific parts of a page to have a different
+in 2001 and it allows specific parts of a page to have a different
 caching strategy than the main page.
 
 The ESI specification describes tags you can embed in your pages to communicate

http_cache/esi.rst

@@ -568,6 +568,47 @@ sent. Here is the PublisherStub implementation::
     App\Tests\Functional\Fixtures\PublisherStub:
         decorates: mercure.hub.default.publisher
 
+
+Debugging
+---------
+
+.. versionadded:: 0.2
+
+    The WebProfiler panel was introduced in MercureBundle 0.2.
+
+Enable the panel in your configuration, as follows:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # config/packages/mercure.yaml
+        mercure:
+            enable_profiler: '%kernel.debug%'
+
+    .. code-block:: xml
+
+        <!-- config/packages/mercure.xml -->
+        <?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
+                https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <mercure:config enable_profiler="%kernel.debug%"/>
+
+        </container>
+
+    .. code-block:: php
+
+        // config/packages/mercure.php
+        $container->loadFromExtension('mercure', [
+            'enable_profiler' => '%kernel.debug%',
+        ]);
+
+
+.. image:: /_images/mercure/panel.png
+
 .. _`the Mercure protocol`: https://github.com/dunglas/mercure#protocol-specification
 .. _`Server-Sent Events (SSE)`: https://developer.mozilla.org/docs/Server-sent_events
 .. _`a polyfill`: https://github.com/Yaffle/EventSource

mercure.rst

@@ -197,6 +197,12 @@ If you're returning HTML from your controller, you'll probably want to render
 a template. Fortunately, Symfony comes with `Twig`_: a templating language that's
 easy, powerful and actually quite fun.
 
+Install the twig package with:
+
+.. code-block:: terminal
+
+    $ composer require twig
+
 Make sure that ``LuckyController`` extends Symfony's base
 :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController` class: