Fabien Potencier feffcb7df8 Fix merge conflict resolution

2026-07-30 13:32:38 +02:00

..

Cache

Merge branch '3.x' into 4.x

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

Extension

Fix merge conflict resolution

2026-07-30 13:32:38 +02:00

Fixtures

Merge branch '3.x' into 4.x

2026-07-30 13:04:50 +02:00

Loader

Merge branch '3.x' into 4.x

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

Node

Merge branch '3.x' into 4.x

2026-07-30 13:04:50 +02:00

NodeVisitor

Merge branch '3.x' into 4.x

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

Profiler

Add void return type hint even in tests

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

Runtime

Fix merge conflict resolution

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

Sandbox

Fix merge conflict resolution

2026-07-30 13:32:38 +02:00

Test

Fix merge conflict resolution

2026-06-03 19:55:20 +02:00

TokenParser

Merge branch '3.x' into 4.x

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

Util

⚰️ Drop useless php comparisons

2026-07-18 18:06:34 +02:00

CompilerTest.php

Add void return type hint even in tests

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

ContainerRuntimeLoaderTest.php

Add void return type hint even in tests

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

DeprecatedCallableInfoTest.php

Merge branch '3.x' into 4.x

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

DummyBackedEnum.php

…

DummyUnitEnum.php

…

EnvironmentTest.php

Fix merge conflict resolution

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

ErrorTest.php

Merge branch '3.x' into 4.x

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

ExpressionParserTest.php

Merge branch '3.x' into 4.x

2026-07-28 09:58:56 +02:00

FactoryRuntimeLoaderTest.php

Add void return type hint even in tests

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

FileExtensionEscapingStrategyTest.php

Merge branch '3.x' into 4.x

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

FilesystemHelper.php

Add void return type hint even in tests

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

IntegrationTest.php

Merge branch '3.x' into 4.x

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

LexerTest.php

Fix merge conflict resolution

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

ParserTest.php

Add void return type hint even in tests

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

SourceTest.php

Add void return type hint even in tests

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

TemplateTest.php

Fix merge conflict resolution

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

TemplateWrapperTest.php

Add void return type hint even in tests

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

TokenStreamTest.php

Add void return type hint even in tests

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