[Form] [Form Theme] customize choice entry

.doctor-rst.yaml

@@ -11,7 +11,7 @@ rules:
     ensure_link_definition_contains_valid_url: ~
     ensure_order_of_code_blocks_in_configuration_block: ~
     extend_abstract_controller: ~
-    extension_xlf_instead_of_xliff: ~
+    # extension_xlf_instead_of_xliff: ~
     indention: ~
     lowercase_as_in_use_statements: ~
     max_blank_lines:
@@ -51,18 +51,18 @@ rules:
     yarn_dev_option_at_the_end: ~
 #    no_app_bundle: ~
 
-    #   4.x
+    #   master
     versionadded_directive_major_version:
-        major_version: 4
+        major_version: 6
 
     versionadded_directive_min_version:
-        min_version: '4.0'
+        min_version: '6.0'
 
     deprecated_directive_major_version:
-        major_version: 4
+        major_version: 6
 
     deprecated_directive_min_version:
-        min_version: '4.0'
+        min_version: '6.0'
 
 # do not report as violation
 whitelist:
@@ -71,6 +71,7 @@ whitelist:
         - '/``.yml``/'
         - '/(.*)\.orm\.yml/' # currently DoctrineBundle only supports .yml
         - '/rst-class/'
+        - /docker-compose\.yml/
     lines:
         - 'in config files, so the old ``app/config/config_dev.yml`` goes to'
         - '#. The most important config file is ``app/config/services.yml``, which now is'
@@ -84,17 +85,23 @@ whitelist:
         - '.. versionadded:: 2.4.0' # SwiftMailer
         - '.. versionadded:: 1.30' # Twig
         - '.. versionadded:: 1.35' # Twig
-        - '.. versionadded:: 1.2' # MakerBundle
-        - '.. versionadded:: 1.11' # MakerBundle
-        - '.. versionadded:: 1.3' # MakerBundle
-        - '.. versionadded:: 1.8' # MakerBundle
+        - '.. versionadded:: 1.11' # Messenger (Middleware / DoctrineBundle)
         - '.. 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
+        - '123,' # assertion for var_dumper - components/var_dumper.rst
+        - '"foo",' # assertion for var_dumper - components/var_dumper.rst
         - '$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"
+        - "//                  224, 165, 141, 224, 164, 164, 224, 165, 135])"
         - '.. versionadded:: 0.2' # MercureBundle
+        - 'provides a ``loginUser()`` method to simulate logging in in your functional'
         - '.. code-block:: twig'
+        - '.. versionadded:: 3.6' # MonologBundle
+        - '// bin/console'
         - 'End to End Tests (E2E)'
+        - '.. code-block:: php'
         - '.. _`a feature to test applications using Mercure`: https://github.com/symfony/panther#creating-isolated-browsers-to-test-apps-using-mercure-or-websocket'
+        - '..  End to End Tests (E2E)'

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,9 @@
 <!--
 
 If your pull request fixes a BUG, use the oldest maintained branch that contains
-the bug (see https://symfony.com/roadmap for the list of maintained branches).
+the bug (see https://symfony.com/releases for the list of maintained branches).
 
 If your pull request documents a NEW FEATURE, use the same Symfony branch where
-the feature was introduced (and `5.x` for features of unreleased versions).
+the feature was introduced (and `6.x` for features of unreleased versions).
 
 -->

.github/workflows/ci.yaml

@@ -26,7 +26,7 @@ jobs:
             -   name: "Set-up PHP"
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.1
                     coverage: none
                     tools: "composer:v2"
 
@@ -90,7 +90,7 @@ jobs:
           - name: Set-up PHP
             uses: shivammathur/setup-php@v2
             with:
-                php-version: 8.0
+                php-version: 8.1
                 coverage: none
 
           - name: Fetch branch from where the PR started

README.markdown

@@ -27,7 +27,7 @@ We love contributors! For more information on how you can contribute, please rea
 the [Symfony Docs Contributing Guide](https://symfony.com/doc/current/contributing/documentation/overview.html)
 
 **Important**: use `4.4` branch as the base of your pull requests, unless you are
-documenting a feature that was introduced *after* Symfony 4.4 (e.g. in Symfony 5.2).
+documenting a feature that was introduced *after* Symfony 4.4 (e.g. in Symfony 5.4).
 
 Build Documentation Locally
 ---------------------------

_build/composer.json

@@ -8,7 +8,10 @@
         "preferred-install": {
             "*": "dist"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "symfony/flex": true
+        }
     },
     "require": {
         "php": ">=7.4",

_build/maintainer_guide.rst

@@ -39,22 +39,22 @@ contributes again, it's OK to mention some of the minor issues to educate them.
 
     $ gh merge 11059
 
-      Working on symfony/symfony-docs (branch 4.4)
+      Working on symfony/symfony-docs (branch 6.2)
       Merging Pull Request 11059: dmaicher/patch-3
 
       ...
 
       # This is important!! Say NO to push the changes now
       Push the changes now? (Y/n) n
-      Now, push with: git push gh "4.4" refs/notes/github-comments
+      Now, push with: git push gh "6.2" refs/notes/github-comments
 
       # Now, open your editor and make the needed changes ...
 
       $ git commit -a
       # Use "Minor reword", "Minor tweak", etc. as the commit message
 
       # now run the 'push' command shown above by 'gh' (it's different each time)
-      $ git push gh "4.4" refs/notes/github-comments
+      $ git push gh "6.2" refs/notes/github-comments
 
 Merging Pull Requests
 ---------------------

_build/redirection_map

@@ -424,6 +424,7 @@
 /profiler/storage /profiler
 /setup/composer /setup
 /security/security_checker /setup
+/setup/built_in_web_server /setup/symfony_server
 /service_container/parameters /configuration
 /routing/generate_url_javascript /routing
 /routing/slash_in_parameter /routing
@@ -474,6 +475,7 @@
 /components/translation/usage /translation
 /components/translation/custom_formats https://github.com/symfony/translation
 /components/translation/custom_message_formatter https://github.com/symfony/translation
+/components/notifier https://github.com/symfony/notifier
 /components/routing https://github.com/symfony/routing
 /doctrine/pdo_session_storage /session/database
 /doctrine/mongodb_session_storage /session/database
@@ -505,7 +507,35 @@
 /messenger/message-recorder /messenger/dispatch_after_current_bus
 /components/stopwatch https://github.com/symfony/stopwatch
 /service_container/3.3-di-changes https://symfony.com/doc/3.4/service_container/3.3-di-changes.html
+/frontend/encore/shared-entry /frontend/encore/split-chunks
+/frontend/encore/page-specific-assets /frontend/encore/simple-example#page-specific-javascript-or-css
 /testing/functional_tests_assertions /testing#testing-application-assertions
 /components https://symfony.com/components
 /components/index https://symfony.com/components
 /serializer/normalizers /components/serializer#normalizers
+/logging/monolog_regex_based_excludes /logging/monolog_exclude_http_codes
+/security/named_encoders /security/named_hashers
+/components/inflector /components/string#inflector
+/security/experimental_authenticators /security
+/security/user_provider /security/user_providers
+/security/reset_password /security/passwords#reset-password
+/security/auth_providers /security#security-authenticators
+/security/form_login /security#form-login
+/security/form_login_setup /security#form-login
+/security/json_login_setup /security#json-login
+/security/named_hashers /security/passwords#named-password-hashers
+/security/password_migration /security/passwords#security-password-migration
+/security/acl https://github.com/symfony/acl-bundle/blob/main/src/Resources/doc/index.rst
+/security/securing_services /security#securing-other-services
+/security/authenticator_manager /security
+/security/multiple_guard_authenticators /security/entry_point
+/security/guard_authentication /security/custom_authenticator
+/components/security/authentication /security#authenticating-users
+/components/security/authorization /security#access-control-authorization
+/components/security/firewall /security#the-firewall
+/components/security/secure_tools /security/passwords
+/components/security /security
+/email /mailer
+/frontend/assetic /frontend
+/frontend/assetic/index /frontend
+/controller/argument_value_resolver /controller/value_resolver

_build/spelling_word_list.txt

@@ -3,7 +3,6 @@ Akamai
 analytics
 Ansi
 Ansible
-Assetic
 async
 authenticator
 authenticators