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
9c6d76b61c
Add void return type hint even in tests
2026-07-12 13:43:08 +02:00
cdce18d02a
Fix CS
2026-02-07 09:16:06 +01:00
0facb551b0
Merge branch '3.x' into 4.x
...
* 3.x:
Fix CS
2026-02-07 09:12:05 +01:00
861215c507
Fix CS
2026-02-07 09:07:38 +01:00
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
85a4817128
CS fixes
2025-07-29 10:07:07 +02:00
3b15ba5a4c
Fix usages of Node()
2024-09-27 08:01:33 +02:00
e628201ae1
Fix tests
2024-09-07 17:04:03 +02:00
fa1c9f0bf9
Merge branch '3.x' into 4.x
...
* 3.x:
Remove obsolete code
Deprecate Environment::mergeGlobals()
Bump version
Prepare the 3.13.0 release
Fix wrong format of `Environment::VERSION_ID` constant
Fix minor things
Fix CS
Fix isset in ForLoopNode
Fix iterable return type
Improve exception expectations reliability
2024-09-07 17:03:10 +02:00
4cd8955f74
Fix iterable return type
...
Currently, the PHPDoc states that a string should be returned, but that's not correct.
It can be anything that is echo-able.
That means any scalar, Stringable and even null.
2024-09-05 09:24:38 +02:00
fe7bac8989
Merge branch '3.x' into 4.x
...
* 3.x:
Migrate NodeTestCase to static data providers
2024-09-03 14:51:02 +02:00
dd9af8ec25
feature #4265 Migrate NodeTestCase to static data providers (derrabus)
...
This PR was merged into the 3.x branch.
Discussion
----------
Migrate NodeTestCase to static data providers
PHPUnit 11 requires data providers to be static. This PR prepares our abstract `NodeTestCase` by deprecating the non-static `getTests()` and adding a static `provideTests()` as a replacement. I've also added PHPUnit attributes which newer PHPUnit releases prefer over PHPDoc annotations.
Commits
-------
f555a33c
2024-09-03 14:03:04 +02:00
50f8b13adf
Fix tests
2024-09-03 13:58:52 +02:00
cc1045e4e4
Merge branch '3.x' into 4.x
...
* 3.x:
Replace `return; yield` with `yield from []`
Fix testExtensionsAreNotInitializedWhenRenderingACompiledTemplate
Fix MacroTest
2024-09-03 13:55:51 +02:00
f555a33caf
Migrate NodeTestCase to static data providers
2024-09-03 13:51:42 +02:00
09a43a9f6f
Replace return; yield with yield from []
...
This has the same effect, but looks less hacky and makes PHPStan happy.
https://phpstan.org/r/df7fcc88-1df8-428e-b675-5dc6965c34d6
Previously this was needed to work properly with output capturing.
2024-09-03 09:55:58 +02:00
18c548fe96
Fix merge
2024-08-30 16:22:11 +02:00
573ccf0c13
Merge branch '3.x' into 4.x
...
* 3.x:
Add more types to Template class and compiled templates
2024-08-30 16:18:52 +02:00
7e52a68097
Add more types to Template class and compiled templates
2024-08-30 16:17:55 +02:00
ddc966a59c
Remove deprecations
2024-04-14 11:22:32 +02:00
90097238c1
Merge branch '3.x' into 4.x
...
* 3.x:
Add a deprecation notice when using AbstractNodeVisitor (deprecated since 2.9)
Fix doc markup
Fix CS
2024-04-14 11:11:39 +02:00
30b5658f89
Fix CS
2024-04-14 10:22:11 +02:00
1af9ad0c3e
Merge branch '3.x' into 4.x
...
* 3.x:
Add `#[YieldReady]` to allow extensions to tell when they're ready for yielding
2024-02-15 11:47:41 +01:00
e70777405d
Add #[YieldReady] to allow extensions to tell when they're ready for yielding
2024-02-15 10:27:26 +01:00
f7f11ea410
Fix CS
2024-02-10 09:52:03 +01:00
3daafdae98
Fix tests
2024-02-05 16:13:35 +01:00
b3eeb41861
Remove obsolete code about non-yield templates
2024-02-05 16:13:35 +01:00
0d3a283907
Tweak code
2024-01-25 13:09:58 +01:00
a9c7307b5c
Tweak code
2024-01-25 13:09:58 +01:00
15879406c8
Remove the new yield nodes
2024-01-25 13:09:58 +01:00
3b6cbf98d8
Remove usage of ob_* functions in favor of yielding
2024-01-25 13:09:52 +01:00
6823b64cad
moved test under tests/
2019-06-30 14:56:12 +02:00
Fabien Potencier
Nicolas Grekas
Ruud Kamphuis
Alexander M. Turek