b02fa41f37
Prepare the 3.1.1 release
2020-10-27 20:28:23 +01:00
1327db55e9
Merge branch '2.x' into 3.x
...
* 2.x:
Update format_time.rst
Fix "include(template_from_string())"
Fix PHPUnit config
2020-10-27 15:15:09 +01:00
497f027cd4
Merge branch '1.x' into 2.x
...
* 1.x:
Fix "include(template_from_string())"
Fix PHPUnit config
2020-10-27 15:14:55 +01:00
9fb2deee6e
bug #3413 Fix "include(template_from_string())" when not using a sandbox (fabpot)
...
This PR was squashed before being merged into the 1.x branch.
Discussion
----------
Fix "include(template_from_string())" when not using a sandbox
Closed #3411
Commits
-------
df9c9f213d91e335
2020-10-27 15:14:35 +01:00
bfdaee83f4
Merge branch '2.x' into 3.x
...
* 2.x:
Fix CS
2020-10-27 13:57:04 +01:00
5fd9bf13bb
Fix CS
2020-10-27 13:56:56 +01:00
3078be718c
Fix CS
2020-10-27 13:53:45 +01:00
df9c9f2165
Fix "include(template_from_string())"
2020-10-27 13:39:31 +01:00
4f16844c1c
Bump version to 3.1.1-DEV
2020-10-21 15:08:11 +02:00
9a29e1fa7b
Prepare the 3.1.0 release
2020-10-21 14:45:34 +02:00
59a3b141a7
Bump version to 2.14.1-DEV
2020-10-21 14:44:28 +02:00
d495243dad
Prepare the 2.14.0 release
2020-10-21 14:35:06 +02:00
18f9309f35
Bump version to 1.44.1-DEV
2020-10-21 14:33:23 +02:00
e7c93a4af5
Prepare the 1.44.0 release
2020-10-21 14:32:35 +02:00
df7471fed6
Merge branch '2.x' into 3.x
...
* 2.x:
Fix PHP 8 support
2020-10-21 14:27:08 +02:00
53650c55c1
Merge branch '1.x' into 2.x
...
* 1.x:
Fix PHP 8 support
2020-10-21 14:27:01 +02:00
b1c9faa33e
Fix PHP 8 support
2020-10-21 14:08:16 +02:00
dba3517f4b
Merge branch '2.x' into 3.x
...
* 2.x:
Fix missing delimiter for preg_quote in lexer
2020-09-27 07:01:41 +02:00
f4aacffcbb
Merge branch '1.x' into 2.x
...
* 1.x:
Fix missing delimiter for preg_quote in lexer
2020-09-27 07:01:29 +02:00
41605057a4
Fix missing delimiter for preg_quote in lexer
2020-09-27 06:58:41 +02:00
67eea1843b
Backport #3397
2020-09-14 15:17:28 +02:00
1e449c0f6f
Merge branch '2.x' into 3.x
...
* 2.x:
Replace implicit dependence on ext/iconv in JS escaper
2020-09-14 15:15:32 +02:00
b77c2c40b4
Replace implicit dependence on ext/iconv in JS escaper
...
polyfill-iconv does not support the UTF-16BE conversion
2020-09-13 19:23:45 +02:00
1fb577363d
Merge branch '2.x' into 3.x
...
* 2.x:
Fix sandbox support when using include(template_from_string())
Add test to verify that filter is not working when template_from_string is used.
In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError
2020-08-23 17:55:24 +02:00
ab6695b580
Merge branch '1.x' into 2.x
...
* 1.x:
Fix sandbox support when using include(template_from_string())
Add test to verify that filter is not working when template_from_string is used.
In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError
2020-08-23 17:55:14 +02:00
c7be1bb3c4
Fix sandbox support when using include(template_from_string())
2020-08-23 17:48:34 +02:00
54eff0d96e
bug #3341 In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError (thijzert)
...
This PR was squashed before being merged into the 1.x branch.
Discussion
----------
In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError
If a template accidentally performs `|filter(...)` on a variable that isn't traversable (e.g. `null`), the calling code will encouter the raw `TypeError` that results from Twig trying to construct an `IteratorIterator` on that variable. This means that context information (e.g., in which exact template the error occurred, and on which line) is discarded, which makes it very difficult to debug your templates.
This commit adds code to throw a `RuntimeError` if Twig encounters a situation where there's no valid way to filter an array.
Commits
-------
567b1e2a
2020-08-23 16:40:19 +02:00
567b1e2a06
In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError
2020-08-23 16:40:13 +02:00
7759111e75
Merge branch '2.x' into 3.x
...
* 2.x:
Update CHANGELOG
Update CHANGELOG
Fix previous merge
Make round brackets optional for one argument tests like sameas
2020-08-23 14:22:39 +02:00
9bf49d5ccf
Merge branch '1.x' into 2.x
...
* 1.x:
Update CHANGELOG
Fix previous merge
Make round brackets optional for one argument tests like sameas
2020-08-23 14:22:09 +02:00
1ee72d9e15
Make round brackets optional for one argument tests like sameas
2020-08-23 14:16:31 +02:00
b62e30eff1
Bump version
2020-08-23 14:03:42 +02:00
f9ae0f8237
Merge branch '2.x' into 3.x
...
* 2.x:
Bump version
Bump version
Tweak docs
Update CHANGELOG
Support object init from variable
2020-08-23 14:02:58 +02:00
7c3f4ec8e9
Bump version
2020-08-23 14:01:50 +02:00
77dcff7186
Merge branch '1.x' into 2.x
...
* 1.x:
Bump version
Tweak docs
Update CHANGELOG
Support object init from variable
2020-08-23 14:01:18 +02:00
c6927de9e7
Bump version
2020-08-23 13:59:06 +02:00
133edb3696
Support object init from variable
...
{a} is a shortcut for {a:a}
From ECMAScript 2015 syntax https://developer.mozilla.org/docs/Web/JavaScript/Reference/Operators/Object_initializer
2020-08-23 13:54:49 +02:00
222d053733
Merge branch '2.x' into 3.x
...
* 2.x:
Fix CS
Fix CS
2020-08-23 13:49:50 +02:00
cb3a8a25d0
Fix CS
2020-08-23 13:49:43 +02:00
81612a5c7d
Merge branch '1.x' into 2.x
...
* 1.x:
Fix CS
2020-08-23 13:49:18 +02:00
bde54e11b8
Fix CS
2020-08-23 13:48:32 +02:00
67bff7b7c9
Fixed Twig\Template check
2020-08-13 06:50:55 -07:00
23fb28296e
Bump version to 3.0.6-DEV
2020-08-05 17:14:16 +02:00
9b76b15354
Prepare the 3.0.5 release
2020-08-05 17:13:19 +02:00
76f8ead7ef
Bump version to 2.13.2-DEV
2020-08-05 17:10:06 +02:00
57e9625977
Prepare the 2.13.1 release
2020-08-05 17:09:04 +02:00
4ba9822987
Bump version to 1.43.2-DEV
2020-08-05 17:06:12 +02:00
2311602f6a
Prepare the 1.43.1 release
2020-08-05 17:05:05 +02:00
0fdf96c389
Merge branch '2.x' into 3.x
...
* 2.x:
Add a test
Fix typo
Fix compatibility with PHPUnit 10
Update doc for macro with embed tags
fix typo in ApplyTokenParser PHP doc
Fixes #3351
2020-08-05 16:54:08 +02:00
38bd74d03a
Merge branch '1.x' into 2.x
...
* 1.x:
Add a test
fix typo in ApplyTokenParser PHP doc
Fixes #3351
2020-08-05 16:53:59 +02:00
Fabien Potencier
wait
JoshyPHP
Thijs van Dijk
Andreas
Jérôme TAMARELLE
Brandon Kelly