Skip to content

Commit

Permalink
minor #52023 [FrameworkBundle] Fix merge error with `ErrorLoggerCompi…
Browse files Browse the repository at this point in the history
…lerPass` (PhilETaylor)

This PR was merged into the 6.3 branch.

Discussion
----------

[FrameworkBundle] Fix merge error with `ErrorLoggerCompilerPass`

| Q             | A
| ------------- | ---
| Branch?       | 6.3
| Bug fix?      | no
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead -->
| License       | MIT

`@nicolas`-grekas `@MatTheCat` does this make sense? If I change these 2 lines in 6.4 then my app loads fine.

relates to #52009 (comment)

This comment from `@HypeMC` #52009 (comment) guided my debugging

or am I barking up the wrong tree?

Commits
-------

0d418de Fix merge error with ErrorLoggerCompilerPass
  • Loading branch information
nicolas-grekas committed Oct 13, 2023
2 parents f36e4ab + 0d418de commit 39a56d3
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ class ErrorLoggerCompilerPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container): void
{
if (!$container->hasDefinition('debug.debug_handlers_listener')) {
if (!$container->hasDefinition('debug.error_handler_configurator')) {
return;
}

$definition = $container->getDefinition('debug.debug_handlers_listener');
$definition = $container->getDefinition('debug.error_handler_configurator');
if ($container->hasDefinition('monolog.logger.php')) {
$definition->replaceArgument(0, new Reference('monolog.logger.php'));
}
Expand Down

0 comments on commit 39a56d3

Please sign in to comment.