Merge branch '5.1' into 5.2

* 5.1:
  More cleanups and fixes

Author: nicolas-grekas

Tests/EventListener/SessionListenerTest.php

@@ -217,14 +217,14 @@ public function testGetSessionIsCalledOnce()
 
     public function testSessionUsageExceptionIfStatelessAndSessionUsed()
     {
-        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $session = $this->createMock(Session::class);
         $session->expects($this->exactly(2))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1));
 
         $container = new Container();
         $container->set('initialized_session', $session);
 
         $listener = new SessionListener($container, true);
-        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->disableOriginalConstructor()->getMock();
+        $kernel = $this->createMock(HttpKernelInterface::class);
 
         $request = new Request();
         $request->attributes->set('_stateless', true);
@@ -236,18 +236,18 @@ public function testSessionUsageExceptionIfStatelessAndSessionUsed()
 
     public function testSessionUsageLogIfStatelessAndSessionUsed()
     {
-        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $session = $this->createMock(Session::class);
         $session->expects($this->exactly(2))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1));
 
-        $logger = $this->getMockBuilder(LoggerInterface::class)->disableOriginalConstructor()->getMock();
+        $logger = $this->createMock(LoggerInterface::class);
         $logger->expects($this->exactly(1))->method('warning');
 
         $container = new Container();
         $container->set('initialized_session', $session);
         $container->set('logger', $logger);
 
         $listener = new SessionListener($container, false);
-        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->disableOriginalConstructor()->getMock();
+        $kernel = $this->createMock(HttpKernelInterface::class);
 
         $request = new Request();
         $request->attributes->set('_stateless', true);
@@ -258,7 +258,7 @@ public function testSessionUsageLogIfStatelessAndSessionUsed()
 
     public function testSessionIsSavedWhenUnexpectedSessionExceptionThrown()
     {
-        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $session = $this->createMock(Session::class);
         $session->method('isStarted')->willReturn(true);
         $session->expects($this->exactly(2))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1));
         $session->expects($this->exactly(1))->method('save');
@@ -267,7 +267,7 @@ public function testSessionIsSavedWhenUnexpectedSessionExceptionThrown()
         $container->set('initialized_session', $session);
 
         $listener = new SessionListener($container, true);
-        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->disableOriginalConstructor()->getMock();
+        $kernel = $this->createMock(HttpKernelInterface::class);
 
         $request = new Request();
         $request->attributes->set('_stateless', true);
@@ -281,7 +281,7 @@ public function testSessionIsSavedWhenUnexpectedSessionExceptionThrown()
 
     public function testSessionUsageCallbackWhenDebugAndStateless()
     {
-        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $session = $this->createMock(Session::class);
         $session->method('isStarted')->willReturn(true);
         $session->expects($this->exactly(1))->method('save');
 
@@ -308,7 +308,7 @@ public function testSessionUsageCallbackWhenDebugAndStateless()
 
     public function testSessionUsageCallbackWhenNoDebug()
     {
-        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $session = $this->createMock(Session::class);
         $session->method('isStarted')->willReturn(true);
         $session->expects($this->exactly(0))->method('save');
 
@@ -331,7 +331,7 @@ public function testSessionUsageCallbackWhenNoDebug()
 
     public function testSessionUsageCallbackWhenNoStateless()
     {
-        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $session = $this->createMock(Session::class);
         $session->method('isStarted')->willReturn(true);
         $session->expects($this->never())->method('save');