Merge branch '6.0' into 6.1

* 6.0:
  [Config] Suggest avoiding new environments
  Fix broken link to DoctrineReceiver in Messenger
  remove reference to not existing YAML dumper flag
  Update _ux-libraries.rst.inc
  firewall option replace with allowedHosts
  Update route from annotation to attribute
  Use `path` instead of `url` in SSI documentation
  [Lock] Fix code example for Doctrine based stores

Author: javiereguiluz

components/lock.rst

@@ -488,11 +488,11 @@ The DoctrineDbalStore saves locks in an SQL database. It is identical to PdoStor
 but requires a `Doctrine DBAL Connection`_, or a `Doctrine DBAL URL`_. This store
 does not support blocking, and expects a TTL to avoid stalled locks::
 
-    use Symfony\Component\Lock\Store\PdoStore;
+    use Symfony\Component\Lock\Store\DoctrineDbalStore;
 
-    // a PDO, a Doctrine DBAL connection or DSN for lazy connecting through PDO
+    // a Doctrine DBAL connection or DSN
     $connectionOrURL = 'mysql://myuser:mypassword@127.0.0.1/app';
-    $store = new PdoStore($connectionOrURL);
+    $store = new DoctrineDbalStore($connectionOrURL);
 
 .. note::
 
@@ -533,11 +533,11 @@ The DoctrineDbalPostgreSqlStore uses `Advisory Locks`_ provided by PostgreSQL.
 It is identical to PostgreSqlStore but requires a `Doctrine DBAL Connection`_ or
 a `Doctrine DBAL URL`_. It supports native blocking, as well as sharing locks::
 
-    use Symfony\Component\Lock\Store\PostgreSqlStore;
+    use Symfony\Component\Lock\Store\DoctrineDbalPostgreSqlStore;
 
-    // a PDO instance or DSN for lazy connecting through PDO
-    $databaseConnectionOrDSN = 'pgsql:host=localhost;port=5634;dbname=lock';
-    $store = new PostgreSqlStore($databaseConnectionOrDSN, ['db_username' => 'myuser', 'db_password' => 'mypassword']);
+    // a Doctrine Connection or DSN
+    $databaseConnectionOrDSN = 'postgresql+advisory://myuser:mypassword@127.0.0.1:5634/lock';
+    $store = new DoctrineDbalPostgreSqlStore($databaseConnectionOrDSN);
 
 In opposite to the ``DoctrineDbalStore``, the ``DoctrineDbalPostgreSqlStore`` does not need a table to
 store locks and does not expire.

components/yaml.rst

@@ -341,15 +341,14 @@ syntax to parse them as proper PHP constants::
 Parsing and Dumping of Binary Data
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You can dump binary data by using the ``DUMP_BASE64_BINARY_DATA`` flag::
+Non UTF-8 encoded strings are dumped as base64 encoded data::
 
     $imageContents = file_get_contents(__DIR__.'/images/logo.png');
 
-    $dumped = Yaml::dump(['logo' => $imageContents], 2, 4, Yaml::DUMP_BASE64_BINARY_DATA);
+    $dumped = Yaml::dump(['logo' => $imageContents]);
     // logo: !!binary iVBORw0KGgoAAAANSUhEUgAAA6oAAADqCAY...
 
-Binary data is automatically parsed if they include the ``!!binary`` YAML tag
-(there's no need to pass any flag to the Yaml parser)::
+Binary data is automatically parsed if they include the ``!!binary`` YAML tag::
 
     $dumped = 'logo: !!binary iVBORw0KGgoAAAANSUhEUgAAA6oAAADqCAY...';
     $parsed = Yaml::parse($dumped);

configuration.rst

@@ -548,6 +548,12 @@ going to production:
     use `symbolic links`_ between ``config/packages/<environment-name>/``
     directories to reuse the same configuration.
 
+Instead of creating new environments, you can use environment variables as
+explained in the following section. This way you can use the same application
+and environment (e.g. ``prod``) but change its behavior thanks to the
+configuration based on environment variables (e.g. to run the application in
+different scenarios: staging, quality assurance, client review, etc.)
+
 .. _config-env-vars:
 
 Configuration Based on Environment Variables

frontend/_ux-libraries.rst.inc

@@ -1,18 +1,18 @@
 * `ux-turbo`_: Integration with `Turbo Drive`_ for a single-page-app experience
 * `ux-live-component`_: Build Dynamic Interfaces with Zero JavaScript
 * `ux-twig-component`_: Build Twig Components Backed by a PHP Class
+* `ux-swup`_: Integration with Swup
 * `ux-chartjs`_: Easy charts with Chart.js
 * `ux-lazy-image`_: Optimize Image Loading with BlurHash
 * `ux-cropperjs`_: Form Type and tools for cropping images
 * `ux-dropzone`_: Form type for stylized "drop zone" for file uploads
-* `ux-swup`_: Integration with Swup
 
 .. _`ux-turbo`: https://symfony.com/bundles/ux-turbo/current/index.html
 .. _`ux-live-component`: https://symfony.com/bundles/ux-live-component/current/index.html
 .. _`ux-twig-component`: https://symfony.com/bundles/ux-twig-component/current/index.html
+.. _`ux-swup`: https://symfony.com/bundles/ux-swup/current/index.html
 .. _`ux-chartjs`: https://symfony.com/bundles/ux-chartjs/current/index.html
 .. _`ux-lazy-image`: https://symfony.com/bundles/ux-lazy-image/current/index.html
 .. _`ux-cropperjs`: https://symfony.com/bundles/ux-cropperjs/current/index.html
 .. _`ux-dropzone`: https://symfony.com/bundles/ux-dropzone/current/index.html
-.. _`ux-swup`: https://symfony.com/bundles/ux-swup/current/index.html
 .. _`Turbo Drive`: https://turbo.hotwired.dev/

frontend/encore/virtual-machine.rst

@@ -96,7 +96,7 @@ Fix "Invalid Host header" Issue
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Webpack will respond ``Invalid Host header`` when trying to access files from
-the dev-server. To fix this, set the ``firewall`` option:
+the dev-server. To fix this, set the ``allowedHosts`` option:
 
 .. code-block:: javascript
 
@@ -107,16 +107,16 @@ the dev-server. To fix this, set the ``firewall`` option:
         // ...
 
         .configureDevServerOptions(options => {
-            options.firewall = false;
+            options.allowedHosts = all;
         })
 
 .. caution::
 
-    Beware that `it's not recommended to disable the firewall`_ in general, but
+    Beware that `it's not recommended to set allowedHosts to all`_ in general, but
     here it's required to solve the issue when using Encore in a virtual machine.
 
 .. _`VirtualBox`: https://www.virtualbox.org/
 .. _`VMWare`: https://www.vmware.com
 .. _`NFS`: https://en.wikipedia.org/wiki/Network_File_System
 .. _`polling`: https://webpack.js.org/configuration/watch/#watchoptionspoll
-.. _`it's not recommended to disable the firewall`: https://webpack.js.org/configuration/dev-server/#devserverdisablehostcheck
+.. _`it's not recommended to set allowedHosts to all`: https://webpack.js.org/configuration/dev-server/#devserverallowedhosts

http_cache/ssi.rst

@@ -22,7 +22,7 @@ The SSI instructions are done via HTML comments:
             <!-- ... some content -->
 
             <!-- Embed the content of another page here -->
-            <!--#include virtual="http://..." -->
+            <!--#include virtual="/..." -->
 
             <!-- ... more content -->
         </body>
@@ -121,8 +121,8 @@ The profile index page has not public caching, but the GDPR block has
     {# you can use a controller reference #}
     {{ render_ssi(controller('App\\Controller\\ProfileController::gdpr')) }}
 
-    {# ... or a URL #}
-    {{ render_ssi(url('profile_gdpr')) }}
+    {# ... or a path (in server's SSI configuration is common to use relative paths instead of absolute URLs) #}
+    {{ render_ssi(path('profile_gdpr')) }}
 
 The ``render_ssi`` twig helper will generate something like:
 

messenger/custom-transport.rst

@@ -127,7 +127,7 @@ Here is a simplified example of a database transport::
 The implementation above is not runnable code but illustrates how a
 :class:`Symfony\\Component\\Messenger\\Transport\\TransportInterface` could
 be implemented. For real implementations see :class:`Symfony\\Component\\Messenger\\Transport\\InMemoryTransport`
-and :class:`Symfony\\Component\\Messenger\\Transport\\Doctrine\\DoctrineReceiver`.
+and :class:`Symfony\\Component\\Messenger\\Bridge\\Doctrine\\Transport\\DoctrineReceiver`.
 
 Register your Factory
 ---------------------

notifier.rst

@@ -437,9 +437,7 @@ To send a notification, autowire the
 
     class InvoiceController extends AbstractController
     {
-        /**
-         * @Route("/invoice/create")
-         */
+        #[Route('/invoice/create')]
         public function create(NotifierInterface $notifier)
         {
             // ...
@@ -566,9 +564,7 @@ sent using the Slack transport::
     // ...
     class InvoiceController extends AbstractController
     {
-        /**
-         * @Route("/invoice/create")
-         */
+        #[Route('/invoice/create')]
         public function invoice(NotifierInterface $notifier)
         {
             // ...