diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index b06145202e7cd..3ce678b866b4b 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -402,7 +402,7 @@ HttpKernel Ldap ---- - * The `RenameEntryInterface` has been deprecated, and merged with `EntryManagerInterface` + * The `RenameEntryInterface` has been removed, and merged with `EntryManagerInterface` Process ------- diff --git a/src/Symfony/Component/Ldap/Adapter/RenameEntryInterface.php b/src/Symfony/Component/Ldap/Adapter/RenameEntryInterface.php index 8bc70bda9637a..c15cb16e77e80 100644 --- a/src/Symfony/Component/Ldap/Adapter/RenameEntryInterface.php +++ b/src/Symfony/Component/Ldap/Adapter/RenameEntryInterface.php @@ -5,9 +5,9 @@ use Symfony\Component\Ldap\Entry; /** - * @deprecated This interface will be deprecated in 4.0, and merged with `EntryManagerInterface` - * * @author Kevin Schuurmans + * + * @deprecated since version 3.3, will be merged with {@link EntryManagerInterface} in 4.0. */ interface RenameEntryInterface { diff --git a/src/Symfony/Component/Ldap/CHANGELOG.md b/src/Symfony/Component/Ldap/CHANGELOG.md index 61af4adf151a2..5d90f278f567a 100644 --- a/src/Symfony/Component/Ldap/CHANGELOG.md +++ b/src/Symfony/Component/Ldap/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +3.3.0 +----- + +* The `RenameEntryInterface` inferface is deprecated, and will be merged with `EntryManagerInterface` in 4.0. + 3.1.0 -----