Merge branch '1.x' into 2.x

* 1.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:24:53 +02:00
5 changed files with 7 additions and 4 deletions
-1
View File
@@ -40,7 +40,6 @@ script:
jobs:
fast_finish: true
include:
- php: 7.1
- php: 7.2
- php: 7.3
- php: 7.4
+4
View File
@@ -3,6 +3,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)
@@ -325,9 +326,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)
+1 -1
View File
@@ -24,7 +24,7 @@
}
],
"require": {
"php": ">=7.1.3",
"php": ">=7.2.5",
"symfony/polyfill-mbstring": "^1.3",
"symfony/polyfill-ctype": "^1.8"
},
+1 -1
View File
@@ -26,7 +26,7 @@ Slim, Yii, Laravel, and Codeigniter — just to name a few.
Prerequisites
-------------
Twig 2.x needs at least **PHP 7.1.3** to run.
Twig 2.x needs at least **PHP 7.2.5** to run.
Installation
------------
+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