Merge branch '6.4' into 7.0

* 6.4:
  Fix AssetMapper tests (+ dependencies)
  [FrameworkBundle] Fix requiring moved translation compiler passes

Author: nicolas-grekas

FrameworkBundle.php

@@ -132,7 +132,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new RegisterControllerArgumentLocatorsPass());
         $container->addCompilerPass(new RemoveEmptyControllerArgumentLocatorsPass(), PassConfig::TYPE_BEFORE_REMOVING);
         $container->addCompilerPass(new RoutingResolverPass());
-        $container->addCompilerPass(new DataCollectorTranslatorPass());
+        $this->addCompilerPassIfExists($container, DataCollectorTranslatorPass::class);
         $container->addCompilerPass(new ProfilerPass());
         // must be registered before removing private services as some might be listeners/subscribers
         // but as late as possible to get resolved parameters
@@ -144,7 +144,7 @@ public function build(ContainerBuilder $container): void
         // twig.template_iterator definition
         $this->addCompilerPassIfExists($container, TranslatorPass::class, PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
         $this->addCompilerPassIfExists($container, TranslatorPathsPass::class, PassConfig::TYPE_AFTER_REMOVING);
-        $container->addCompilerPass(new LoggingTranslatorPass());
+        $this->addCompilerPassIfExists($container, LoggingTranslatorPass::class);
         $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
         $this->addCompilerPassIfExists($container, TranslationExtractorPass::class);
         $this->addCompilerPassIfExists($container, TranslationDumperPass::class);