Commit Graph

1355 Commits

Author SHA1 Message Date
Christian Flothmann 53facb74c1 remove not needed code 2025-02-27 09:49:34 +01:00
Fabien Potencier 4e1fa3aa43 Remove obsolete comment 2025-02-26 22:19:38 +01:00
Fabien Potencier 7b43bd0fd7 Fix Error when the trace has Twig file/line information instead of the original PHP info 2025-02-26 21:02:58 +01:00
Fabien Potencier 4a121d90c6 Sync Error file and line 2025-02-26 13:26:24 +01:00
Fabien Potencier 7cde13f6c9 bug #4595 Improve error reporting (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Improve error reporting

Commits
-------

d5dc3eee99 Improve error reporting
2025-02-22 18:27:58 +01:00
Fabien Potencier ad203c774d bug #4583 Remove template source from Template::loadTemplate() (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Remove template source from Template::loadTemplate()

Closes #3266

The first commit supports string and Source. But I think we don't even need to pass anything (that's the other commits).

Commits
-------

d7702840da Remove $templateName from Template::loadTemplate()
2025-02-22 10:43:11 +01:00
Fabien Potencier d5dc3eee99 Improve error reporting 2025-02-22 10:22:21 +01:00
Fabien Potencier d13d31bb68 minor #4594 Simplify Error (smnandre)
This PR was merged into the 3.x branch.

Discussion
----------

Simplify Error

Follows #4593

Commits
-------

6a651ccfdc Simplify Error
2025-02-22 10:02:33 +01:00
Simon André 6a651ccfdc Simplify Error 2025-02-22 04:07:17 +01:00
Fabien Potencier 68481a2a3a Simplify code 2025-02-22 00:03:13 +01:00
Fabien Potencier d7702840da Remove $templateName from Template::loadTemplate() 2025-02-21 23:48:41 +01:00
Fabien Potencier 1c6ac163c9 minor #4589 Make in_array() calls strict (alexandre-daubois)
This PR was merged into the 3.x branch.

Discussion
----------

Make `in_array()` calls strict

I propose to add `strict: true` to all calls to `in_array()`, making the calls faster.

Commits
-------

9c6b95f2a6 Make `in_array()` calls strict
2025-02-21 19:06:58 +01:00
Fabien Potencier d72c1c6b1e Fix testing and expression when it evaluates to an instance of Markup 2025-02-21 18:29:32 +01:00
Fabien Potencier 9f275f6ac6 feature #4590 Make the defined test implementation more generic (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Make the defined test implementation more generic

Commits
-------

2d84abfd08 Make the defined test implementation more generic
2025-02-21 18:22:44 +01:00
Fabien Potencier 9b4db2e931 minor #4592 Simplify Error implementation (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Simplify Error implementation

Commits
-------

d10bcadd75 Simplify Error implementation
2025-02-21 15:39:18 +01:00
Fabien Potencier d10bcadd75 Simplify Error implementation 2025-02-21 11:34:30 +01:00
Fabien Potencier 2d84abfd08 Make the defined test implementation more generic 2025-02-21 08:36:21 +01:00
Alexandre Daubois 9c6b95f2a6 Make in_array() calls strict 2025-02-19 15:29:33 +01:00
Christian Flothmann 5f6c67f838 re-add mixed return type 2025-02-14 13:47:07 +01:00
Fabien Potencier 151aa4ecda Fix CS 2025-02-14 12:57:03 +01:00
Fabien Potencier 3964aeba78 Add a proper prefix spread operator 2025-02-14 11:45:39 +01:00
Fabien Potencier d6f539bb01 Avoid storing expression parser instances in Node attributes 2025-02-14 11:32:12 +01:00
Fabien Potencier 79d828b09d Fix version 2025-02-14 08:47:54 +01:00
Fabien Potencier 251c0b5da9 Fix CS 2025-02-14 08:45:28 +01:00
Fabien Potencier 561c6629e1 Remove obsolete code 2025-02-14 08:38:53 +01:00
Fabien Potencier 4b57f48a65 Use generics in ExpressionParsers 2025-02-14 08:38:53 +01:00
Fabien Potencier 8ff19090f3 Fix precedence rules 2025-02-14 08:38:53 +01:00
Fabien Potencier f67078b5c4 Move Operators to ExpressionParsers, deprecate ExpressionParser 2025-02-14 08:38:53 +01:00
Fabien Potencier 42c82e1e9b Extract operators logic from ExpressionParser to their own classes 2025-02-14 08:38:53 +01:00
Fabien Potencier df877a1d53 Introduce operator classes to describe operators provided by extensions instead of arrays 2025-02-14 08:38:53 +01:00
Fabien Potencier 229f54f8cf Bump version to 3.21 2025-02-14 08:36:54 +01:00
Fabien Potencier 586e3decdd Bump version 2025-02-13 09:35:50 +01:00
Fabien Potencier 3468920399 Prepare the 3.20.0 release 2025-02-13 09:34:43 +01:00
Christophe Coevoet 3794efe662 Fix support for ignoring syntax erros in an undefined handler in guard 2025-02-09 15:10:34 +01:00
Fabien Potencier fab1a37d8e bug #4546 Fix timezone conversion on strings (PrinsFrank)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Fix timezone conversion on strings

When setting a default application timezone, and a display timezone:
```php
date_default_timezone_set('UTC');
$twig->getExtension(\Twig\Extension\CoreExtension::class)->setTimezone('Europe/Paris');
```

Date objects get converted, but strings don't. See #4545.

For most other paths in `convertDate`, the dateTime object is initialized, and afterwards the timezone gets set. For strings, the timezone is passed as a constructor argument before having the timezone set again, losing its converting behaviour. This makes the convertDate method work identical for DateTime objects as strings. This different behaviour was already spotted in #3568.

Fixes #4545 #3568 #2819

Commits
-------

f69531fa00 Fix timezone conversion on strings
2025-02-07 22:52:13 +01:00
PrinsFrank f69531fa00 Fix timezone conversion on strings 2025-02-07 22:52:10 +01:00
Ruud Kamphuis a84e602b4f Use correct lineno for ForElseNode
It should take the line number of the `{% else %}` block.
2025-02-07 14:48:08 +01:00
Christophe Coevoet 198fc1a9f9 Add support for registered undefined element callbacks in tests 2025-02-04 10:28:21 +01:00
Fabien Potencier 9ccca47b8a Add UnaryInterface 2025-02-03 21:23:35 +01:00
Fabien Potencier fa1ffb5b29 Add BinaryInterface 2025-02-03 19:21:18 +01:00
Fabien Potencier af5f4c34fb Fix CS 2025-02-03 08:48:19 +01:00
Fabien Potencier 7f080086dc Fix wrong array index 2025-02-01 16:22:20 +01:00
Fabien Potencier b0399992be Fix wrong array index 2025-02-01 10:33:30 +01:00
Fabien Potencier 69f8d40448 Bump version 2025-01-29 08:07:20 +01:00
Fabien Potencier d4f8c2b863 Prepare the 3.19.0 release 2025-01-29 08:06:14 +01:00
Fabien Potencier 445f74cfe0 [SECURITY] Fix a security issue where escaping was missing when using ?? 2025-01-29 07:52:07 +01:00
Fabien Potencier f594248a40 Fix CS 2025-01-26 11:54:00 +01:00
Fabien Potencier fcd0332dca minor #4557 Fix Token::__toString() (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Fix Token::__toString()

Broken by #4554

Commits
-------

11535e9058 Fix Token::__toString()
2025-01-25 16:41:44 +01:00
Fabien Potencier 11535e9058 Fix Token::__toString() 2025-01-25 16:41:07 +01:00
Christian Flothmann 431697fc05 add missing parentheses to deprecation message 2025-01-24 20:59:56 +01:00