Commit Graph

5355 Commits

Author SHA1 Message Date
Fabien Potencier 2d2bd8fb63 minor #3381 Added return and argument type for LoaderInterface (reneroboter)
This PR was merged into the 3.x branch.

Discussion
----------

Added return and argument type for LoaderInterface

@fabpot I have started with my preparation for the Twig Certification. Here I found some missing return and argument type at the DatabaseTwigLoader example. Hopefully I fix everything corrent. I couldn't found a CONTRIBUTING.md or anything else.

Commits
-------

5521e034 Added return and argument type for LoaderInterface
2020-08-04 08:19:16 +02:00
René Backhaus 5521e03471 Added return and argument type for LoaderInterface 2020-08-01 09:02:27 +02:00
Fabien Potencier 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
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 cf929e68ab Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Unify code style
2020-07-06 15:27: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 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
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 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
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 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 [3.x] Fix twig_compare w.r.t. whitespace trimming
2020-07-05 15:21:59 +02:00
Guilliam Xavier 9d115f6831 [3.x] Fix twig_compare w.r.t. whitespace trimming 2020-07-05 15:21:52 +02:00
Fabien Potencier b0638fa5c1 Bump version to 3.0.5-DEV 2020-07-05 15:19:13 +02:00
Fabien Potencier 582bdbdc17 Prepare the 3.0.4 release v3.0.4 2020-07-05 15:18:14 +02:00
Fabien Potencier 7265866c3f Update CHANGELOG 2020-07-05 15:17:47 +02:00
Fabien Potencier f3d7501533 Merge branch '2.x' into 3.x
* 2.x:
  Bump version to 2.13.0-DEV
  Prepare the 2.13.0 release
  Update CHANGELOG
  Bump version to 1.43.1-DEV
  Prepare the 1.43.0 release
  Update CHANGELOG
2020-07-05 15:10:18 +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 c5ea009ef5 Merge branch '2.x' into 3.x
* 2.x:
  Add version in the docs for search engine
  Add version in the docs to be more search engine friendly
2020-06-22 17:25:37 +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 19345fcc1d minor #3355 Minimum version fix (pgorod)
This PR was merged into the 3.x branch.

Discussion
----------

Minimum version fix

I just tried this on Composer

Commits
-------

3db903e1 Minimum version fix
2020-06-22 17:24:02 +02:00
Fabien Potencier 0fb982ae1c Merge branch '2.x' into 3.x
* 2.x:
  Bump Drupal version in tests
  Fix Drupal tests
2020-06-22 09:23:21 +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 c83ede7fcd Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Fix CS
2020-06-22 08:17:05 +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
pgorod 3db903e198 Minimum version fix
I just tried this on Composer
2020-06-17 10:37:50 +01:00
Fabien Potencier 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 Fix twig_compare float-string trailing whitespace + refactor
2020-06-08 12:43:20 +02:00