8000 removed obsolete code · symfony/monolog-bundle@57b33d6 · GitHub
[go: up one dir, main page]

Skip to content 8000

Commit 57b33d6

Browse files
committed
removed obsolete code
1 parent a45682c commit 57b33d6

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

DependencyInjection/MonologExtension.php

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,6 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
154154
break;
155155

156156
case 'console':
157-
if (!class_exists('Symfony\Bridge\Monolog\Handler\ConsoleHandler')) {
158-
throw new \RuntimeException('The console handler requires symfony/monolog-bridge 2.4+');
159-
}
160-
161157
$definition->setArguments(array(
162158
null,
163159
$handler['bubble'],
@@ -424,14 +420,6 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
424420
break;
425421

426422
case 'swift_mailer':
427-
$oldHandler = false;
428-
// fallback for older symfony versions that don't have the new SwiftMailerHandler in the bridge
429-
$newHandlerClass = $container->getParameterBag()->resolveValue($definition->getClass());
430-
if (!class_exists($newHandlerClass)) {
431-
$definition = new Definition('Monolog\Handler\SwiftMailerHandler');
432-
$oldHandler = true;
433-
}
434-
435423
if (isset($handler['email_prototype'])) {
436424
if (!empty($handler['email_prototype']['method'])) {
437425
$prototype = array(new Reference($handler['email_prototype']['id']), $handler['email_prototype']['method']);
@@ -461,13 +449,10 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
461449
$handler['level'],
462450
$handler['bubble'],
463451
));
464-
if (!$oldHandler) {
465-
$this->swiftMailerHandlers[] = $handlerId;
466-
$definition->addTag('kernel.event_listener', array('event' => 'kernel.terminate', 'method' => 'onKernelTerminate'));
467-
if (method_exists($newHandlerClass, 'onCliTerminate')) {
468-
$definition->addTag('kernel.event_listener', array('event' => 'console.terminate', 'method' => 'onCliTerminate'));
469-
}
470-
}
452+
453+
$this->swiftMailerHandlers[] = $handlerId;
454+
$definition->addTag('kernel.event_listener', array('event' => 'kernel.terminate', 'method' => 'onKernelTerminate'));
455+
$definition->addTag('kernel.event_listener', array('event' => 'console.terminate', 'method' => 'onCliTerminate'));
471456
break;
472457

473458
case 'native_mailer':

0 commit comments

Comments
 (0)
0