Skip to content

Removed legacy getter from LoggerChannelPass #546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2025
Merged

Removed legacy getter from LoggerChannelPass #546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 13 additions & 21 deletions src/DependencyInjection/Compiler/LoggerChannelPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
*/
class LoggerChannelPass implements CompilerPassInterface
{
/** @var list<string> */
protected array $channels = ['app'];

public function process(ContainerBuilder $container): void
{
if (!$container->hasDefinition('monolog.logger')) {
return;
}

/** @var list<string> $createdLoggers */
$createdLoggers = ['app'];

// create channels necessary for the handlers
foreach ($container->findTaggedServiceIds('monolog.logger') as $id => $tags) {
foreach ($tags as $tag) {
Expand All @@ -48,7 +48,7 @@ public function process(ContainerBuilder $container): void

$definition = $container->getDefinition($id);
$loggerId = \sprintf('monolog.logger.%s', $resolvedChannel);
$this->createLogger($resolvedChannel, $loggerId, $container);
$this->createLogger($resolvedChannel, $loggerId, $container, $createdLoggers);

foreach ($definition->getArguments() as $index => $argument) {
if ($argument instanceof Reference && 'logger' === (string) $argument) {
Expand Down Expand Up @@ -86,15 +86,15 @@ public function process(ContainerBuilder $container): void
continue;
}
$loggerId = \sprintf('monolog.logger.%s', $chan);
$this->createLogger($chan, $loggerId, $container);
$this->createLogger($chan, $loggerId, $container, $createdLoggers);
$container->getDefinition($loggerId)->setPublic(true);
}
$container->getParameterBag()->remove('monolog.additional_channels');

// wire handlers to channels
$handlersToChannels = $container->getParameter('monolog.handlers_to_channels');
foreach ($handlersToChannels as $handler => $channels) {
foreach ($this->processChannels($channels) as $channel) {
foreach ($this->processChannels($channels, $createdLoggers) as $channel) {
try {
$logger = $container->getDefinition('app' === $channel ? 'monolog.logger' : 'monolog.logger.'.$channel);
} catch (InvalidArgumentException $e) {
Expand All @@ -105,37 +105,29 @@ public function process(ContainerBuilder $container): void
}
}

/**
* @return list<string>
*/
public function getChannels(): array
{
return $this->channels;
}

protected function processChannels(?array $configuration): array
protected function processChannels(?array $configuration, array $createdLoggers): array
{
if (null === $configuration) {
return $this->channels;
return $createdLoggers;
}

if ('inclusive' === $configuration['type']) {
return $configuration['elements'] ?: $this->channels;
return $configuration['elements'] ?: $createdLoggers;
}

return array_diff($this->channels, $configuration['elements']);
return array_diff($createdLoggers, $configuration['elements']);
}

/**
* Create new logger from the monolog.logger_prototype.
*/
protected function createLogger(string $channel, string $loggerId, ContainerBuilder $container): void
protected function createLogger(string $channel, string $loggerId, ContainerBuilder $container, array &$createdLoggers): void
{
if (!\in_array($channel, $this->channels, true)) {
if (!\in_array($channel, $createdLoggers, true)) {
$logger = new ChildDefinition('monolog.logger_prototype');
$logger->replaceArgument(0, $channel);
$container->setDefinition($loggerId, $logger);
$this->channels[] = $channel;
$createdLoggers[] = $channel;
}

$container->registerAliasForArgument($loggerId, LoggerInterface::class, $channel.'.logger');
Expand Down