fix merge

Author: nicolas-grekas

FrameworkBundle.php

@@ -91,7 +91,7 @@ public function build(ContainerBuilder $container)
             KernelEvents::FINISH_REQUEST,
         ];
 
-        $this->addCompilerPassIfExists($container, ErrorCatcherPass::class);
+        $container->addCompilerPass(new ErrorCatcherPass());
         $container->addCompilerPass(new LoggerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
         $container->addCompilerPass(new RegisterControllerArgumentLocatorsPass());
         $container->addCompilerPass(new RemoveEmptyControllerArgumentLocatorsPass(), PassConfig::TYPE_BEFORE_REMOVING);

composer.json

@@ -20,8 +20,8 @@
         "ext-xml": "*",
         "symfony/cache": "^4.3|^5.0",
         "symfony/config": "^4.2|^5.0",
-        "symfony/debug": "~4.0|^5.0",
         "symfony/dependency-injection": "^4.4|^5.0",
+        "symfony/error-catcher": "^4.4|^5.0",
         "symfony/http-foundation": "^4.3|^5.0",
         "symfony/http-kernel": "^4.4|^5.0",
         "symfony/polyfill-mbstring": "~1.0",