Merge branch '3.2' into 3.3

nicolas-grekas · nicolas-grekas · commit 856c1274ea26 · 2017-05-21T10:56:50.000+02:00
* 3.2:
  do not mock a deprecated interface
  [DI] Added missing deprecation in changelog
  [Ldap] add a changelog file
diff --git a/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php b/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
@@ -35,7 +35,7 @@ class LdapBindAuthenticationProviderTest extends TestCase
     public function testEmptyPasswordShouldThrowAnException()
     {
         $userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
-        $ldap = $this->getMockBuilder('Symfony\Component\Ldap\LdapClientInterface')->getMock();
+        $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
         $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
 
         $provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap);

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class LdapBindAuthenticationProviderTest extends TestCase`
`35`	`35`	`public function testEmptyPasswordShouldThrowAnException()`
`36`	`36`	`{`
`37`	`37`	`$userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();`
`38`		`- $ldap = $this->getMockBuilder('Symfony\Component\Ldap\LdapClientInterface')->getMock();`
	`38`	`+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();`
`39`	`39`	`$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();`
`40`	`40`
`41`	`41`	`$provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap);`