[2.5] cleanup deprecated uses

Author: nicolas-grekas

Tests/EventListener/ProfilerListenerTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\EventListener\ProfilerListener;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -23,11 +24,11 @@ class ProfilerListenerTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Test to ensure BC without RequestStack
-     *
-     * @deprecated Deprecated since version 2.4, to be removed in 3.0.
      */
-    public function testEventsWithoutRequestStack()
+    public function testLegacyEventsWithoutRequestStack()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $profile = $this->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profile')
             ->disableOriginalConstructor()
             ->getMock();
@@ -86,15 +87,16 @@ public function testKernelTerminate()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $requestStack = new RequestStack();
+        $requestStack->push($masterRequest);
+
         $onlyException = true;
-        $listener = new ProfilerListener($profiler, null, $onlyException);
+        $listener = new ProfilerListener($profiler, null, $onlyException, false, $requestStack);
 
         // master request
-        $listener->onKernelRequest(new GetResponseEvent($kernel, $masterRequest, Kernel::MASTER_REQUEST));
         $listener->onKernelResponse(new FilterResponseEvent($kernel, $masterRequest, Kernel::MASTER_REQUEST, $response));
 
         // sub request
-        $listener->onKernelRequest(new GetResponseEvent($kernel, $subRequest, Kernel::SUB_REQUEST));
         $listener->onKernelException(new GetResponseForExceptionEvent($kernel, $subRequest, Kernel::SUB_REQUEST, new HttpException(404)));
         $listener->onKernelResponse(new FilterResponseEvent($kernel, $subRequest, Kernel::SUB_REQUEST, $response));