Commit Graph

7638 Commits

Author SHA1 Message Date
Fabien Potencier e62abbf528 Deduplicate template error handling 2026-08-03 17:28:46 +02:00
Fabien Potencier 7793b6153f feature #4878 Deprecate using parentheses when testing a macro with the defined test (fabpot)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Deprecate using parentheses when testing a macro with the defined test

Commits
-------

34d9c67d38 Deprecate using parentheses when testing a macro with the defined test
2026-07-31 12:09:26 +02:00
Fabien Potencier 34d9c67d38 Deprecate using parentheses when testing a macro with the defined test 2026-07-31 12:09:23 +02:00
Fabien Potencier 6dfc7961a2 feature #4851 Redesign macro calls and argument handling (fabpot)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Redesign macro calls and argument handling

This is my attempt to make macros "better". It uses modern PHP features that didn't exist when I designed macros a long time ago.

The first objective is to close the gap between their behavior and the behavior of Twig callables: functions, filters, and tests.

Here are some important changes:

* Calling a macro without passing a value for an argument that has no default value is deprecated; it is currently silently passed as `null`.
* Passing extra positional arguments or unknown named arguments to a macro without an explicit variadic argument is deprecated; these arguments are currently silently accepted through the implicit `varargs` variable.
* Explicit variadic macro arguments are now supported with `...name`.
* Macros are compiled as closures stored in the macro registry, instead of public generated `macro_*` methods.

The refactor introduces `TwigMacro` and `MacroArgument` to represent template-defined macros with an explicit signature, similar to the existing Twig callable model.

Commits
-------

d7f8b4eb1c Redesign macro calls and argument handling
2026-07-30 13:53:27 +02:00
Fabien Potencier d7f8b4eb1c Redesign macro calls and argument handling 2026-07-30 13:53:24 +02:00
Fabien Potencier e315d6d396 feature #4854 Make the sandbox a first-class citizen with a dedicated Sandbox class (fabpot)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Make the sandbox a first-class citizen with a dedicated Sandbox class

I've been thinking about making the sabdbox feature as a first class citizen for years. With all the work that has been done recently on security issues, I spent some time on it again. Here is the result.

The main ideas:

* Currently, the sandbox is thigtly coupled to the "main" environment: `SandboxExtension` is registered on the environmen directly, so it instruments all compiled template, and adds runtime checks to all renders, trusted or not. As recommended in the docs, you should have a dedicated environment for sandboxes, different from the main one, but it's not really "enforced" nor natural to do.
* As a consequence, we store some state via `enableSandbox()`/`disableSandbox()` with try/finally patterns scattered across the codebase to support rendering sandboxed and non-sandboxed templates from a environment.
* When using one environment, a sandboxed template can `include` anything the loader can load, sees every application global, and inherits all extensions, this is a footgun (again, already not recommended in the docs).
* There are too maybe "knobs": global mode, `enableSandbox()`, `{% include(..., sandboxed: true) %}`, and `{% sandbox %}`.

The new `Twig\Sandbox\Sandbox` class renders untrusted templates through a dedicated, always-sandboxed environment crafted by the developer. Taht way, there is no state to toggle and nothing leaks between the main environment and the sandbox, in either direction.

Commits
-------

b762bc94b9 Make the sandbox a first-class citizen with a dedicated Sandbox class
2026-07-30 12:05:54 +02:00
Fabien Potencier b762bc94b9 Make the sandbox a first-class citizen with a dedicated Sandbox class 2026-07-30 12:05:47 +02:00
Fabien Potencier 5bbbe0d8d6 feature #4877 Deprecate macro calls without parentheses (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Deprecate macro calls without parentheses

Commits
-------

ad305b414e Deprecate macro calls without parentheses
2026-07-28 16:24:59 +02:00
Fabien Potencier ad305b414e Deprecate macro calls without parentheses 2026-07-28 16:13:23 +02:00
Fabien Potencier a2a4c1b4f2 feature #4876 Rename macro variable AST nodes (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Rename macro variable AST nodes

The current name are just wrong as these classes are only used in the context of macros. They were confusing.

Commits
-------

be36fee09e Rename macro variable AST nodes
2026-07-28 12:07:42 +02:00
Fabien Potencier be36fee09e Rename macro variable AST nodes 2026-07-28 11:53:50 +02:00
Fabien Potencier ccc4a80ba7 documentation #4875 Clarify the security scope for untrusted templates (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Clarify the security scope for untrusted templates

Commits
-------

222a7f3f9a Clarify the security scope for untrusted templates
2026-07-28 09:51:25 +02:00
Fabien Potencier 222a7f3f9a Clarify the security scope for untrusted templates 2026-07-28 08:40:21 +02:00
Fabien Potencier 239cf25362 feature #4874 Normalize destructuring assignment targets (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Normalize destructuring assignment targets

Commits
-------

6ce5beb7c2 Normalize destructuring assignment targets
2026-07-27 18:57:15 +02:00
Fabien Potencier 6ce5beb7c2 Normalize destructuring assignment targets 2026-07-27 18:51:15 +02:00
Fabien Potencier 44f6f7e6c8 feature #4873 Deprecate duplicate macro definitions (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Deprecate duplicate macro definitions

Commits
-------

258089b8a6 Deprecate duplicate macro definitions
2026-07-27 12:45:09 +02:00
Fabien Potencier 258089b8a6 Deprecate duplicate macro definitions 2026-07-27 12:24:45 +02:00
Fabien Potencier 293d05504b tidy #4872 Reuse assignment targets parsed for the for tag (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Reuse assignment targets parsed for the for tag

`ForTokenParser` rebuilds the loop targets returned by `parseAssignmentExpression()` into new `AssignContextVariable` instances, copying only the name and line number. But the parsed targets are already `AssignContextVariable` nodes with exactly those values, so the rebuild is a no-op left over from older Twig versions where for-targets were parsed as general expressions and needed normalizing.

Reusing the parsed nodes directly removes dead code, and makes the parser more robust: any metadata attached to the targets during parsing (now or in the future) is preserved instead of being silently dropped.

Commits
-------

9408f2a3f1 Reuse assignment targets parsed for the for tag
2026-07-25 18:00:28 +02:00
Fabien Potencier 9408f2a3f1 Reuse assignment targets parsed for the for tag 2026-07-25 17:48:54 +02:00
Fabien Potencier 7f94646a3b documentation #4862 Update for.rst (marilenaRM, Marilena Ruffelaere)
This PR was merged into the 3.x branch.

Discussion
----------

Update for.rst

Add context and explanation about loop.parent.

Commits
-------

02382585e9 add shadowing example
7234d51ec8 Update for.rst
2026-07-21 13:07:40 +02:00
Marilena Ruffelaere 02382585e9 add shadowing example 2026-07-20 18:57:40 +02:00
Marilena RUFFELAERE 7234d51ec8 Update for.rst
Add context and explanation about loop.parent
2026-07-17 15:42:51 +02:00
Fabien Potencier da8bd40700 bug #4859 Fix IntlExtension ignoring explicit formats when a date formatter prototype is set (fabpot)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Fix IntlExtension ignoring explicit formats when a date formatter prototype is set

Closes #3845

Commits
-------

083b6dcabe Fix IntlExtension ignoring explicit formats when a date formatter prototype is set
2026-07-13 12:17:57 +02:00
Fabien Potencier 083b6dcabe Fix IntlExtension ignoring explicit formats when a date formatter prototype is set 2026-07-13 12:17:54 +02:00
Fabien Potencier ebd4d16d8a tidy #4861 bump Twig version metadata (xabbuh)
This PR was merged into the 3.x branch.

Discussion
----------

bump Twig version metadata

following #4852

Commits
-------

57905dab67 bump Twig version metadata
2026-07-13 12:14:31 +02:00
Christian Flothmann 57905dab67 bump Twig version metadata 2026-07-13 10:56:44 +02:00
Fabien Potencier bfbd962c5f tidy #4858 Document and test sandbox __call support (fabpot)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Document and test sandbox __call support

Related to #1950

Commits
-------

29b66fd916 Document sandbox handling of magic __call() methods
72da20aeb7 Add sandbox tests for methods routed through __call()
2026-07-12 15:54:43 +02:00
Fabien Potencier 29b66fd916 Document sandbox handling of magic __call() methods 2026-07-12 15:45:50 +02:00
Fabien Potencier 72da20aeb7 Add sandbox tests for methods routed through __call() 2026-07-12 15:45:50 +02:00
Fabien Potencier a5cbfabb83 tidy #4860 Disable the fabbot test-case return type check (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Disable the fabbot test-case return type check

See https://github.com/symfony-tools/fabbot/pull/18

Commits
-------

27a2dba4a7 Disable the fabbot test-case return type check
2026-07-12 15:39:13 +02:00
Fabien Potencier 27a2dba4a7 Disable the fabbot test-case return type check 2026-07-12 15:35:49 +02:00
Fabien Potencier 0b8e267bce Fix CS 2026-07-12 15:21:32 +02:00
Fabien Potencier ef9c43187a Fix incompatible identifier() signature in test stubs 2026-07-12 15:15:28 +02:00
Fabien Potencier 9c6d76b61c Add void return type hint even in tests 2026-07-12 13:43:08 +02:00
Fabien Potencier 71badee960 Run php-cs-fixer sequentially so the void_return src-only customiser is applied 2026-07-10 16:33:45 +02:00
Fabien Potencier 209a98402b Fix CHANGELOG 2026-07-08 22:23:12 +02:00
Fabien Potencier 5bcd992138 feature #4852 [Intl] Add format_list filter using PHP 8.5's IntlListFormatter (BreyndotEchse)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

[Intl] Add format_list filter using PHP 8.5's IntlListFormatter

Adds a new `format_list` Twig filter to IntlExtension that formats arrays using using PHP 8.5's IntlListFormatter

On PHP < 8.5, using the filter throws a RuntimeError explaining the dependency on IntlListFormatter (Checks if `class_exists` to allow polyfills).

CI workflow only covered up to PHP 8.4, so I extended it to also run PHPUnit against 8.5.
phpstan's PHP version also bumped to 8.5.

Commits
-------

163f1b6341 [Intl] Add format_list filter using PHP 8.5's IntlListFormatter
2026-07-08 22:22:47 +02:00
Marvin Feldmann 163f1b6341 [Intl] Add format_list filter using PHP 8.5's IntlListFormatter 2026-07-08 22:22:44 +02:00
Fabien Potencier 4a7cd7057d Exempt test files from the void_return rule regardless of the config location 2026-07-08 21:16:09 +02:00
Fabien Potencier 8ada671fc3 bug #4856 Fix array access with a Stringable key on ArrayAccess objects using object keys (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Fix array access with a Stringable key on ArrayAccess objects using object keys

Closes #4855

Commits
-------

679b8fd610 Fix array access with a Stringable key on ArrayAccess objects using object keys
2026-07-08 21:15:02 +02:00
Fabien Potencier 2fb736d033 tidy #4857 Fix version in deprecation message for tag usage outside of root template (MrYamous)
This PR was merged into the 3.x branch.

Discussion
----------

Fix version in deprecation message for tag usage outside of root template

#4292 has been introduced in 3.28 and related deprecations are shown for this version in changelog file

But in some part of code including deprecation message, it's about 3.27, this is confusing when upgrading Twig

Commits
-------

fc4dee393c fix version in deprecation message for tag usage outside of root template
2026-07-08 20:57:26 +02:00
Matthieu Lempereur fc4dee393c fix version in deprecation message for tag usage outside of root template 2026-07-08 19:01:20 +02:00
Fabien Potencier 679b8fd610 Fix array access with a Stringable key on ArrayAccess objects using object keys 2026-07-06 22:42:11 +02:00
Fabien Potencier d1abdf483a bug #4853 Throw a SyntaxError instead of a PHP fatal error when a macro argument is defined twice (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Throw a SyntaxError instead of a PHP fatal error when a macro argument is defined twice

Commits
-------

0d283d304a Throw a SyntaxError instead of a PHP fatal error when a macro argument is defined twice
2026-07-04 11:20:43 +02:00
Fabien Potencier 0d283d304a Throw a SyntaxError instead of a PHP fatal error when a macro argument is defined twice 2026-07-04 11:17:28 +02:00
Fabien Potencier 54e5bc1453 Bump version 2026-07-03 22:44:56 +02:00
Fabien Potencier 597c12ed28 Prepare the 3.28.0 release v3.28.0 2026-07-03 22:44:34 +02:00
Fabien Potencier 6a175a5745 bug #4850 Render backed enums using their backing value in the html_attr function (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Render backed enums using their backing value in the html_attr function

Closes #4848

Commits
-------

9323a82eb9 Render backed enums using their backing value in the html_attr function
2026-06-25 09:13:09 +02:00
Fabien Potencier 9323a82eb9 Render backed enums using their backing value in the html_attr function 2026-06-25 08:50:01 +02:00
Fabien Potencier ec0f5d5dad Tweak previous merge 2026-06-19 08:06:30 +02:00