From c35fb93c2fa4fcf08f96d80fe9f6dee1940f2697 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Tue, 4 Mar 2025 12:53:15 +0100 Subject: [PATCH 1/4] Add missing default value in the Twig reference --- reference/configuration/twig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst index 0fcba509f31..bec117cc609 100644 --- a/reference/configuration/twig.rst +++ b/reference/configuration/twig.rst @@ -315,7 +315,7 @@ mailer html_to_text_converter ...................... -**type**: ``string`` **default**: ```` +**type**: ``string`` **default**: ``null`` .. versionadded:: 6.2 From fdb7a299eea3faa163a314f02a4d6633bddea645 Mon Sep 17 00:00:00 2001 From: Markus Mauksch <87762329+mmauksch@users.noreply.github.com> Date: Wed, 5 Mar 2025 21:22:27 +0100 Subject: [PATCH 2/4] Update overview.rst Update version numbers to currently last maintained version. Intent is to make it clearer and also easier for users using Copy-Paste for git commands. Description in the github screenshot intentionally changed to 4.4 to avoid confusion between picture and description (replacing the screenshot seemed excessive) --- contributing/documentation/overview.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst index 183910e6ac6..7095e4cbc4c 100644 --- a/contributing/documentation/overview.rst +++ b/contributing/documentation/overview.rst @@ -113,16 +113,16 @@ memorable name for the new branch (if you are fixing a reported issue, use .. code-block:: terminal - $ git checkout -b improve_install_article upstream/5.4 + $ git checkout -b improve_install_article upstream/6.4 In this example, the name of the branch is ``improve_install_article`` and the -``upstream/5.4`` value tells Git to create this branch based on the ``5.4`` +``upstream/6.4`` value tells Git to create this branch based on the ``6.4`` branch of the ``upstream`` remote, which is the original Symfony Docs repository. Fixes should always be based on the **oldest maintained branch** which contains -the error. Nowadays this is the ``5.4`` branch. If you are instead documenting a +the error. Nowadays this is the ``6.4`` branch. If you are instead documenting a new feature, switch to the first Symfony version that included it, e.g. -``upstream/6.2``. +``upstream/7.2``. **Step 5.** Now make your changes in the documentation. Add, tweak, reword and even remove any content and do your best to comply with the @@ -156,7 +156,7 @@ changes should be applied: :alt: The base branch select option on the GitHub page. In this example, the **base fork** should be ``symfony/symfony-docs`` and -the **base** branch should be the ``5.4``, which is the branch that you selected +the **base** branch should be the ``4.4``, which is the branch that you selected to base your changes on. The **head fork** should be your forked copy of ``symfony-docs`` and the **compare** branch should be ``improve_install_article``, which is the name of the branch you created and where you made your changes. @@ -209,7 +209,7 @@ contribution to the Symfony docs: # create a new branch based on the oldest maintained version $ cd projects/symfony-docs/ $ git fetch upstream - $ git checkout -b my_changes upstream/5.4 + $ git checkout -b my_changes upstream/6.4 # ... do your changes @@ -258,8 +258,8 @@ into multiple branches, corresponding to the different versions of Symfony itsel The latest (e.g. ``5.x``) branch holds the documentation for the development branch of the code. -Unless you're documenting a feature that was introduced after Symfony 5.4, -your changes should always be based on the ``5.4`` branch. Documentation managers +Unless you're documenting a feature that was introduced after Symfony 6.4, +your changes should always be based on the ``6.4`` branch. Documentation managers will use the necessary Git-magic to also apply your changes to all the active branches of the documentation. From a20720181319a2dfdf0a6afd9ada63b09c16646a Mon Sep 17 00:00:00 2001 From: Julien Bonnier Date: Wed, 5 Mar 2025 18:38:05 -0500 Subject: [PATCH 3/4] fix: Add missing ContainerBuilder use statement in Bundle documentation --- bundles/extension.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/bundles/extension.rst b/bundles/extension.rst index 23318590166..607ca1404fb 100644 --- a/bundles/extension.rst +++ b/bundles/extension.rst @@ -29,6 +29,7 @@ class, you can define the :method:`Symfony\\Component\\HttpKernel\\Bundle\\Abstr method to load service definitions from configuration files:: // ... + use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Symfony\Component\HttpKernel\Bundle\AbstractBundle; From f235bc68949ed2b3ebd9f438cdadb48698893a2a Mon Sep 17 00:00:00 2001 From: Markus Mauksch Date: Wed, 5 Mar 2025 22:22:38 +0100 Subject: [PATCH 4/4] Fix Headings mentioned in #20716 --- reference/configuration/security.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index d32d3c6ad43..53d1217c985 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -157,7 +157,7 @@ The possible values of this option are: other session attributes are lost. access_control --------------- +~~~~~~~~~~~~~~ Defines the security protection of the URLs of your application. It's used for example to trigger the user authentication when trying to access to the backend @@ -166,7 +166,7 @@ and to allow unauthenticated users to the login form page. This option is explained in detail in :doc:`/security/access_control`. firewalls ---------- +~~~~~~~~~ This is arguably the most important option of the security config file. It defines the authentication mechanism used for each URL (or URL pattern) of your