Merge branch '3.1' into 3.2

* 3.1:
  fixed obsolete getMock() usage
  fixed obsolete getMock() usage
  fixed obsolete getMock() usage
  [WebProfilerBundle] Display multiple HTTP headers in WDT
  do not remove the Twig ExceptionController service
  removed obsolete condition
  do not try to register incomplete definitions

Author: fabpot

Tests/LdapClientTest.php

@@ -29,7 +29,7 @@ class LdapClientTest extends LdapTestCase
 
     protected function setUp()
     {
-        $this->ldap = $this->getMock(LdapInterface::class);
+        $this->ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
 
         $this->client = new LdapClient(null, 389, 3, false, false, false, $this->ldap);
     }
@@ -66,7 +66,7 @@ public function testLdapQuery()
 
     public function testLdapFind()
     {
-        $collection = $this->getMock(CollectionInterface::class);
+        $collection = $this->getMockBuilder(CollectionInterface::class)->getMock();
         $collection
             ->expects($this->once())
             ->method('getIterator')
@@ -83,7 +83,7 @@ public function testLdapFind()
                 )),
             ))))
         ;
-        $query = $this->getMock(QueryInterface::class);
+        $query = $this->getMockBuilder(QueryInterface::class)->getMock();
         $query
             ->expects($this->once())
             ->method('execute')

Tests/LdapTest.php

@@ -26,13 +26,13 @@ class LdapTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->adapter = $this->getMock(AdapterInterface::class);
+        $this->adapter = $this->getMockBuilder(AdapterInterface::class)->getMock();
         $this->ldap = new Ldap($this->adapter);
     }
 
     public function testLdapBind()
     {
-        $connection = $this->getMock(ConnectionInterface::class);
+        $connection = $this->getMockBuilder(ConnectionInterface::class)->getMock();
         $connection
             ->expects($this->once())
             ->method('bind')