diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.2' into 3.3

Browse Source 
* 3.2:
  do not mock a deprecated interface
  [DI] Added missing deprecation in changelog
  [Ldap] add a changelog file
This commit is contained in:
Nicolas Grekas 2017-05-21 10:56:50 +02:00
commit 023cf9e014
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Component/DependencyInjection/CHANGELOG.md
View File

@ -37,6 +37,7 @@ CHANGELOG
* deprecated the ability to set or unset a private service with the `Container::set()` method
* deprecated the ability to check for the existence of a private service with the `Container::has()` method
* deprecated the ability to request a private service with the `Container::get()` method
* deprecated support for generating a dumped `Container` without populating the method map
3.0.0
-----

7
src/Symfony/Component/Ldap/CHANGELOG.md Normal file
View File

@ -0,0 +1,7 @@
CHANGELOG
=========
3.1.0
-----
* The `LdapClient` class is deprecated. Use the `Ldap` class instead.

2
src/Symfony/Component/Ldap/LdapClient.php
View File

@ -18,7 +18,7 @@ namespace Symfony\Component\Ldap;
* @author Francis Besset <francis.besset@gmail.com>
* @author Charles Sarrazin <charles@sarraz.in>
*
* @deprecated The LdapClient class will be removed in Symfony 4.0. You should use the Ldap class instead.
* @deprecated since version 3.1, to be removed in 4.0. Use the Ldap class instead.
*/
final class LdapClient implements LdapClientInterface
{

2
src/Symfony/Component/Ldap/LdapClientInterface.php
View File

@ -19,7 +19,7 @@ namespace Symfony\Component\Ldap;
* @author Grégoire Pineau <lyrixx@lyrixx.info>
* @author Charles Sarrazin <charles@sarraz.in>
*
* @deprecated You should use LdapInterface instead
* @deprecated since version 3.1, to be removed in 4.0. Use the LdapInterface instead.
*/
interface LdapClientInterface extends LdapInterface
{

2
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
View File

@ -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);