Commit Graph

5099 Commits

Author SHA1 Message Date
Fabien Potencier 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
Fabien Potencier 2ecc15a440 bug #3365 Fix a regression when not using a space before an operator (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix a regression when not using a space before an operator

Commits
-------

841906b1 Fix a regression when not using a space before an operator
2020-07-06 15:34:54 +02:00
Fabien Potencier 839b4f7744 Fix CS 2020-07-06 15:27:44 +02:00
Fabien Potencier 36141fafb2 Merge branch '1.x' into 2.x
* 1.x:
  Unify code style
2020-07-06 15:27:15 +02:00
Fabien Potencier b4088fa607 minor #3367 Unify code style (apfelbox)
This PR was merged into the 1.x branch.

Discussion
----------

Unify code style

I noticed that the code style in `ExpressionParser` changed from v1 to v3. So this PR now fixes it, that the file in v1 looks more clean.

@fabpot this is a small addendum to #3363

Commits
-------

38cb89c2 Unify code style
2020-07-06 15:26:54 +02:00
Jannik Zschiesche 38cb89c2bc Unify code style 2020-07-06 14:57:49 +02:00
Fabien Potencier 841906b110 Fix a regression when not using a space before an operator 2020-07-06 14:40:02 +02:00
Fabien Potencier 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
Fabien Potencier aa182ff7c1 feature #3363 Allow trailing commas in macros + functions + filters (apfelbox)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Allow trailing commas in macros + functions + filters

I implemented support for trailing commas in

- function calls
- filter arguments
- macro parameters + arguments (so call + definition)

Lists + maps are already supported https://twigfiddle.com/6atiz3

Is something missing?

Commits
-------

ccc2dbb0 Allow trailing commas in macros + functions + filters
2020-07-06 13:58:13 +02:00
Jannik Zschiesche ccc2dbb043 Allow trailing commas in macros + functions + filters 2020-07-06 13:58:05 +02:00
Fabien Potencier d190c2e7f7 Merge branch '1.x' into 2.x
* 1.x:
  Restrict callables to closures in filters
2020-07-05 15:32:43 +02:00
Fabien Potencier 471e965e9e bug #3308 Restrict callables to closures in filters (jderusse)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Restrict callables to closures in filters

When using filter in sandboxed mode, this PR requires the use of closure.

Commits
-------

d8259519 Restrict callables to closures in filters
2020-07-05 15:30:24 +02:00
Jérémy Derussé d8259519c0 Restrict callables to closures in filters 2020-07-05 15:30:15 +02:00
Fabien Potencier 5e1c4a63be Fix CS 2020-07-05 15:27:01 +02:00
Fabien Potencier 2505176e6d minor #3361 Update html_to_markdown.rst (ThomasLandauer)
This PR was squashed before being merged into the 2.x branch.

Discussion
----------

Update html_to_markdown.rst

Integrating some findings of https://github.com/twigphp/Twig/issues/3357

Commits
-------

4b8e1891 Update html_to_markdown.rst
2020-07-05 15:26:11 +02:00
Thomas Landauer 4b8e1891bd Update html_to_markdown.rst 2020-07-05 15:26:05 +02:00
Fabien Potencier 92398cbd8d Bump version to 2.13.0-DEV 2020-07-05 15:09:13 +02:00
Fabien Potencier 46a612ba1b Prepare the 2.13.0 release v2.13.0 2020-07-05 15:08:05 +02:00
Fabien Potencier 6c5fbc7806 Update CHANGELOG 2020-07-05 15:07:40 +02:00
Fabien Potencier adc9b89b27 Merge branch '1.x' into 2.x
* 1.x:
  Bump version to 1.43.1-DEV
  Prepare the 1.43.0 release
  Update CHANGELOG
2020-07-05 15:03:06 +02:00
Fabien Potencier 7e08a97e0a Bump version to 1.43.1-DEV 2020-07-05 15:01:55 +02:00
Fabien Potencier 597a03e85a Prepare the 1.43.0 release v1.43.0 2020-07-05 15:00:49 +02:00
Fabien Potencier 71b4ebc929 Update CHANGELOG 2020-07-05 14:59:53 +02:00
Fabien Potencier f32950c872 Add version in the docs for search engine 2020-06-22 17:25:21 +02:00
Fabien Potencier 054e4c9e3d Merge branch '1.x' into 2.x
* 1.x:
  Add version in the docs to be more search engine friendly
2020-06-22 17:25:11 +02:00
Fabien Potencier 636215f87c Add version in the docs to be more search engine friendly 2020-06-22 17:24:49 +02:00
Fabien Potencier 62bd3cd7de Bump Drupal version in tests 2020-06-22 09:23:14 +02:00
Fabien Potencier 49df03b9ce Merge branch '1.x' into 2.x
* 1.x:
  Fix Drupal tests
2020-06-22 09:22:07 +02:00
Fabien Potencier 81aec49572 Fix Drupal tests 2020-06-22 09:21:52 +02:00
Fabien Potencier c38f96318b Fix CS 2020-06-22 08:15:56 +02:00
Fabien Potencier c2019904bb Merge branch '1.x' into 2.x
* 1.x:
  Fix CS
2020-06-22 08:13:34 +02:00
Fabien Potencier e99363231b Fix CS 2020-06-22 08:11:03 +02:00
Fabien Potencier 3beabd64bd Merge branch '1.x' into 2.x
* 1.x:
  Throw exception in case non-Traversable data is passed to "filter" filter
  Improve batch code example
2020-06-08 12:41:25 +02:00
Fabien Potencier 13bb5d5df2 minor #3343 [Documentation] Fix url_encode missing func call (Korbeil)
This PR was merged into the 2.x branch.

Discussion
----------

[Documentation] Fix url_encode missing func call

Hi,

On [`url_encode` documentation](https://twig.symfony.com/doc/3.x/filters/url_encode.html) there is a missing function.

As you can see in https://github.com/twigphp/Twig/blob/3.x/src/Extension/CoreExtension.php#L578-L585, we use `http_build_query` when the input is an array.

This PR adds this missing function call for `2.x` branch (`1.x` is ok, this issue is on `2.x` and `3.x`)

Commits
-------

00dd492b Fix missing http_build_query function call
2020-06-05 14:09:16 +02:00
Baptiste Leduc 00dd492bbc Fix missing http_build_query function call 2020-06-03 18:52:35 +02:00
Fabien Potencier 3daadc5175 bug #3326 Throw exception in case non-Traversable data is passed to "filter" (Lustmored)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Throw exception in case non-Traversable data is passed to "filter"

In PHP 7.4 passing for example null to |filter generates TypeError. I was unsure how to proceed from there as filter could silently fall back to empty result, but instead I went with throwing RuntimeExceptions to be consistent with |batch and |column.

I got confused in structure of tests here, so if that should have some kind of test please push me in the right direction and I'll gladly add it.

Commits
-------

5311963e Throw exception in case non-Traversable data is passed to "filter" filter
2020-05-25 07:16:40 +02:00
Jakub Caban 5311963eb3 Throw exception in case non-Traversable data is passed to "filter" filter 2020-05-25 07:16:34 +02:00
Fabien Potencier fa94cc4934 minor #3340 Improve batch code example (y2keeper)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Improve batch code example

The current example uses an array of 7 items, resulting in 3 arrays of 3 items each (with fill).

This can be misinterpreted at a glance as creating n arrays as opposed to arrays with n items.

We should therefore instead use an example array of 4 items resulting in 2 arrays of 3 items each (with fill).

I think this would make the functionality less ambiguous.

Commits
-------

feb93210 Improve batch code example
2020-05-25 07:15:31 +02:00
y2keeper feb9321022 Improve batch code example
The current example uses an array of 7 items, resulting in 3 arrays of 3 items each (with fill). 

This can be misinterpreted at a glance as creating n arrays as opposed to arrays with n items.

We should therefore instead use an example array of 4 items resulting in 2 arrays of 3 items each (with fill). 

I think this would make the functionality less ambiguous.
2020-05-25 07:15:25 +02:00
Nicolas Grekas 5c6d495896 minor #3339 Try running all tests on nightly (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

Try running all tests on nightly

Commits
-------

4e0008cd Try running all tests on nightly
2020-05-21 11:55:12 +02:00
Nicolas Grekas 4e0008cd82 Try running all tests on nightly 2020-05-21 11:54:27 +02:00
Nicolas Grekas 791f001ae6 Merge branch '1.x' into 2.x
* 1.x:
  Minor fixes
2020-05-21 11:15:20 +02:00
Nicolas Grekas 8f0f071681 minor #3338 Minor fixes (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Minor fixes

Commits
-------

5dc36446 Minor fixes
2020-05-21 11:11:52 +02:00
Nicolas Grekas 5dc364469b Minor fixes 2020-05-21 11:01:36 +02:00
Fabien Potencier 8d81259b9c Fix Travis config 2020-05-21 08:35:19 +02:00
Fabien Potencier 74f3ffe4b6 Fix extra package deps 2020-05-21 08:01:43 +02:00
Fabien Potencier 997dc9c192 Merge branch '1.x' into 2.x
* 1.x:
  Tweak PHP constraint
  Remove boilerplate to run tests on PHP 8
2020-05-21 07:38:18 +02:00
Fabien Potencier f59c2596ad Tweak PHP constraint 2020-05-21 07:36:43 +02:00
Fabien Potencier 9b710b9cf0 minor #3336 Remove boilerplate to run tests on PHP 8 (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Remove boilerplate to run tests on PHP 8

Follows https://github.com/symfony/symfony/pull/36882

Commits
-------

dd3defb9 Remove boilerplate to run tests on PHP 8
2020-05-21 07:35:01 +02:00
Nicolas Grekas dd3defb982 Remove boilerplate to run tests on PHP 8 2020-05-20 19:48:43 +02:00