Merge branch '5.1' into 5.2

* 5.1:
  More cleanups and fixes

Author: nicolas-grekas

Tests/Security/CheckLdapCredentialsListenerTest.php

@@ -148,7 +148,7 @@ public function testQueryForDn()
     {
         $collection = new \ArrayIterator([new Entry('')]);
 
-        $query = $this->getMockBuilder(QueryInterface::class)->getMock();
+        $query = $this->createMock(QueryInterface::class);
         $query->expects($this->once())->method('execute')->willReturn($collection);
 
         $this->ldap
@@ -168,9 +168,9 @@ public function testEmptyQueryResultShouldThrowAnException()
         $this->expectException(BadCredentialsException::class);
         $this->expectExceptionMessage('The presented username is invalid.');
 
-        $collection = $this->getMockBuilder(CollectionInterface::class)->getMock();
+        $collection = $this->createMock(CollectionInterface::class);
 
-        $query = $this->getMockBuilder(QueryInterface::class)->getMock();
+        $query = $this->createMock(QueryInterface::class);
         $query->expects($this->once())->method('execute')->willReturn($collection);
 
         $this->ldap