Commit a61749b

committed

minor #546 Removed legacy getter from LoggerChannelPass (HypeMC)

This PR was merged into the 4.x branch. Discussion ---------- Removed legacy getter from `LoggerChannelPass` | Q | A | ------------- | --- | Branch? | 4.x | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Follow-up to #545 The `LoggerChannelPass::getChannels()` method was originally added in 4d5a969 for the `DebugHandlerPass` and was later used in the `FixEmptyLoggerPass`. Since both passes have been removed, this method is no longer needed. Commits ------- 833daad Removed legacy getter from `LoggerChannelPass`

2 parents a56dedf + 833daad commit a61749bCopy full SHA for a61749b

File tree

1 file changed

+13

-21

lines changed

src/DependencyInjection/Compiler
- LoggerChannelPass.php

1 file changed

+13

-21

lines changed

`‎src/DependencyInjection/Compiler/LoggerChannelPass.php‎`

Lines changed: 13 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,15 @@`
`28`	`28`	`*/`
`29`	`29`	`class LoggerChannelPass implements CompilerPassInterface`
`30`	`30`	`{`
`31`		`- /** @var list<string> */`
`32`		`- protected array $channels = ['app'];`
`33`		`-`
`34`	`31`	`public function process(ContainerBuilder $container): void`
`35`	`32`	`{`
`36`	`33`	`if (!$container->hasDefinition('monolog.logger')) {`
`37`	`34`	`return;`
`38`	`35`	`}`
`39`	`36`
	`37`	`+ /** @var list<string> $createdLoggers */`
	`38`	`+ $createdLoggers = ['app'];`
	`39`	`+`
`40`	`40`	`// create channels necessary for the handlers`
`41`	`41`	`foreach ($container->findTaggedServiceIds('monolog.logger') as $id => $tags) {`
`42`	`42`	`foreach ($tags as $tag) {`
`@@ -48,7 +48,7 @@ public function process(ContainerBuilder $container): void`
`48`	`48`
`49`	`49`	`$definition = $container->getDefinition($id);`
`50`	`50`	`$loggerId = \sprintf('monolog.logger.%s', $resolvedChannel);`
`51`		`- $this->createLogger($resolvedChannel, $loggerId, $container);`
	`51`	`+ $this->createLogger($resolvedChannel, $loggerId, $container, $createdLoggers);`
`52`	`52`
`53`	`53`	`foreach ($definition->getArguments() as $index => $argument) {`
`54`	`54`	`if ($argument instanceof Reference && 'logger' === (string) $argument) {`
`@@ -86,15 +86,15 @@ public function process(ContainerBuilder $container): void`
`86`	`86`	`continue;`
`87`	`87`	`}`
`88`	`88`	`$loggerId = \sprintf('monolog.logger.%s', $chan);`
`89`		`- $this->createLogger($chan, $loggerId, $container);`
	`89`	`+ $this->createLogger($chan, $loggerId, $container, $createdLoggers);`
`90`	`90`	`$container->getDefinition($loggerId)->setPublic(true);`
`91`	`91`	`}`
`92`	`92`	`$container->getParameterBag()->remove('monolog.additional_channels');`
`93`	`93`
`94`	`94`	`// wire handlers to channels`
`95`	`95`	`$handlersToChannels = $container->getParameter('monolog.handlers_to_channels');`
`96`	`96`	`foreach ($handlersToChannels as $handler => $channels) {`
`97`		`- foreach ($this->processChannels($channels) as $channel) {`
	`97`	`+ foreach ($this->processChannels($channels, $createdLoggers) as $channel) {`
`98`	`98`	`try {`
`99`	`99`	`$logger = $container->getDefinition('app' === $channel ? 'monolog.logger' : 'monolog.logger.'.$channel);`
`100`	`100`	`} catch (InvalidArgumentException $e) {`
`@@ -105,37 +105,29 @@ public function process(ContainerBuilder $container): void`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`- /**`
`109`		`- * @return list<string>`
`110`		`- */`
`111`		`- public function getChannels(): array`
`112`		`- {`
`113`		`- return $this->channels;`
`114`		`- }`
`115`		`-`
`116`		`- protected function processChannels(?array $configuration): array`
	`108`	`+ protected function processChannels(?array $configuration, array $createdLoggers): array`
`117`	`109`	`{`
`118`	`110`	`if (null === $configuration) {`
`119`		`- return $this->channels;`
	`111`	`+ return $createdLoggers;`
`120`	`112`	`}`
`121`	`113`
`122`	`114`	`if ('inclusive' === $configuration['type']) {`
`123`		`- return $configuration['elements'] ?: $this->channels;`
	`115`	`+ return $configuration['elements'] ?: $createdLoggers;`
`124`	`116`	`}`
`125`	`117`
`126`		`- return array_diff($this->channels, $configuration['elements']);`
	`118`	`+ return array_diff($createdLoggers, $configuration['elements']);`
`127`	`119`	`}`
`128`	`120`
`129`	`121`	`/**`
`130`	`122`	`* Create new logger from the monolog.logger_prototype.`
`131`	`123`	`*/`
`132`		`- protected function createLogger(string $channel, string $loggerId, ContainerBuilder $container): void`
	`124`	`+ protected function createLogger(string $channel, string $loggerId, ContainerBuilder $container, array &$createdLoggers): void`
`133`	`125`	`{`
`134`		`- if (!\in_array($channel, $this->channels, true)) {`
	`126`	`+ if (!\in_array($channel, $createdLoggers, true)) {`
`135`	`127`	`$logger = new ChildDefinition('monolog.logger_prototype');`
`136`	`128`	`$logger->replaceArgument(0, $channel);`
`137`	`129`	`$container->setDefinition($loggerId, $logger);`
`138`		`- $this->channels[] = $channel;`
	`130`	`+ $createdLoggers[] = $channel;`
`139`	`131`	`}`
`140`	`132`
`141`	`133`	`$container->registerAliasForArgument($loggerId, LoggerInterface::class, $channel.'.logger');`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit a61749b

File tree

1 file changed

1 file changed

`‎src/DependencyInjection/Compiler/LoggerChannelPass.php‎`

0 commit comments