Commit Graph

5122 Commits

Author SHA1 Message Date
Fabien Potencier f7ce885a02 Merge branch '1.x' into 2.x
* 1.x:
  Update phpunit assertion
2020-08-23 12:31:37 +02:00
Fabien Potencier a293147027 minor #3389 Update phpunit assertion (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Update phpunit assertion

Commits
-------

e5882d9f Update phpunit assertion
2020-08-23 12:30:49 +02:00
Fabien Potencier e5882d9fb4 Update phpunit assertion 2020-08-23 12:22:59 +02:00
Fabien Potencier b531196d8c bug #3388 Fixed Twig\Template check (brandonkelly)
This PR was merged into the 2.x branch.

Discussion
----------

Fixed Twig\Template check

Looks like this was missed when the `Twig\Template` class was added, and `Twig_Template` was deprecated + aliased.

Commits
-------

67bff7b7 Fixed Twig\Template check
2020-08-13 16:11:59 +02:00
Brandon Kelly 67bff7b7c9 Fixed Twig\Template check 2020-08-13 06:50:55 -07:00
Fabien Potencier 76f8ead7ef Bump version to 2.13.2-DEV 2020-08-05 17:10:06 +02:00
Fabien Potencier 57e9625977 Prepare the 2.13.1 release v2.13.1 2020-08-05 17:09:04 +02:00
Fabien Potencier f48f94a358 Update CHANGELOG 2020-08-05 17:08:12 +02:00
Fabien Potencier bf68fa6d22 Merge branch '1.x' into 2.x
* 1.x:
  Bump version to 1.43.2-DEV
  Prepare the 1.43.1 release
  Update CHANGELOG
2020-08-05 17:08:01 +02:00
Fabien Potencier 4ba9822987 Bump version to 1.43.2-DEV 2020-08-05 17:06:12 +02:00
Fabien Potencier 2311602f6a Prepare the 1.43.1 release v1.43.1 2020-08-05 17:05:05 +02:00
Fabien Potencier 5383d354d3 Update CHANGELOG 2020-08-05 17:00:10 +02:00
Fabien Potencier 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 94aa9bf305 Add a test 2020-08-05 16:53:34 +02:00
Fabien Potencier bf3cc60121 Fix typo 2020-07-29 08:07:51 +02:00
Fabien Potencier 1a95a0bafe minor #3377 Macro not available in embed tags (GromNaN)
This PR was merged into the 2.x branch.

Discussion
----------

Macro not available in embed tags

Macro imported globally in a template via `import` or `from` are not available inside `embed` tags.
This behavior is present since Twig v2.0.0. I think it needs to be documented. Feel free to suggest an other text.

Here is some example :

- If the macro is imported globally, it's not available inside the `embed` tag, we get an error : https://twigfiddle.com/jwtwm3
```twig
{% import 'macro.twig' as macro %}
{% embed 'embed.twig' %}
    {% block content %}
        {{ macro.sayhello('Jérôme') }}
    {% endblock %}
{% endembed %}
```
- Whereas is the macro is imported inside the `embed` tag, it's available in its `block` tags : https://twigfiddle.com/jwtwm3/2
```twig
{% embed 'embed.twig' %}
    {% import 'macro.twig' as macro %}
    {% block content %}
        {{ macro.sayhello('Jérôme') }}
    {% endblock %}
{% endembed %}
```

Commits
-------

be291441 Update doc for macro with embed tags
2020-07-29 08:07:02 +02:00
Fabien Potencier c0ec6c9c01 minor #3378 Fix compatibility with PHPUnit 9 (GromNaN)
This PR was merged into the 2.x branch.

Discussion
----------

Fix compatibility with PHPUnit 9

Commits
-------

9a83f7ed Fix compatibility with PHPUnit 10
2020-07-29 07:50:05 +02:00
Jérôme TAMARELLE 9a83f7edf6 Fix compatibility with PHPUnit 10 2020-07-29 03:03:03 +02:00
Jérôme Tamarelle be291441ea Update doc for macro with embed tags 2020-07-29 02:33:15 +02:00
Fabien Potencier b65facc1c5 minor #3373 fix typo in ApplyTokenParser PHP doc (campino2k)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

fix typo in ApplyTokenParser PHP doc

Typo

Commits
-------

47b5028f fix typo in ApplyTokenParser PHP doc
2020-07-21 13:11:55 +02:00
Chris Jung 47b5028f46 fix typo in ApplyTokenParser PHP doc
Typo
2020-07-21 13:11:49 +02:00
Fabien Potencier cb06013c8d bug #3348 Fixes #3351 (Bozhidar Hristov)
This PR was submitted for the 3.x branch but it was squashed and merged into the 1.x branch instead.

Discussion
----------

Fixes #3351

Sandbox mode is not disabled if syntax error occurs inside {% sandbox %} tag

Fixes #3351

Commits
-------

04658c9f Fixes #3351
2020-07-09 14:43:42 +02:00
Bozhidar Hristov 04658c9f59 Fixes #3351 2020-07-09 14:43:36 +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 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