geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-08-30 20:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' into 4.x

Browse Source 
* 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
This commit is contained in:
Fabien Potencier
2026-07-12 13:55:37 +02:00
parent 8b5e0a1957 9c6d76b61c
commit 0b6e824ea8
114 changed files with 766 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Node/NodeTest.php
+4 -4
View File
@@ -43,7 +43,7 @@ EOF, (string) $node
);
}
public function testToStringWithTwigCallables()
public function testToStringWithTwigCallables(): void
{
$node = new NodeForTest([], [
'function' => new TwigFunction('a_function'),
@@ -60,7 +60,7 @@ Twig\Tests\Node\NodeForTest
EOF, (string) $node);
}
public function testToStringWithTag()
public function testToStringWithTag(): void
{
$node = new NodeForTest();
$node->setNodeTag('tag');
@@ -71,7 +71,7 @@ Twig\Tests\Node\NodeForTest
EOF, (string) $node);
}
public function testAttributeDeprecationIgnore()
public function testAttributeDeprecationIgnore(): void
{
$node = new NodeForTest([], ['foo' => false]);
$node->deprecateAttribute('foo', new NameDeprecation('foo/bar', '2.0', 'bar'));
@@ -99,7 +99,7 @@ EOF, (string) $node);
$this->assertFalse($node->getAttribute('foo'));
}
public function testNodeDeprecationIgnore()
public function testNodeDeprecationIgnore(): void
{
$node = new NodeForTest(['foo' => $foo = new NodeForTest()]);
$node->deprecateNode('foo', new NameDeprecation('foo/bar', '2.0'));