Fixes deprecation notices.

Author: Hugo Hamon

EventListener/ProfilerListener.php

@@ -22,7 +22,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * ProfilerListener collects data for the current request by listening to the onKernelResponse event.
+ * ProfilerListener collects data for the current request by listening to the kernel events.
  *
  * @author Fabien Potencier <[email protected]>
  */
@@ -49,6 +49,13 @@ class ProfilerListener implements EventSubscriberInterface
      */
     public function __construct(Profiler $profiler, RequestMatcherInterface $matcher = null, $onlyException = false, $onlyMasterRequests = false, RequestStack $requestStack = null)
     {
+        if (null === $requestStack) {
+            // Prevent the deprecation notice to be triggered all the time.
+            // The onKernelRequest() method fires some logic only when the
+            // RequestStack instance is not provided as a dependency.
+            trigger_error('The '.__CLASS__.'::onKernelRequest method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        }
+
         $this->profiler = $profiler;
         $this->matcher = $matcher;
         $this->onlyException = (bool) $onlyException;
@@ -77,8 +84,6 @@ public function onKernelException(GetResponseForExceptionEvent $event)
      */
     public function onKernelRequest(GetResponseEvent $event)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
-
         if (null === $this->requestStack) {
             $this->requests[] = $event->getRequest();
         }

Log/NullLogger.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Log;
 
+trigger_error('The '.__NAMESPACE__.'\NullLogger class is deprecated since version 2.2 and will be removed in 3.0. Use the Psr\Log\NullLogger class instead from the psr/log Composer package.');
+
 use Psr\Log\NullLogger as PsrNullLogger;
 
 /**
@@ -24,8 +26,6 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
 {
     /**
      * @api
-     *
-     * @deprecated since version 2.2, to be removed in 3.0. Use emergency() which is PSR-3 compatible.
      */
     public function emerg($message, array $context = array())
     {
@@ -34,8 +34,6 @@ public function emerg($message, array $context = array())
 
     /**
      * @api
-     *
-     * @deprecated since version 2.2, to be removed in 3.0. Use critical() which is PSR-3 compatible.
      */
     public function crit($message, array $context = array())
     {
@@ -44,8 +42,6 @@ public function crit($message, array $context = array())
 
     /**
      * @api
-     *
-     * @deprecated since version 2.2, to be removed in 3.0. Use error() which is PSR-3 compatible.
      */
     public function err($message, array $context = array())
     {
@@ -54,8 +50,6 @@ public function err($message, array $context = array())
 
     /**
      * @api
-     *
-     * @deprecated since version 2.2, to be removed in 3.0. Use warning() which is PSR-3 compatible.
      */
     public function warn($message, array $context = array())
     {