Skip to content

Commit 933f7a6

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: [Form] Minor deletion Update definition.rst Document by_reference option Update Monolog processors github url
2 parents bce26da + 83bdd35 commit 933f7a6

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

components/config/definition.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,8 @@ character (``.``)::
827827

828828
$node = $treeBuilder->buildTree();
829829
$children = $node->getChildren();
830-
$path = $children['driver']->getPath();
830+
$childChildren = $children['connection']->getChildren();
831+
$path = $childChildren['driver']->getPath();
831832
// $path = 'database.connection.driver'
832833

833834
Use the ``setPathSeparator()`` method on the config builder to change the path
@@ -838,7 +839,8 @@ separator::
838839
$treeBuilder->setPathSeparator('/');
839840
$node = $treeBuilder->buildTree();
840841
$children = $node->getChildren();
841-
$path = $children['driver']->getPath();
842+
$childChildren = $children['connection']->getChildren();
843+
$path = $childChildren['driver']->getPath();
842844
// $path = 'database/connection/driver'
843845

844846
Processing Configuration Values

form/form_customization.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,9 @@ Renders any errors for the given field.
268268
269269
.. caution::
270270

271-
In the :ref:`error messages of Bootstrap 5 Form Theme <reference-forms-bootstrap5-error-messages>`,
272-
``form_errors()`` is already included in ``form_label()``.
271+
In the Bootstrap 4 form theme, ``form_errors()`` is already included in
272+
``form_label()``. Read more about this in the
273+
:ref:`Bootstrap 4 theme documentation <reference-forms-bootstrap5-error-messages>`.
273274

274275
.. _reference-forms-twig-widget:
275276

logging/processors.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,4 +286,4 @@ the ``monolog.processor`` tag:
286286
->addTag('monolog.processor', ['channel' => 'main']);
287287
288288
.. _`Monolog`: https://github.com/Seldaek/monolog
289-
.. _`built-in Monolog processors`: https://github.com/Seldaek/monolog/tree/master/src/Monolog/Processor
289+
.. _`built-in Monolog processors`: https://github.com/Seldaek/monolog/tree/main/src/Monolog/Processor

reference/forms/types/entity.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,8 @@ type:
284284

285285
.. include:: /reference/forms/types/options/attr.rst.inc
286286

287+
.. include:: /reference/forms/types/options/by_reference.rst.inc
288+
287289
.. include:: /reference/forms/types/options/data.rst.inc
288290

289291
.. include:: /reference/forms/types/options/disabled.rst.inc

0 commit comments

Comments
 (0)