Merge branch '4.4' into 5.2

wouterj · wouterj · commit 78bc89898547 · 2021-04-08T13:25:27.000+02:00
* 4.4: Add troubleshooting for parallel merges to maintainer guide Update framework.rst JsonResponse content updated [#14728] Be explicit about the double 's' [Messenger] fix typo [Messenger] Routing & Inheritance [Cache] Add TLS scheme for Redis connection
diff --git a/_build/maintainer_guide.rst b/_build/maintainer_guide.rst
@@ -352,6 +352,26 @@ forgot to merge as ``gh merge NNNNN -s 5.1`` to change the merge branch. Solutio
     $ git merge 5.1
     $ ...
 
+Merging while the target branch changed
+.......................................
+
+Sometimes, someone else merges a PR in ``5.x`` at the same time as you are
+doing it. In these cases, ``gh merge ...`` failes to push. Solve this by
+resetting your local branch and restarting the merge:
+
+.. code-block:: terminal
+
+    $ gh merge ...
+    # this failed
+
+    # fetch the updated 5.x branch from GitHub
+    $ git fetch upstream
+    $ git checkout 5.x
+    $ git reset --hard upstream/5.x
+
+    # restart the merge
+    $ gh merge ...
+
 .. _`symfony/symfony-docs`: https://github.com/symfony/symfony-docs
 .. _`Symfony Docs team`: https://github.com/orgs/symfony/teams/team-symfony-docs
 .. _`Symfony's respectful review comments`: https://symfony.com/doc/current/contributing/community/review-comments.html
diff --git a/components/cache/adapters/redis_adapter.rst b/components/cache/adapters/redis_adapter.rst
@@ -62,15 +62,16 @@ helper method allows creating and configuring the Redis client class instance us
     );
 
 The DSN can specify either an IP/host (and an optional port) or a socket path, as well as a
-password and a database index.
+password and a database index. To enable TLS for connections, the scheme ``redis`` must be
+replaced by ``rediss`` (the second ``s`` means "secure").
 
 .. note::
 
     A `Data Source Name (DSN)`_ for this adapter must use the following format.
 
     .. code-block:: text
 
-        redis://[pass@][ip|host|socket[:port]][/db-index]
+        redis[s]://[pass@][ip|host|socket[:port]][/db-index]
 
 Below are common examples of valid DSNs showing a combination of available values::
 
diff --git a/components/http_foundation.rst b/components/http_foundation.rst
@@ -705,9 +705,11 @@ class, which can make this even easier::
     // if you know the data to send when creating the response
     $response = new JsonResponse(['data' => 123]);
 
-    // if you don't know the data to send when creating the response
+    // if you don't know the data to send or if you want to customize the encoding options
     $response = new JsonResponse();
     // ...
+    // configure any custom encoding options (if needed, it must be called before "setData()")
+    //$response->setEncodingOptions(JsonResponse::DEFAULT_ENCODING_OPTIONS | \JSON_PRESERVE_ZERO_FRACTION);
     $response->setData(['data' => 123]);
 
     // if the data to send is already encoded in JSON
diff --git a/messenger.rst b/messenger.rst
@@ -313,6 +313,13 @@ to multiple transports:
             ],
         ]);
 
+.. note::
+
+    If you configure routing for both a child and parent class, both rules
+    are used. E.g. if you have an ``SmsNotification`` object that extends
+    from ``Notification``, both the routing for ``Notification`` and
+    ``SmsNotification`` will be used.
+
 Doctrine Entities in Messages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -1416,7 +1416,7 @@ The value can be one of:
 ``true``
     Throw an exception when the requirements are not met;
 ``false``
-    Disable exceptions when the requirements are not met and return ``null``
+    Disable exceptions when the requirements are not met and return ``''``
     instead;
 ``null``
     Disable checking the requirements (thus, match the route even when the
