Merge branch '4.4' into 5.1

* 4.4:
  Use createMock() and use import instead of FQCN

Author: nicolas-grekas

Tests/Adapter/ExtLdap/EntryManagerTest.php

@@ -14,12 +14,14 @@
 use Symfony\Component\Ldap\Adapter\ExtLdap\Connection;
 use Symfony\Component\Ldap\Adapter\ExtLdap\EntryManager;
 use Symfony\Component\Ldap\Entry;
+use Symfony\Component\Ldap\Exception\LdapException;
+use Symfony\Component\Ldap\Exception\NotBoundException;
 
 class EntryManagerTest extends TestCase
 {
     public function testMove()
     {
-        $this->expectException(\Symfony\Component\Ldap\Exception\LdapException::class);
+        $this->expectException(LdapException::class);
         $this->expectExceptionMessage('Entry "$$$$$$" malformed, could not parse RDN.');
         $connection = $this->createMock(Connection::class);
         $connection
@@ -33,9 +35,9 @@ public function testMove()
 
     public function testGetResources()
     {
-        $this->expectException(\Symfony\Component\Ldap\Exception\NotBoundException::class);
+        $this->expectException(NotBoundException::class);
         $this->expectExceptionMessage('Query execution is not possible without binding the connection first.');
-        $connection = $this->getMockBuilder(Connection::class)->getMock();
+        $connection = $this->createMock(Connection::class);
         $connection
             ->expects($this->once())
             ->method('isBound')->willReturn(false);

Tests/LdapTest.php

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

Tests/Security/LdapUserProviderTest.php

@@ -19,6 +19,8 @@
 use Symfony\Component\Ldap\LdapInterface;
 use Symfony\Component\Ldap\Security\LdapUser;
 use Symfony\Component\Ldap\Security\LdapUserProvider;
+use Symfony\Component\Security\Core\Exception\InvalidArgumentException;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 
 /**
  * @requires extension ldap
@@ -27,7 +29,7 @@ class LdapUserProviderTest extends TestCase
 {
     public function testLoadUserByUsernameFailsIfCantConnectToLdap()
     {
-        $this->expectException(\Symfony\Component\Security\Core\Exception\UsernameNotFoundException::class);
+        $this->expectException(UsernameNotFoundException::class);
 
         $ldap = $this->createMock(LdapInterface::class);
         $ldap
@@ -42,7 +44,7 @@ public function testLoadUserByUsernameFailsIfCantConnectToLdap()
 
     public function testLoadUserByUsernameFailsIfNoLdapEntries()
     {
-        $this->expectException(\Symfony\Component\Security\Core\Exception\UsernameNotFoundException::class);
+        $this->expectException(UsernameNotFoundException::class);
 
         $result = $this->createMock(CollectionInterface::class);
         $query = $this->createMock(QueryInterface::class);
@@ -74,7 +76,7 @@ public function testLoadUserByUsernameFailsIfNoLdapEntries()
 
     public function testLoadUserByUsernameFailsIfMoreThanOneLdapEntry()
     {
-        $this->expectException(\Symfony\Component\Security\Core\Exception\UsernameNotFoundException::class);
+        $this->expectException(UsernameNotFoundException::class);
 
         $result = $this->createMock(CollectionInterface::class);
         $query = $this->createMock(QueryInterface::class);
@@ -106,7 +108,7 @@ public function testLoadUserByUsernameFailsIfMoreThanOneLdapEntry()
 
     public function testLoadUserByUsernameFailsIfMoreThanOneLdapPasswordsInEntry()
     {
-        $this->expectException(\Symfony\Component\Security\Core\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
 
         $result = $this->createMock(CollectionInterface::class);
         $query = $this->createMock(QueryInterface::class);
@@ -183,7 +185,7 @@ public function testLoadUserByUsernameShouldNotFailIfEntryHasNoUidKeyAttribute()
 
     public function testLoadUserByUsernameFailsIfEntryHasNoPasswordAttribute()
     {
-        $this->expectException(\Symfony\Component\Security\Core\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
 
         $result = $this->createMock(CollectionInterface::class);
         $query = $this->createMock(QueryInterface::class);