Skip to content

Commit

Permalink
Merge branch '4.4' into 5.0
Browse files Browse the repository at this point in the history
* 4.4:
  Update readme
  Fixed the minimum Twig version needed for lazy extensions
  • Loading branch information
javiereguiluz committed Dec 9, 2019
2 parents 03da5d8 + f2fcdde commit 33eb94e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .doctor-rst.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ whitelist:
- '.. _`LDAP injection`: http://projects.webappsec.org/w/page/13246947/LDAP%20Injection'
- '.. versionadded:: 0.21.0' # Encore
- '.. versionadded:: 2.4.0' # SwiftMailer
- '.. versionadded:: 1.26' # Twig
- '.. versionadded:: 1.30' # Twig
- '.. versionadded:: 1.35' # Twig
- '.. versionadded:: 1.2' # MakerBundle
- '.. versionadded:: 1.11' # MakerBundle
- '.. versionadded:: 1.3' # MakerBundle
Expand Down
3 changes: 2 additions & 1 deletion README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ Symfony documentation, please read
SymfonyCloud
------------

Pull requests are automatically built by [SymfonyCloud](https://symfony.com/cloud).
Thanks to [SymfonyCloud](https://symfony.com/cloud) for providing an integration
server where Pull Requests are built and can be reviewed by contributors.

Docker
------
Expand Down
4 changes: 2 additions & 2 deletions templating/twig_extension.rst
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ this command to confirm that your new filter was successfully registered:
Creating Lazy-Loaded Twig Extensions
------------------------------------

.. versionadded:: 1.26
.. versionadded:: 1.35

Support for lazy-loaded extensions was introduced in Twig 1.26.
Support for lazy-loaded extensions was introduced in Twig 1.35.0 and 2.4.4.

Including the code of the custom filters/functions in the Twig extension class
is the simplest way to create extensions. However, Twig must initialize all
Expand Down

0 comments on commit 33eb94e

Please sign in to comment.