Commit Graph

3750 Commits

Author SHA1 Message Date
Fabien Potencier 70c1b3a2c2 tweaked the error message when using extends in a block/macro 2019-05-16 16:07:04 +02:00
Fabien Potencier 6315ea4786 bug #3009 Fix a PHP fatal error when calling a macro, imported in the template, in another macro (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix a PHP fatal error when calling a macro, imported in the template, in another macro

The current code iterates over all imported functions (traversing all the scopes). So, the macro was found at compilation time, but didn't work at runtime, leading to a PHP fatal error. Now, you get a proper exception at compilation time.

Commits
-------

ba9b9681 fixed a PHP fatal error when calling a macro, imported in the template, in another macro
2019-05-16 14:15:37 +02:00
Fabien Potencier ba9b9681ca fixed a PHP fatal error when calling a macro, imported in the template, in another macro 2019-05-16 14:09:44 +02:00
Fabien Potencier 0747f226f7 minor #3008 Tweak an error message (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak an error message

Commits
-------

19164de7 tweaked error messages
2019-05-16 11:37:12 +02:00
Fabien Potencier 19164de77b tweaked error messages 2019-05-16 11:32:52 +02:00
Fabien Potencier f81a1523c0 bug #3007 Fix wrong error message on "import" and "from" (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix wrong error message on "import" and "from"

Commits
-------

118462c1 fixed wrong error message on "import" and "from"
2019-05-16 11:28:20 +02:00
Fabien Potencier 118462c16d fixed wrong error message on "import" and "from" 2019-05-16 11:17:43 +02:00
Fabien Potencier b03f07e961 bumped version to 1.41.1-DEV 2019-05-14 13:59:47 +02:00
Fabien Potencier 575cd50283 prepared the 1.41.0 release v1.41.0 2019-05-14 13:59:08 +02:00
Fabien Potencier a77e7f8f63 minor #3001 Correct Twig_SimpleFilter, Twig_SimpleFunction, Twig_SimpleTest deprecation doc (blankse)
This PR was merged into the 1.x branch.

Discussion
----------

Correct Twig_SimpleFilter, Twig_SimpleFunction, Twig_SimpleTest deprecation doc

Reverts https://github.com/twigphp/Twig/commit/3632a46e82fbb391b0fc72674bd8946e0b7c5bf7 for deprecated.rst

Commits
-------

65047482 Correct Twig_SimpleFilter/Twig_SimpleFunction/Twig_SimpleTest deprecation doc (Revert: moved to namespaced classes by default)
2019-05-14 13:41:12 +02:00
Sebastian Blank 65047482be Correct Twig_SimpleFilter/Twig_SimpleFunction/Twig_SimpleTest deprecation doc (Revert: moved to namespaced classes by default) 2019-05-14 12:17:20 +02:00
Fabien Potencier 44f02b2242 fixed PHP 7.4 support 2019-05-14 11:44:36 +02:00
Fabien Potencier 611a29c48c bug #3004 Fix support for PHP 7.4 (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #3004).

Discussion
----------

Fix support for PHP 7.4

Commits
-------

f958bd1e fixed deprecation under PHP 7.4
1fb0f970 fixed PHP 7.4 support
7be8e944 added PHP 7.4 in Travis config
2019-05-14 08:45:39 +02:00
Fabien Potencier f958bd1e86 fixed deprecation under PHP 7.4 2019-05-14 08:40:21 +02:00
Fabien Potencier 1fb0f9701d fixed PHP 7.4 support 2019-05-14 08:18:04 +02:00
Fabien Potencier 7be8e9443d added PHP 7.4 in Travis config 2019-05-14 07:20:38 +02:00
Fabien Potencier 2e1e9528ce bug #2999 Fix support for IteratorAggregate in the filter filter (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix support for IteratorAggregate in the filter filter

Commits
-------

084be27d fixed support for IteratorAggregate in the filter filter
2019-05-10 08:46:52 +02:00
Fabien Potencier 084be27d77 fixed support for IteratorAggregate in the filter filter 2019-05-10 08:33:19 +02:00
Fabien Potencier 3d95ffe906 feature #2996 Add "filter", "map", and "reduce" filters (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2996).

Discussion
----------

Add "filter", "map", and "reduce" filters

This PR adds support for 3 new filters: `filter`, `map`, and `reduce`. They take an arrow function as an argument (a PHP closure).

I have restricted the usage of arrow functions as much as possible as it makes no sense to support them everywhere. So, for now, they are only accepted as arguments to filters (using them as arguments to function is not supported but could be easily added if we have a use case).

The syntax is the following: `(x) => x + 3` where `(x)` is the list of arguments, `=>` starts the body, and the body is any Twig expression. Within the arrow function, the context is also available: `(x) => x + offset` works if `offset` is defined in the current context.

~~These new filters will allow us to deprecate the `if` support on the `for` tag, which does not work well with the `loop` variable:~~

```twig

{% set sizes = {xs: 34, s: 36, m: 38, l: 40, xl: 42} %}

{# before #}
{% for name, size in sizes if size < 38 %}
    {{ name }} = {{ size }}
    {% loop.last ? 'LAST' %} {# <--- works with this PR #}
{% endfor %}

{# after #}
{% for name, size in sizes|filter(size => size < 38) %}
    {{ name }} = {{ size }}
    {{ loop.last ? 'LAST' }}
{% endfor %}
```

This closes #2785

Commits
-------

5c15f897 added the key to the map and filter filters
13274bbf added support for iterators
175041e0 removed fn in front of arrow functions
dc277635 changed arrow syntax
b30bce11 added "filter", "map", and "reduce" filters
2019-05-09 13:18:48 +02:00
Fabien Potencier 5c15f897c7 added the key to the map and filter filters 2019-05-03 19:04:11 +02:00
Fabien Potencier 13274bbf97 added support for iterators 2019-05-03 18:15:56 +02:00
Fabien Potencier 175041e01b removed fn in front of arrow functions 2019-05-03 18:12:19 +02:00
Fabien Potencier dc2776359c changed arrow syntax 2019-05-03 17:09:12 +02:00
Fabien Potencier b30bce1139 added "filter", "map", and "reduce" filters 2019-05-03 17:09:12 +02:00
Fabien Potencier 5d37a3260a bug #2995 Fix partial output leak when a PHP fatal error occurs (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix partial output leak when a PHP fatal error occurs

closes #1962 (thank you @fluff for the "trick")

Commits
-------

6196fe5b fixed partial output leak when a PHP fatal error occurs
2019-05-03 17:08:09 +02:00
Fabien Potencier ababe1a430 simplified code 2019-05-03 15:44:36 +02:00
Fabien Potencier df9c40ad53 fixed CS 2019-05-03 15:28:57 +02:00
Fabien Potencier a795acd1da bumped version to 1.41 2019-05-03 10:32:27 +02:00
Fabien Potencier 6196fe5b40 fixed partial output leak when a PHP fatal error occurs 2019-05-03 08:42:27 +02:00
Fabien Potencier d3acd0bede fixed markup in docs 2019-05-03 05:45:17 +02:00
Fabien Potencier ed083c8a93 fixed Drupal script 2019-05-01 10:58:08 +02:00
Fabien Potencier 364f4cb024 feature #2993 Add tests to avoid regressions (via Drupal) (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add tests to avoid regressions (via Drupal)

Commits
-------

9c313e3c added Drupal in the CI process
2019-05-01 10:41:10 +02:00
Fabien Potencier 9c313e3c2d added Drupal in the CI process 2019-05-01 10:06:25 +02:00
Fabien Potencier 7395b7ab95 feature #2985 Optimize context access on PHP 7.4 (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Optimize context access on PHP 7.4

Commits
-------

5b5f5659 optimized context access on PHP 7.4
2019-04-30 14:47:37 +02:00
Fabien Potencier bd7ca26497 removed wrong link in docs 2019-04-30 14:26:21 +02:00
Fabien Potencier 61eb901f16 fixed doc markup 2019-04-30 14:23:18 +02:00
Fabien Potencier bd5c53f1b2 fixed doc indexes 2019-04-30 14:16:53 +02:00
Fabien Potencier fc87a0a2c1 minor #2992 add column filter to index (pableu)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2992).

Discussion
----------

add column filter to index

Commits
-------

e804338b add column filter to index
2019-04-30 14:14:24 +02:00
Pablo Schläpfer e804338b2c add column filter to index 2019-04-30 14:14:19 +02:00
Fabien Potencier 5b5f5659a2 optimized context access on PHP 7.4 2019-04-29 19:20:52 +02:00
Fabien Potencier d7eaeead8b bumped version to 1.40.2-DEV 2019-04-29 16:13:05 +02:00
Fabien Potencier 35889516bb prepared the 1.40.1 release v1.40.1 2019-04-29 16:12:28 +02:00
Fabien Potencier 732c489693 bug #2991 Fix regression in NodeTraverser (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix regression in NodeTraverser

Commits
-------

e89800de fixed regression in NodeTraverser
2019-04-29 15:49:19 +02:00
Fabien Potencier e89800dea6 fixed regression in NodeTraverser 2019-04-29 15:28:41 +02:00
Fabien Potencier b10a8fad8f bumped version to 1.40.1-DEV 2019-04-28 07:56:01 +01:00
Fabien Potencier 2ba4eaf6b0 prepared the 1.40.0 release v1.40.0 2019-04-28 07:54:53 +01:00
Fabien Potencier c35f48fdc0 minor #2986 Tweak the docs (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak the docs

Commits
-------

5ac239ca tweaked the doc
2019-04-27 16:53:47 +01:00
Fabien Potencier 5ac239ca4f tweaked the doc 2019-04-27 15:54:47 +01:00
Fabien Potencier bf3781c9c1 feature #2981 Allow Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning) (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Allow Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning)

Commits
-------

f297b52f allowed Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning)
2019-04-26 11:38:36 +02:00
Fabien Potencier 08f57ca7a8 minor #2983 Add Parser typehint (ruudk)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2983).

Discussion
----------

Add Parser typehint

This makes it easier to work with.

Commits
-------

9ead7df1 Add Parser typehint
2019-04-26 11:36:53 +02:00