Merge branch '5.4' into ux-docs-in-bundles-section

Author: weaverryan

.doctor-rst.yaml

@@ -89,7 +89,7 @@ whitelist:
         - '.. versionadded:: 1.11' # MakerBundle
         - '.. versionadded:: 1.3' # MakerBundle
         - '.. versionadded:: 1.8' # MakerBundle
-        - '.. versionadded:: 1.6' # Flex in setup/upgrade_minor.rst
+        - '.. versionadded:: 1.18' # Flex in setup/upgrade_minor.rst
         - '.. versionadded:: 1.0.0' # Encore
         - '0 => 123' # assertion for var_dumper - components/var_dumper.rst
         - '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst

_images/security/profiler-badges.png

@@ -350,20 +350,20 @@ Locks are created and managed in ``Stores``, which are classes that implement
 
 The component includes the following built-in store types:
 
-=========================================================  ======  ========  ======== =======
-Store                                                      Scope   Blocking  Expiring Sharing
-=========================================================  ======  ========  ======== =======
-:ref:`FlockStore <lock-store-flock>`                       local   yes       no       yes
-:ref:`MemcachedStore <lock-store-memcached>`               remote  no        yes      no
-:ref:`MongoDbStore <lock-store-mongodb>`                   remote  no        yes      no
-:ref:`PdoStore <lock-store-pdo>`                           remote  no        yes      no
-:ref:`DoctrineDbalStore <lock-store-dbal>`                 remote  no        yes      no
-:ref:`PostgreSqlStore <lock-store-pgsql>`                  remote  yes       no       yes
-:ref:`DoctrineDbalPostgreSqlStore <lock-store-dbal-pgsql>` remote  yes       no       yes
-:ref:`RedisStore <lock-store-redis>`                       remote  no        yes      yes
-:ref:`SemaphoreStore <lock-store-semaphore>`               local   yes       no       no
-:ref:`ZookeeperStore <lock-store-zookeeper>`               remote  no        no       no
-=========================================================  ======  ========  ======== =======
+==========================================================  ======  ========  ======== =======
+Store                                                       Scope   Blocking  Expiring Sharing
+==========================================================  ======  ========  ======== =======
+:ref:`FlockStore <lock-store-flock>`                        local   yes       no       yes
+:ref:`MemcachedStore <lock-store-memcached>`                remote  no        yes      no
+:ref:`MongoDbStore <lock-store-mongodb>`                    remote  no        yes      no
+:ref:`PdoStore <lock-store-pdo>`                            remote  no        yes      no
+:ref:`DoctrineDbalStore <lock-store-dbal>`                  remote  no        yes      no
+:ref:`PostgreSqlStore <lock-store-pgsql>`                   remote  yes       no       yes
+:ref:`DoctrineDbalPostgreSqlStore <lock-store-dbal-pgsql>`  remote  yes       no       yes
+:ref:`RedisStore <lock-store-redis>`                        remote  no        yes      yes
+:ref:`SemaphoreStore <lock-store-semaphore>`                local   yes       no       no
+:ref:`ZookeeperStore <lock-store-zookeeper>`                remote  no        no       no
+==========================================================  ======  ========  ======== =======
 
 .. _lock-store-flock:
 

components/lock.rst

@@ -178,5 +178,5 @@ As always, you can decide to stop here and use the framework as is; it's
 probably all you need to create simple websites like those fancy one-page
 `websites`_ and hopefully a few others.
 
-.. _`callbacks`: https://www.php.net/callback#language.types.callback
+.. _`callbacks`: https://www.php.net/manual/en/language.types.callable.php
 .. _`websites`: https://kottke.org/08/02/single-serving-sites

create_framework/templating.rst

@@ -71,9 +71,9 @@ Components
 .. toctree::
     :hidden:
 
-    components/index
+    components/
 
-Read the :doc:`Components </components/index>` documentation.
+Read the :doc:`Components </components/>` documentation.
 
 Reference Documents
 -------------------

index.rst

@@ -119,8 +119,8 @@ Symfony generates a file with the list of classes to preload in the
     ; required for opcache.preload:
     opcache.preload_user=www-data
 
-If this file is missing, run this command to reinstall the Symfony Flex recipe:
-``composer recipes:install symfony/framework-bundle --force -v``.
+If this file is missing, run this command to update the Symfony Flex recipe:
+``composer recipes:update symfony/framework-bundle``.
 
 Use the :ref:`container.preload <dic-tags-container-preload>` and
 :ref:`container.no_preload <dic-tags-container-nopreload>` service tags to define

performance.rst

@@ -9,7 +9,7 @@ EnumType Field
    The ``EnumType`` form field was introduced in Symfony 5.4.
 
 A multi-purpose field used to allow the user to "choose" one or more options
-defined in a `PHP enumeration`_. It extends the :doc:`ChoiceType </refernce/forms/types/enum>`
+defined in a `PHP enumeration`_. It extends the :doc:`ChoiceType </reference/forms/types/enum>`
 field and defines the same options.
 
 +---------------------------+----------------------------------------------------------------------+

reference/forms/types/enum.rst

@@ -42,9 +42,15 @@ Other Fields
 
 * :doc:`CheckboxType </reference/forms/types/checkbox>`
 * :doc:`FileType </reference/forms/types/file>`
-* `DropzoneType`_
 * :doc:`RadioType </reference/forms/types/radio>`
-* `CropperType`_ (to crop images with JavaScript)
+
+Symfony UX Fields
+~~~~~~~~~~~~~~~~~
+
+These types are part of the `Symfony UX initiative`_:
+
+* `CropperType`_ (using Cropper.js)
+* `DropzoneType`_
 
 UID Fields
 ~~~~~~~~~~
@@ -75,5 +81,6 @@ Base Fields
 
 * :doc:`FormType </reference/forms/types/form>`
 
-.. _`DropzoneType`: https://symfony.com/bundles/ux-dropzone/current/index.html
-.. _`CropperType`: https://symfony.com/bundles/ux-cropperjs/current/index.html
+.. _`Symfony UX initiative`: https://github.com/symfony/ux#readme
+.. _`CropperType`: https://github.com/symfony/ux/tree/2.x/src/Cropperjs#readme
+.. _`DropzoneType`: https://github.com/symfony/ux/tree/2.x/src/Dropzone#readme