geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-16 04:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.x' into 3.x

Browse Source 
* 2.x:
  Drop support for PHP 7.1
  Update CHANGELOG
  Emphase the fact that the include tag outputs data
  Update ChANGELOG
This commit is contained in:
Fabien Potencier
2020-10-21 12:25:26 +02:00
parent 9b76dcd70f dbc45e2421
commit 552c6bafe0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+4
View File
@@ -63,6 +63,7 @@
* Fix sandbox support when using "include(template_from_string())"
* Make round brackets optional for one argument tests like "same as" or "divisible by"
* Add support for ES2015 style object initialisation shortcut { a } is the same as { 'a': a }
* Drop PHP 7.1 support
# 2.13.1 (2020-08-05)
@@ -385,9 +386,12 @@
# 1.44.0 (2020-XX-XX)
* Remove implicit dependency on ext/iconv in JS escaper
* Fix sandbox support when using "include(template_from_string())"
* Make round brackets optional for one argument tests like "same as" or "divisible by"
* Add support for ES2015 style object initialisation shortcut { a } is the same as { 'a': a }
* Fix filter(), map(), and reduce() to throw a RuntimeError instead of a PHP TypeError
* Drop PHP 7.1 support
# 1.43.1 (2020-08-05)
doc/tags/include.rst
+1 -1
View File
@@ -1,7 +1,7 @@
``include``
===========
The ``include`` statement includes a template and returns the rendered content
The ``include`` statement includes a template and outputs the rendered content
of that file:
.. code-block:: twig