Add a better detection of the deprecation case

stof · stof · commit ae3762cb9f2d · 2017-01-02T18:05:03.000+01:00
diff --git a/DependencyInjection/Compiler/DebugHandlerPass.php b/DependencyInjection/Compiler/DebugHandlerPass.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\MonologBundle\DependencyInjection\Compiler;
 
-@trigger_error('The '.__NAMESPACE__.'\DebugHandlerPass class is deprecated since version 2.12 and will be removed in 3.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -33,6 +32,11 @@ class DebugHandlerPass implements CompilerPassInterface
 
     public function __construct(LoggerChannelPass $channelPass)
     {
+        // Trigger the deprecation only when using a Symfony version supporting the new feature
+        if (class_exists('Symfony\Bridge\Monolog\Processor\DebugProcessor') && class_exists('Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass')) {
+            @trigger_error('The '.__CLASS__.' class is deprecated since version 2.12 and will be removed in 3.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.', E_USER_DEPRECATED);
+        }
+
         $this->channelPass = $channelPass;
     }
 
diff --git a/MonologBundle.php b/MonologBundle.php
@@ -34,7 +34,7 @@ public function build(ContainerBuilder $container)
         parent::build($container);
 
         $container->addCompilerPass($channelPass = new LoggerChannelPass());
-        if (!class_exists('Symfony\Bridge\Monolog\Processor\DebugProcessor')) {
+        if (!class_exists('Symfony\Bridge\Monolog\Processor\DebugProcessor') || !class_exists('Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass')) {
             $container->addCompilerPass(new DebugHandlerPass($channelPass));
         }
         $container->addCompilerPass(new FixEmptyLoggerPass($channelPass));

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\MonologBundle\DependencyInjection\Compiler;`
`13`	`13`
`14`		`-@trigger_error('The '.__NAMESPACE__.'\DebugHandlerPass class is deprecated since version 2.12 and will be removed in 3.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.', E_USER_DEPRECATED);`
`15`	`14`
`16`	`15`	`use Symfony\Component\DependencyInjection\Reference;`
`17`	`16`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`@@ -33,6 +32,11 @@ class DebugHandlerPass implements CompilerPassInterface`
`33`	`32`
`34`	`33`	`public function __construct(LoggerChannelPass $channelPass)`
`35`	`34`	`{`
	`35`	`+ // Trigger the deprecation only when using a Symfony version supporting the new feature`
	`36`	`+ if (class_exists('Symfony\Bridge\Monolog\Processor\DebugProcessor') && class_exists('Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass')) {`
	`37`	`+ @trigger_error('The '.__CLASS__.' class is deprecated since version 2.12 and will be removed in 3.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.', E_USER_DEPRECATED);`
	`38`	`+ }`
	`39`	`+`
`36`	`40`	`$this->channelPass = $channelPass;`
`37`	`41`	`}`
`38`	`42`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function build(ContainerBuilder $container)`
`34`	`34`	`parent::build($container);`
`35`	`35`
`36`	`36`	`$container->addCompilerPass($channelPass = new LoggerChannelPass());`
`37`		`- if (!class_exists('Symfony\Bridge\Monolog\Processor\DebugProcessor')) {`
	`37`	`+ if (!class_exists('Symfony\Bridge\Monolog\Processor\DebugProcessor') \|\| !class_exists('Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass')) {`
`38`	`38`	`$container->addCompilerPass(new DebugHandlerPass($channelPass));`
`39`	`39`	`}`
`40`	`40`	`$container->addCompilerPass(new FixEmptyLoggerPass($channelPass));`