Skip to content

Commit ed1046a

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Remove 5.x versionadded directives [#16895] Remove last center align [#16895] Add alt description to new images
2 parents 565af2b + 3c24f6e commit ed1046a

File tree

4 files changed

+1
-12
lines changed

4 files changed

+1
-12
lines changed

components/var_dumper.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ then its dump representation::
483483
dump($var);
484484
485485
.. image:: /_images/components/var_dumper/10-uninitialized.png
486+
:alt: Dump output where the uninitialized property is represented by a question mark followed by the type definition.
486487

487488
.. versionadded:: 6.4
488489

configuration/micro_kernel_trait.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,6 @@ be automatically registered as an extension. You can learn more about it in
166166
the dedicated section about
167167
:ref:`managing configuration with extensions <components-dependency-injection-extension>`.
168168

169-
.. versionadded:: 5.2
170-
171-
The automatic registration of the kernel as an extension when implementing the
172-
:class:`Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface`
173-
was introduced in Symfony 5.2.
174-
175169
It is also possible to implement the ``EventSubscriberInterface`` to handle
176170
events directly from the kernel, again it will be registered automatically::
177171

security/login_link.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@ number::
271271
This will send an email like this to the user:
272272

273273
.. image:: /_images/security/login_link_email.png
274-
:align: center
275274
:alt: A default Symfony e-mail containing the text "Click on the button below to confirm you want to sign in" and the button with the login link.
276275

277276
.. tip::

service_container/tags.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -541,11 +541,6 @@ To answer this, change the service declaration:
541541
</services>
542542
</container>
543543
544-
.. versionadded:: 5.1
545-
546-
The possibility to add the ``name`` attribute to a tag in XML and YAML
547-
formats was introduced in Symfony 5.1.
548-
549544
.. tip::
550545

551546
In YAML format, you may provide the tag as a simple string as long as

0 commit comments

Comments
 (0)