diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

This commit is contained in:
Nicolas Grekas 2019-06-28 15:25:44 +02:00
parent ab1bc87e43
commit b40f6b5e72
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
View File

@ -91,7 +91,7 @@ class FrameworkBundle extends Bundle
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);

2
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -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",

1
src/Symfony/Bundle/TwigBundle/composer.json
View File

@ -17,7 +17,6 @@
],
"require": {
"php": "^7.1.3",
"symfony/debug": "~4.0|^5.0",
"symfony/error-catcher": "^4.4|^5.0",
"symfony/twig-bridge": "^4.4|^5.0",
"symfony/http-foundation": "^4.3|^5.0",