116bfb0bc9
Merge branch '1.x' into 2.x
...
* 1.x:
Fix CS
2021-03-22 09:23:49 +01:00
9773024395
Fix CS
2021-03-22 09:23:44 +01:00
0b103dfeb0
Merge branch '1.x' into 2.x
...
* 1.x:
added PHP 8.1 as experimental
2021-03-22 09:23:06 +01:00
bef89dcc1e
added PHP 8.1 as experimental
2021-03-22 09:19:53 +01:00
37e48403c2
Bump version
2021-03-10 11:07:14 +01:00
0b4ba691fb
Prepare the 2.14.4 release
2021-03-10 11:05:55 +01:00
5a60e72afa
Merge branch '1.x' into 2.x
...
* 1.x:
Add some return types
remove the C extension
Fix length filter doc
2021-02-02 16:25:09 +01:00
50d032c4df
Add some return types
2021-02-02 16:16:41 +01:00
a0e2cc2572
Bump version
2021-01-05 16:39:16 +01:00
8bc568d460
Prepare the 2.14.3 release
2021-01-05 16:34:33 +01:00
393c9086ff
Prepare the 2.14.2 release
2021-01-05 11:26:31 +01:00
31adc5e157
Bump version to ${NEXT_VERSION}-DEV
2021-01-05 11:10:47 +01:00
138c493c5b
Prepare the 1.44.2 release
2021-01-05 11:10:05 +01:00
8eb855ffb6
Bump version
2020-12-30 09:17:29 +01:00
c2a264a91d
Merge branch '1.x' into 2.x
...
* 1.x:
Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
Enhancement: Use GithubActions instead of Travis for tests
Fix `odd` not working for negative numbers
Bump version to 1.44.2-DEV
Prepare the 1.44.1 release
2020-11-05 13:31:01 +01:00
53a3ccd2d2
Fix odd not working for negative numbers
2020-11-05 11:55:45 +01:00
b163c7f716
Bump version to 2.14.2-DEV
2020-10-27 20:26:34 +01:00
5eb9ac5dfd
Prepare the 2.14.1 release
2020-10-27 20:25:29 +01:00
cb4cd888ca
Bump version to 1.44.2-DEV
2020-10-27 20:23:26 +01:00
04b15d4c0b
Prepare the 1.44.1 release
2020-10-27 20:22:48 +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
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
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
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
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
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
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
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
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
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
76f8ead7ef
Bump version to 2.13.2-DEV
2020-08-05 17:10:06 +02:00
Fabien Potencier
Oleg Andreyev
Nicolas Grekas
Harry Bournis
wait
JoshyPHP
Thijs van Dijk
Andreas
Jérôme TAMARELLE
Brandon Kelly