Fabien Potencier 93b00ee3c9 Merge branch '3.x' into 4.x ...

* 3.x:
  Nested macro imports

# Conflicts:
#	CHANGELOG
#	src/MacroNamespace.php
#	src/Node/MacrosNode.php
#	src/Parser.php
#	tests/Extension/SandboxStateChangeTest.php
#	tests/Node/MacrosTest.php

2026-08-03 10:34:02 +02:00

..

Expression

Merge branch '3.x' into 4.x

2026-07-30 14:02:30 +02:00

AutoEscapeTest.php

Add void return type hint even in tests

2026-07-12 13:43:08 +02:00

BlockReferenceTest.php

Add void return type hint even in tests

2026-07-12 13:43:08 +02:00

BlockTest.php

Merge branch '3.x' into 4.x

2026-07-12 13:55:37 +02:00

DeprecatedTest.php

Add void return type hint even in tests

2026-07-12 13:43:08 +02:00

DoTest.php

Add void return type hint even in tests

2026-07-12 13:43:08 +02:00

EmbedTest.php

Add void return type hint even in tests

2026-07-12 13:43:08 +02:00

ForTest.php

Merge branch '3.x' into 4.x

2026-07-12 13:55:37 +02:00

IfTest.php

Add void return type hint even in tests

2026-07-12 13:43:08 +02:00

ImportTest.php

Merge branch '3.x' into 4.x

2026-07-30 14:02:30 +02:00

IncludeTest.php

Add void return type hint even in tests

2026-07-12 13:43:08 +02:00

MacrosTest.php

Merge branch '3.x' into 4.x

2026-08-03 10:34:02 +02:00

MacroTest.php

Remove deprecated code

2026-07-30 14:14:10 +02:00

ModuleTest.php

Merge branch '3.x' into 4.x

2026-07-30 14:02:30 +02:00

NodeTest.php

Fix merge conflict resolution

2026-07-12 15:08:38 +02:00

PrintTest.php

Merge branch '3.x' into 4.x

2026-07-12 13:55:37 +02:00

SetTest.php

Merge branch '3.x' into 4.x

2026-07-12 13:55:37 +02:00

TextTest.php

Add void return type hint even in tests

2026-07-12 13:43:08 +02:00

TypesTest.php

Add void return type hint even in tests

2026-07-12 13:43:08 +02:00