Skip to content

Commit ac12bd9

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: make tests forward compatible with DI 4.4 Fix multiSelect ChoiceQuestion when answers have spaces
2 parents ce73ff4 + 0bb32ea commit ac12bd9

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
@@ -1368,6 +1368,7 @@ protected function createContainerFromFile($file, $data = [], $resetCompilerPass
13681368
if ($resetCompilerPasses) {
13691369
$container->getCompilerPassConfig()->setOptimizationPasses([]);
13701370
$container->getCompilerPassConfig()->setRemovingPasses([]);
1371+
$container->getCompilerPassConfig()->setAfterRemovingPasses([]);
13711372
}
13721373
$container->getCompilerPassConfig()->setBeforeOptimizationPasses([new LoggerPass()]);
13731374
$container->getCompilerPassConfig()->setBeforeRemovingPasses([new AddConstraintValidatorsPass(), new TranslatorPass('translator.default', 'translation.reader')]);
@@ -1390,6 +1391,7 @@ protected function createContainerFromClosure($closure, $data = [])
13901391

13911392
$container->getCompilerPassConfig()->setOptimizationPasses([]);
13921393
$container->getCompilerPassConfig()->setRemovingPasses([]);
1394+
$container->getCompilerPassConfig()->setAfterRemovingPasses([]);
13931395
$container->compile();
13941396

13951397
return $container;

0 commit comments

Comments
 (0)