Commit Graph

7651 Commits

Author SHA1 Message Date
Fabien Potencier f97db8960a Merge branch '3.x' into 4.x
* 3.x:
  Avoid polluting ModuleNode::toString() with embedded templates
  Simplify code
  Add tests
  Tweak Sandbox docs
  Improve docs on creating new tags
  remove not needed code
  Remove obsolete comment
2025-02-28 08:59:42 +01:00
Fabien Potencier c0db761477 minor #4604 Avoid polluting ModuleNode::toString() with embedded templates (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Avoid polluting ModuleNode::toString() with embedded templates

Commits
-------

3d760aec1c Avoid polluting ModuleNode::toString() with embedded templates
2025-02-28 08:58:45 +01:00
Fabien Potencier 3d760aec1c Avoid polluting ModuleNode::toString() with embedded templates 2025-02-28 08:57:55 +01:00
Fabien Potencier 1fee48eb3b minor #4603 remove not needed code (xabbuh, fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

remove not needed code

Commits
-------

719bba9d1e Simplify code
da64c42dc2 Add tests
53facb74c1 remove not needed code
2025-02-28 08:56:53 +01:00
Fabien Potencier 719bba9d1e Simplify code 2025-02-28 08:54:29 +01:00
Fabien Potencier da64c42dc2 Add tests 2025-02-28 08:52:34 +01:00
Fabien Potencier 71f83ecd0e Tweak Sandbox docs 2025-02-28 07:30:52 +01:00
Fabien Potencier 932a584971 minor #4601 Improve docs on creating new tags (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Improve docs on creating new tags

/cc `@smnandre`

Commits
-------

96dade342f Improve docs on creating new tags
2025-02-27 11:10:17 +01:00
Fabien Potencier 96dade342f Improve docs on creating new tags 2025-02-27 10:07:32 +01:00
Christian Flothmann 53facb74c1 remove not needed code 2025-02-27 09:49:34 +01:00
Fabien Potencier ddbe80ead3 minor #4602 add back @dataProvider annotations (xabbuh)
This PR was merged into the 4.x branch.

Discussion
----------

add back `@dataProvider` annotations

This partially reverts 50cdb7bf4a to be able to run tests on the 3.x branch for the extra packages with Twig 4 being installed as we are still using PHPUnit 9.6 on the 3.x branch.

Commits
-------

2f3329e266 add back `@dataProvider` annotations
2025-02-27 09:42:55 +01:00
Christian Flothmann 2f3329e266 add back @dataProvider annotations
This partially reverts 50cdb7bf4a to be able
to run tests on the 3.x branch for the extra packages with Twig 4 being
installed as we are still using PHPUnit 9.6 on the 3.x branch.
2025-02-27 09:26:23 +01:00
Fabien Potencier 4e1fa3aa43 Remove obsolete comment 2025-02-26 22:19:38 +01:00
Fabien Potencier d8cc7c6340 Merge branch '3.x' into 4.x
* 3.x:
  Remove obsolete files
2025-02-26 22:13:16 +01:00
Fabien Potencier b86fd0a059 Remove obsolete files 2025-02-26 22:13:11 +01:00
Fabien Potencier 4a3f02f0b8 Merge branch '3.x' into 4.x
* 3.x:
  Move some tests
2025-02-26 22:11:29 +01:00
Fabien Potencier b6e7097c02 minor #4600 Move some tests (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Move some tests

Commits
-------

56204e951a Move some tests
2025-02-26 22:11:16 +01:00
Fabien Potencier 56204e951a Move some tests 2025-02-26 22:10:10 +01:00
Fabien Potencier 50cdb7bf4a Remove usage of @dataProvider 2025-02-26 22:01:08 +01:00
Fabien Potencier 29a26782d0 Fix merge 2025-02-26 21:58:09 +01:00
Fabien Potencier d5ea3f9fe4 Merge branch '3.x' into 4.x
* 3.x:
  Fix Error when the trace has Twig file/line information instead of the original PHP info
  Sync Error file and line
2025-02-26 21:57:20 +01:00
Fabien Potencier 33a08191b9 bug #4599 Fix Error when the trace has Twig file/line information instead of the original PHP info (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Fix Error when the trace has Twig file/line information instead of the original PHP info

See https://github.com/twigphp/Twig/pull/4592/files#r1966616393
/cc `@smnandre`

Commits
-------

7b43bd0fd7 Fix Error when the trace has Twig file/line information instead of the original PHP info
2025-02-26 21:54:22 +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 02118c7ebd bug #4598 Sync Error file and line (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Sync Error file and line

The PHP exception file and name go together. So, we should only update the line number only if we have a file.

Commits
-------

4a121d90c6 Sync Error file and line
2025-02-26 13:39:00 +01:00
Fabien Potencier 4a121d90c6 Sync Error file and line 2025-02-26 13:26:24 +01:00
Fabien Potencier e31d709627 Merge branch '3.x' into 4.x
* 3.x:
  Improve error reporting
2025-02-22 18:28:19 +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 c1fdaf1290 Merge branch '3.x' into 4.x
* 3.x:
  Remove $templateName from Template::loadTemplate()
2025-02-22 18:27:45 +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 e7746d6395 Merge branch '3.x' into 4.x
* 3.x:
  Simplify Error
  Simplify code
2025-02-22 10:02:49 +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
Fabien Potencier c43cd3e4fb minor #4593 Simplify code (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Simplify code

Commits
-------

68481a2a3a Simplify code
2025-02-22 09:59:37 +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 b0922a1c1a Add missing true for in_array 2025-02-21 19:10:37 +01:00
Fabien Potencier bd652f3e66 Merge branch '3.x' into 4.x
* 3.x:
  Make `in_array()` calls strict
2025-02-21 19:08:53 +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 728adb4c61 Remove deprecated code 2025-02-21 19:05:11 +01:00
Fabien Potencier bec890f02f Fix bad merge 2025-02-21 19:03:49 +01:00
Fabien Potencier 4d9388dbe0 Merge branch '3.x' into 4.x
* 3.x:
  Fix testing and expression when it evaluates to an instance of Markup
  Simplify Error implementation
  Make the defined test implementation more generic
  fix typo
  fix the rst syntax of the operator precedence table
2025-02-21 18:55:21 +01:00
Fabien Potencier d187727e0b feature #4591 Fix testing and expression when it evaluates to an instance of Markup (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Fix testing and expression when it evaluates to an instance of Markup

Refs #3651

Commits
-------

d72c1c6b1e Fix testing and expression when it evaluates to an instance of Markup
2025-02-21 18:34:44 +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
Fabien Potencier 4effb660b3 minor #4587 fix typo (xabbuh)
This PR was merged into the 3.x branch.

Discussion
----------

fix typo

Commits
-------

4c818122f3 fix typo
2025-02-18 21:23:25 +01:00