Skip to content

Commit f3f313a

Browse files
committed
Merge branch '4.2' into 4.3
* 4.2: make tests forward compatible with DI 4.4 Fix multiSelect ChoiceQuestion when answers have spaces
2 parents 67046dc + ac12bd9 commit f3f313a

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1591,6 +1591,7 @@ protected function createContainerFromFile($file, $data = [], $resetCompilerPass
15911591
if ($resetCompilerPasses) {
15921592
$container->getCompilerPassConfig()->setOptimizationPasses([]);
15931593
$container->getCompilerPassConfig()->setRemovingPasses([]);
1594+
$container->getCompilerPassConfig()->setAfterRemovingPasses([]);
15941595
}
15951596
$container->getCompilerPassConfig()->setBeforeOptimizationPasses([new LoggerPass()]);
15961597
$container->getCompilerPassConfig()->setBeforeRemovingPasses([new AddConstraintValidatorsPass(), new TranslatorPass('translator.default', 'translation.reader')]);
@@ -1613,6 +1614,7 @@ protected function createContainerFromClosure($closure, $data = [])
16131614

16141615
$container->getCompilerPassConfig()->setOptimizationPasses([]);
16151616
$container->getCompilerPassConfig()->setRemovingPasses([]);
1617+
$container->getCompilerPassConfig()->setAfterRemovingPasses([]);
16161618
$container->compile();
16171619

16181620
return $container;

0 commit comments

Comments
 (0)