Merge branch '2.x'

* 2.x:
  Update the removal version in the deprecation message
  Add a better detection of the deprecation case
  revert disabling DebugHandler in CLI environments

Author: stof

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;
@@ -25,14 +24,19 @@
  * @author Christophe Coevoet <stof@notk.org>
  * @author Jordi Boggiano <j.boggiano@seld.be>
  *
- * @deprecated since version 2.12, to be removed in 3.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.
+ * @deprecated since version 2.12, to be removed in 4.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.
  */
 class DebugHandlerPass implements CompilerPassInterface
 {
     private $channelPass;
 
     public function __construct(LoggerChannelPass $channelPass)
     {
+        // Trigger the deprecation only when using a Symfony version supporting the new feature (i.e. 3.2+)
+        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 4.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.', E_USER_DEPRECATED);
+        }
+
         $this->channelPass = $channelPass;
     }
 
@@ -46,11 +50,6 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        // disable the DebugHandler in CLI as it tends to leak memory if people enable kernel.debug
-        if ('cli' === PHP_SAPI) {
-            return;
-        }
-
         $debugHandler = new Definition('Symfony\Bridge\Monolog\Handler\DebugHandler', array(Logger::DEBUG, true));
         $container->setDefinition('monolog.handler.debug', $debugHandler);
 

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));