Fabien Potencier
d7fc3d6dc9
Merge branch '3.x' into 4.x
...
* 3.x:
Attach documentation comments to nodes
# Conflicts:
# CHANGELOG
# src/Lexer.php
# src/Node/Node.php
# src/Parser.php
# src/Token.php
2026-08-19 16:44:35 +02:00
Fabien Potencier
6806e30474
Attach documentation comments to nodes
2026-08-19 16:41:17 +02:00
Fabien Potencier
5ca7debf6e
Fix merge conflict resolution
2026-07-12 15:08:38 +02:00
Fabien Potencier
0b6e824ea8
Merge branch '3.x' into 4.x
...
* 3.x:
Add void return type hint even in tests
Run php-cs-fixer sequentially so the void_return src-only customiser is applied
Fix CHANGELOG
[Intl] Add format_list filter using PHP 8.5's IntlListFormatter
# Conflicts:
# .github/workflows/ci.yml
# CHANGELOG
# extra/cssinliner-extra/Tests/LegacyFunctionsTest.php
# extra/html-extra/Tests/CvaTest.php
# extra/html-extra/Tests/HtmlAttrMergeTest.php
# extra/html-extra/Tests/HtmlAttrTest.php
# extra/html-extra/Tests/LegacyFunctionsTest.php
# extra/inky-extra/Tests/LegacyFunctionsTest.php
# extra/markdown-extra/Tests/FunctionalTest.php
# extra/markdown-extra/Tests/LegacyFunctionsTest.php
# extra/twig-extra-bundle/DependencyInjection/Compiler/MissingExtensionSuggestorPass.php
# extra/twig-extra-bundle/DependencyInjection/TwigExtraExtension.php
# extra/twig-extra-bundle/TwigExtraBundle.php
# src/Extension/CoreExtension.php
# src/Extension/EscaperExtension.php
# src/Node/CheckSecurityCallNode.php
# src/Node/Expression/FunctionExpression.php
# src/Node/ModuleNode.php
# src/Node/Node.php
# src/Node/TypesNode.php
# src/Resources/core.php
# src/Resources/debug.php
# src/Test/IntegrationTestCase.php
# tests/CustomExtensionTest.php
# tests/EnvironmentTest.php
# tests/ExpressionParserTest.php
# tests/Extension/CoreTest.php
# tests/Extension/EscaperTest.php
# tests/Extension/LegacyDebugFunctionsTest.php
# tests/Extension/LegacyStringLoaderFunctionsTest.php
# tests/Extension/SandboxStateChangeTest.php
# tests/Extension/SandboxTest.php
# tests/LexerTest.php
# tests/Node/Expression/CallTest.php
# tests/Node/Expression/ConditionalTest.php
# tests/Node/NodeTest.php
# tests/Resources/LegacyCoreTest.php
# tests/TemplateTest.php
# tests/Util/CallableArgumentsExtractorTest.php
2026-07-12 13:55:37 +02:00
Fabien Potencier
9c6d76b61c
Add void return type hint even in tests
2026-07-12 13:43:08 +02:00
Fabien Potencier
8a4b77920a
Add PHPUnit attributes alongside annotations to silence doc-comment metadata deprecations on PHPUnit 11
2026-06-03 18:26:39 +02:00
Fabien Potencier
0facb551b0
Merge branch '3.x' into 4.x
...
* 3.x:
Fix CS
2026-02-07 09:12:05 +01:00
Fabien Potencier
861215c507
Fix CS
2026-02-07 09:07:38 +01:00
Nicolas Grekas
c649c1658b
Merge branch '3.x' into 4.x
...
* 3.x:
CS fixes
Enable Fabbot as a GHA
2025-07-29 10:27:55 +02:00
Nicolas Grekas
85a4817128
CS fixes
2025-07-29 10:07:07 +02:00
Fabien Potencier
cf105b566a
Merge branch '3.x' into 4.x
...
* 3.x:
Fix CS
2024-11-30 09:43:08 +01:00
Fabien Potencier
14fc89ebea
Fix CS
2024-11-30 09:42:13 +01:00
Fabien Potencier
0c6bd47d6b
Merge branch '3.x' into 4.x
...
* 3.x:
Deprecate using Node directly, introduce EmptyNode and Nodes
Add support for inline comments
Update plural.rst: Fixing(?) broken links
Fix CS
Add support for accessing class constants with the dot operator
Fix getting a property on an object casted to an array
Replace strtr() by strtolower()
Improve escape deprecation message
Remove useless assign in compiled code
Add fixture filename as key
Be more precise about double-escaping
Fix template name in error for an unknown dynamic extends called from an include
2024-09-27 07:59:52 +02:00
Fabien Potencier
8b278986b8
Deprecate using Node directly, introduce EmptyNode and Nodes
2024-09-27 07:42:41 +02:00
Alexander M. Turek
f2053bbea0
PHPUnit 11
2024-09-04 12:11:51 +02:00
Alexander M. Turek
0ab26b08b9
Switch to expectUserDeprecationMessage()
2024-09-02 15:38:53 +02:00
Fabien Potencier
5fca700cbd
Deprecate the fact that the extends and use tags are always allowed in a sandboxed template
2024-08-28 13:40:53 +02:00
Fabien Potencier
41459e0ddb
Fix CS
2024-08-27 13:18:23 +02:00
Fabien Potencier
157d36ae43
Update Node::__toString() to include the node tag if set
2024-08-24 17:28:38 +02:00
Fabien Potencier
675cb2d141
Fix CS
2024-08-18 19:25:19 +02:00
Fabien Potencier
b431ecad3a
Make Node::__toString() more readable
2024-08-15 20:18:30 +02:00
Fabien Potencier
18894cf91e
Add the possibility to deprecate attributes and nodes on Node
2024-08-08 14:48:20 +02:00
Fabien Potencier
fc64472145
Fix dumping callables on Node::__toString()
2024-08-04 16:35:01 +02:00