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
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
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
b0ce4f64ba
Update CHANGELOG
2020-08-23 13:56:44 +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
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
f787c032ab
Migrate more tests
2020-08-23 12:47:51 +02:00
e5882d9fb4
Update phpunit assertion
2020-08-23 12:22:59 +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
94aa9bf305
Add a test
2020-08-05 16:53:34 +02:00
9a83f7edf6
Fix compatibility with PHPUnit 10
2020-07-29 03:03:03 +02:00
04658c9f59
Fixes #3351
2020-07-09 14:43:36 +02:00
57ca24c5f3
Merge branch '2.x' into 3.x
...
* 2.x:
Fix a regression when not using a space before an operator
2020-07-06 15:35:21 +02:00
e063bab1a6
Merge branch '1.x' into 2.x
...
* 1.x:
Fix a regression when not using a space before an operator
2020-07-06 15:35:12 +02:00
841906b110
Fix a regression when not using a space before an operator
2020-07-06 14:40:02 +02:00
8a6c47cbf2
Merge branch '2.x' into 3.x
...
* 2.x:
Allow trailing commas in macros + functions + filters
2020-07-06 14:00:03 +02:00
865da858ae
Merge branch '1.x' into 2.x
...
* 1.x:
Allow trailing commas in macros + functions + filters
2020-07-06 13:59:53 +02:00
ccc2dbb043
Allow trailing commas in macros + functions + filters
2020-07-06 13:58:05 +02:00
81e0746b95
Merge branch '2.x' into 3.x
...
* 2.x:
Restrict callables to closures in filters
Fix CS
Update html_to_markdown.rst
2020-07-05 15:32:53 +02:00
d190c2e7f7
Merge branch '1.x' into 2.x
...
* 1.x:
Restrict callables to closures in filters
2020-07-05 15:32:43 +02:00
d8259519c0
Restrict callables to closures in filters
2020-07-05 15:30:15 +02:00
bc91b0e14c
bug #3353 [3.x] Fix twig_compare w.r.t. whitespace trimming (guilliamxavier)
...
This PR was squashed before being merged into the 3.x branch.
Discussion
----------
[3.x] Fix twig_compare w.r.t. whitespace trimming
Fixes #3352
Commits
-------
9d115f68
2020-07-05 15:21:59 +02:00
9d115f6831
[3.x] Fix twig_compare w.r.t. whitespace trimming
2020-07-05 15:21:52 +02:00
c83ede7fcd
Merge branch '2.x' into 3.x
...
* 2.x:
Fix CS
Fix CS
2020-06-22 08:17:05 +02:00
c38f96318b
Fix CS
2020-06-22 08:15:56 +02:00
83d6a120ff
bug #3256 Fix twig_compare float-string trailing whitespace + refactor (guilliamxavier)
...
This PR was squashed before being merged into the 3.x branch.
Discussion
----------
Fix twig_compare float-string trailing whitespace + refactor
Fixes #3345
Refs #2966 (and #3186 )
(feel free to discard the "Factorize" commit if you favor performance over maintainability)
Commits
-------
d6822aeb
2020-06-08 12:43:20 +02:00
d6822aebcf
Fix twig_compare float-string trailing whitespace + refactor
2020-06-08 12:43:14 +02:00
bf24f136b9
Fix the compilation of Twig comparison operators
...
The new compilation implemented in Twig 3 for PHP 7 (to match the
comparison semantic of PHP 8) was missing the surrounding braces (which
are part of the AsbtractBinary compilation). This caused issues when the
full expression would involve other operators (like the not operator),
as things would then rely on having the correct precedence in PHP (which
would not be the case).
2020-06-05 15:54:17 +02:00
3aa40a42b3
Merge branch '2.x' into 3.x
...
* 2.x:
Try running all tests on nightly
Minor fixes
Fix Travis config
2020-05-21 11:56:39 +02:00
791f001ae6
Merge branch '1.x' into 2.x
...
* 1.x:
Minor fixes
2020-05-21 11:15:20 +02:00
5dc364469b
Minor fixes
2020-05-21 11:01:36 +02:00
d57e50d778
Merge branch '2.x' into 3.x
...
* 2.x:
Allow dev versions
Allow PHP 8 for extra packages
Fix Travis
Bump version to 2.13
Fix integration tests
Fix PHP 8 compat
Install the phpunit-bridge with PHP 7.4 when testing nightly
Add PHP 8 / nightly in Travis matrix
Drop support for PHP 7.0
2020-05-19 15:23:33 +02:00
2d5e36b759
Merge branch '1.x' into 2.x
...
* 1.x:
Fix integration tests
Fix PHP 8 compat
Install the phpunit-bridge with PHP 7.4 when testing nightly
Add PHP 8 / nightly in Travis matrix
Drop support for PHP 7.0
2020-05-19 15:03:51 +02:00
6a0ab744d2
Fix PHP 8 compat
2020-05-19 14:22:31 +02:00
6384ba6c3c
Merge branch '2.x' into 3.x
...
* 2.x:
Fix ambiguous syntax parsing
2020-02-23 09:42:33 +01:00
0da153eb3b
Merge branch '1.x' into 2.x
...
* 1.x:
Fix ambiguous syntax parsing
2020-02-23 09:42:25 +01:00
5663351a49
Fix ambiguous syntax parsing
2020-02-23 09:40:57 +01:00
a95ec00440
Merge branch '2.x' into 3.x
...
* 2.x:
Fix ambiguous syntax parsing
2020-02-21 08:37:36 +01:00
0686ccf278
Merge branch '1.x' into 2.x
...
* 1.x:
Fix ambiguous syntax parsing
2020-02-21 08:37:29 +01:00
5724cbeddf
Fix ambiguous syntax parsing
2020-02-21 08:31:42 +01:00
a343589583
Updated spaceless deprecation to point to apply tag, as the filter tag is now deprecated too
2019-11-28 15:04:01 +01:00
521a03f43a
Merge branch '2.x' into 3.x
...
* 2.x:
Add support for exponential numbers
Fix phpdoc
2019-11-07 22:14:33 +01:00
468f5cbe21
Merge branch '1.x' into 2.x
...
* 1.x:
Add support for exponential numbers
Fix phpdoc
2019-11-07 22:14:26 +01:00
0d81c6e5a2
Fix twig compare
2019-11-07 22:06:46 +01:00
6092135057
Add support for exponential numbers
2019-10-22 17:32:36 +02:00
6a50ca0639
Revert previous merge partially
2019-10-01 12:35:06 +02:00
Fabien Potencier
Andreas
Jérôme TAMARELLE
Bozhidar Hristov
Jannik Zschiesche
Jérémy Derussé
Guilliam Xavier
Christophe Coevoet
Nicolas Grekas
Steve Nebes
Diogo Pinheiro