Merge branch '4.1'

* 4.1:
  [Messenger] Error in XML configuration
  ! prefix referencing templates
  [Messenger] Fix syntax of Return Type Declaration
  Small fix to syntax of Return Type Declaration
  remove changelog toctree entry
  removed the changelog file
  removed Romain as part of the core team
  Update deployment.rst
  Fixed underline
  Adding check for environments
  Added pre-deployment tasks and removed Assetic deployment
  Added reference to deploying assets

Author: javiereguiluz

bundles/override.rst

@@ -35,6 +35,22 @@ template from the FOSUserBundle, create this template:
     If you add a template in a new location, you *may* need to clear your
     cache (``php bin/console cache:clear``), even if you are in debug mode.
 
+Instead of overriding an entire template, you may just want to override one or
+more blocks. However, since you are overriding the template you want to extend
+from, you would end up in an infinite loop error. The solution is to use the
+special ``!`` prefix in the template name to tell Symfony that you want to
+extend from the original template, not from the overridden one:
+
+.. code-block:: twig
+
+    {# templates/bundles/FOSUserBundle/Registration/confirmed.html.twig #}
+    {# the special '!' prefix avoids errors when extending from an overridden template #}
+    {% extends "@!FOSUserBundle/Registration/confirmed.html.twig" %}
+
+    {% block some_block %}
+        ...
+    {% endblock %}
+
 .. _templating-overriding-core-templates:
 
 .. tip::

components/messenger.rst

@@ -237,7 +237,7 @@ First, create your receiver::
            $this->filePath = $filePath;
        }
 
-       public function receive(callable $handler) : void
+       public function receive(callable $handler): void
        {
            $ordersFromCsv = $this->serializer->deserialize(file_get_contents($this->filePath), 'csv');
 

contributing/code/core_team.rst

@@ -63,9 +63,6 @@ Active Core Members
   * **Tobias Schultze** (`Tobion`_) can merge into the Routing_,
     OptionsResolver_ and PropertyAccess_ components;
 
-  * **Romain Neutron** (`romainneutron`_) can merge into the
-    Process_ component;
-
   * **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Cache_, Debug_,
     Process_, PropertyAccess_, VarDumper_ components, PhpUnitBridge_ and
     the DebugBundle_;
@@ -125,7 +122,8 @@ They are no longer part of the core team, but we are very grateful for all their
 Symfony contributions:
 
 * **Bernhard Schussek** (`webmozart`_);
-* **Abdellatif AitBoudad** (`aitboudad`_).
+* **Abdellatif AitBoudad** (`aitboudad`_);
+* **Romain Neutron**.
 
 Core Membership Application
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~

deployment.rst

@@ -170,25 +170,16 @@ Make sure you clear and warm-up your Symfony cache:
 
     $ php bin/console cache:clear --env=prod --no-debug
 
-E) Dump your Assetic Assets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you're using Assetic, you'll also want to dump your assets:
-
-.. code-block:: terminal
-
-    $ php bin/console assetic:dump --env=prod --no-debug
-
-F) Other Things!
+E) Other Things!
 ~~~~~~~~~~~~~~~~
 
 There may be lots of other things that you need to do, depending on your
 setup:
 
 * Running any database migrations
 * Clearing your APC cache
-* Running ``assets:install`` (already taken care of in ``composer install``)
 * Add/edit CRON jobs
+* ref:`Building and minifying your assets <how-do-i-deploy-my-encore-assets>` with Webpack Encore
 * Pushing assets to a CDN
 * ...
 

frontend/encore/faq.rst

@@ -1,6 +1,8 @@
 FAQ and Common Issues
 =====================
 
+.. _how-do-i-deploy-my-encore-assets:
+
 How do I deploy my Encore Assets?
 ---------------------------------
 

http_cache/esi.rst

@@ -71,7 +71,7 @@ First, to use ESI, be sure to enable it in your application configuration:
 
         <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services

messenger.rst

@@ -129,7 +129,7 @@ the messenger component, the following configuration should have been created:
 
         <!-- config/packages/messenger.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
@@ -199,7 +199,7 @@ configuration:
 
         <!-- config/packages/messenger.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
@@ -248,7 +248,7 @@ instead of a class name:
 
         <!-- config/packages/messenger.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
@@ -295,7 +295,8 @@ A class of messages can also be routed to multiple senders by specifying a list:
     .. code-block:: xml
 
         <!-- config/packages/messenger.xml -->
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
@@ -340,7 +341,8 @@ while still having them passed to their respective handler:
     .. code-block:: xml
 
         <!-- config/packages/messenger.xml -->
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
@@ -410,7 +412,8 @@ this:
     .. code-block:: xml
 
         <!-- config/packages/messenger.xml -->
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
@@ -522,7 +525,8 @@ within the buses to add some extra capabilities like this:
     .. code-block:: xml
 
         <!-- config/packages/messenger.xml -->
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
@@ -579,7 +583,8 @@ you can disable them like this:
     .. code-block:: xml
 
         <!-- config/packages/messenger.xml -->
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
@@ -717,7 +722,8 @@ Then you can reference and configure the
     .. code-block:: xml
 
         <!-- config/packages/messenger.xml -->
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
@@ -809,17 +815,17 @@ the ``SenderInterface`` and ``ReceiverInterface``). It will look like this::
 
     class YourTransport implements TransportInterface
     {
-        public function send($message) : void
+        public function send($message): void
         {
             // ...
         }
 
-        public function receive(callable $handler) : void
+        public function receive(callable $handler): void
         {
             // ...
         }
 
-        public function stop() : void
+        public function stop(): void
         {
             // ...
         }
@@ -881,7 +887,7 @@ named transport using your own DSN:
 
         <!-- config/packages/messenger.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/symfony"
+        <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services

profiler/matchers.rst

@@ -21,10 +21,13 @@ class in your controllers to manage the profiler programmatically::
     {
         // ...
 
-        public function someMethod(Profiler $profiler)
+        public function someMethod(?Profiler $profiler)
         {
-            // for this particular controller action, the profiler is disabled
-            $profiler->disable();
+            // $profiler won't be set if your environment doesn't have the profiler (like prod, by default)
+            if (null !== $profiler) {
+                // if it exists, disable the profiler for this particular controller action
+                $profiler->disable();
+            }
 
             // ...
         }
@@ -37,13 +40,13 @@ create an alias pointing to the existing ``profiler`` service:
 
     .. code-block:: yaml
 
-        # config/services.yaml
+        # config/services_dev.yaml
         services:
             Symfony\Component\HttpKernel\Profiler\Profiler: '@profiler'
 
     .. code-block:: xml
 
-        <!-- config/services.xml -->
+        <!-- config/services_dev.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"
@@ -57,7 +60,7 @@ create an alias pointing to the existing ``profiler`` service:
 
     .. code-block:: php
 
-        // config/services.php
+        // config/services_dev.php
         use Symfony\Component\HttpKernel\Profiler\Profiler;
 
         $container->setAlias(Profiler::class, 'profiler');

reference/dic_tags.rst

@@ -710,7 +710,7 @@ If your custom authentication factory extends
 :class:`Symfony\\Bundle\\SecurityBundle\\DependencyInjection\\Security\\Factory\\AbstractFactory`
 and your custom authentication listener extends
 :class:`Symfony\\Component\\Security\\Http\\Firewall\\AbstractAuthenticationListener`,
-then your custom authentication listener will automatically have this tagged
+then your custom authentication listener will automatically have this tag
 applied and it will function automatically.
 
 security.voter