Fabien Potencier b91dbaa1ba Fix merge conflict resolution

2026-05-21 14:11:53 +02:00

..

Binary

CS fixes

2025-07-29 10:07:07 +02:00

Filter

Merge branch '3.x' into 4.x

2025-07-29 10:27:55 +02:00

Ternary

CS fixes

2025-07-29 10:07:07 +02:00

Unary

CS fixes

2025-07-29 10:07:07 +02:00

Variable

Merge branch '3.x' into 4.x

2025-07-29 10:27:55 +02:00

ArrayTest.php

Merge branch '3.x' into 4.x

2025-07-29 10:27:55 +02:00

ConstantTest.php

CS fixes

2025-07-29 10:07:07 +02:00

FilterTest.php

Merge remote-tracking branch 'origin/3.x' into 4.x

2026-05-17 08:18:04 +01:00

FilterTestExtension.php

CS fixes

2025-07-29 10:07:07 +02:00

FunctionTest.php

Merge branch '3.x' into 4.x

2026-02-07 09:12:05 +01:00

GetAttrTest.php

Fix tests

2026-02-09 12:32:40 +01:00

MacroReferenceTest.php

Fix merge conflict resolution

2026-05-21 14:11:53 +02:00

ParentTest.php

CS fixes

2025-07-29 10:07:07 +02:00

TestTest.php

Fix CS

2026-02-07 09:16:06 +01:00