Fixes more deprecation notices.

Author: Hugo Hamon

EventListener/ProfilerListener.php

@@ -53,7 +53,7 @@ public function __construct(Profiler $profiler, RequestMatcherInterface $matcher
             // 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);
+            trigger_error('Since version 2.4, the '.__METHOD__.' method must accept a RequestStack instance to get the request instead of using the '.__CLASS__.'::onKernelRequest method that will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         $this->profiler = $profiler;

EventListener/RouterListener.php

@@ -67,6 +67,10 @@ public function __construct($matcher, RequestContext $context = null, LoggerInte
             throw new \InvalidArgumentException('You must either pass a RequestContext or the matcher must implement RequestContextAwareInterface.');
         }
 
+        if (!$requestStack instanceof RequestStack) {
+            trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.');
+        }
+
         $this->matcher = $matcher;
         $this->context = $context ?: $matcher->getContext();
         $this->requestStack = $requestStack;
@@ -88,9 +92,15 @@ public function setRequest(Request $request = null)
     {
         trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be made private in 3.0.', E_USER_DEPRECATED);
 
+        $this->setCurrentRequest($request);
+    }
+
+    private function setCurrentRequest(Request $request = null)
+    {
         if (null !== $request && $this->request !== $request) {
             $this->context->fromRequest($request);
         }
+
         $this->request = $request;
     }
 
@@ -100,19 +110,19 @@ public function onKernelFinishRequest(FinishRequestEvent $event)
             return; // removed when requestStack is required
         }
 
-        $this->setRequest($this->requestStack->getParentRequest());
+        $this->setCurrentRequest($this->requestStack->getParentRequest());
     }
 
     public function onKernelRequest(GetResponseEvent $event)
     {
         $request = $event->getRequest();
 
         // initialize the context that is also used by the generator (assuming matcher and generator share the same context instance)
-        // we call setRequest even if most of the time, it has already been done to keep compatibility
+        // we call setCurrentRequest even if most of the time, it has already been done to keep compatibility
         // with frameworks which do not use the Symfony service container
         // when we have a RequestStack, no need to do it
         if (null !== $this->requestStack) {
-            $this->setRequest($request);
+            $this->setCurrentRequest($request);
         }
 
         if ($request->attributes->has('_controller')) {