Skip to content

Commit c2c5ddc

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Remove obsolete blacklist entries Remove obsolete comments
2 parents 9e7b453 + dc90647 commit c2c5ddc

File tree

4 files changed

+4
-14
lines changed

4 files changed

+4
-14
lines changed

.doctor-rst.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ whitelist:
8383
- '.. versionadded:: 1.9.0' # Encore
8484
- '.. versionadded:: 0.28.4' # Encore
8585
- '.. versionadded:: 2.4.0' # SwiftMailer
86-
- '.. versionadded:: 1.30' # Twig
87-
- '.. versionadded:: 1.35' # Twig
8886
- '.. versionadded:: 1.11' # Messenger (Middleware / DoctrineBundle)
8987
- '.. versionadded:: 1.18' # Flex in setup/upgrade_minor.rst
9088
- '.. versionadded:: 1.0.0' # Encore

components/form.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,6 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
223223
// ...
224224
->getFormFactory();
225225

226-
.. versionadded:: 1.30
227-
228-
The ``Twig\RuntimeLoader\FactoryRuntimeLoader`` was introduced in Twig 1.30.
229-
230226
The exact details of your `Twig Configuration`_ will vary, but the goal is
231227
always to add the :class:`Symfony\\Bridge\\Twig\\Extension\\FormExtension`
232228
to Twig, which gives you access to the Twig functions for rendering forms.

reference/configuration/twig.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ autoescape_service
6767

6868
**type**: ``string`` **default**: ``null``
6969

70-
As of Twig 1.17, the escaping strategy applied by default to the template is
71-
determined during compilation time based on the filename of the template. This
72-
means for example that the contents of a ``*.html.twig`` template are escaped
73-
for HTML and the contents of ``*.js.twig`` are escaped for JavaScript.
70+
The escaping strategy applied by default to the template is determined during
71+
compilation time based on the filename of the template. This means for example
72+
that the contents of a ``*.html.twig`` template are escaped for HTML and the
73+
contents of ``*.js.twig`` are escaped for JavaScript.
7474

7575
This option allows to define the Symfony service which will be used to determine
7676
the default escaping applied to the template.

templating/twig_extension.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ this command to confirm that your new filter was successfully registered:
103103
Creating Lazy-Loaded Twig Extensions
104104
------------------------------------
105105

106-
.. versionadded:: 1.35
107-
108-
Support for lazy-loaded extensions was introduced in Twig 1.35.0 and 2.4.4.
109-
110106
Including the code of the custom filters/functions in the Twig extension class
111107
is the simplest way to create extensions. However, Twig must initialize all
112108
extensions before rendering any template, even if the template doesn't use an

0 commit comments

Comments
 (0)