Merge branch '3.2' into 3.3

nicolas-grekas · nicolas-grekas · commit 3fbf940234a2 · 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/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+3.1.0
+-----
+
+ * The `LdapClient` class is deprecated. Use the `Ldap` class instead.
diff --git a/LdapClient.php b/LdapClient.php
@@ -18,7 +18,7 @@
  * @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
 {
diff --git a/LdapClientInterface.php b/LdapClientInterface.php
@@ -19,7 +19,7 @@
  * @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
 {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* @author Francis Besset <francis.besset@gmail.com>`
`19`	`19`	`* @author Charles Sarrazin <charles@sarraz.in>`
`20`	`20`	`*`
`21`		`- * @deprecated The LdapClient class will be removed in Symfony 4.0. You should use the Ldap class instead.`
	`21`	`+ * @deprecated since version 3.1, to be removed in 4.0. Use the Ldap class instead.`
`22`	`22`	`*/`
`23`	`23`	`final class LdapClient implements LdapClientInterface`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`* @author Grégoire Pineau <lyrixx@lyrixx.info>`
`20`	`20`	`* @author Charles Sarrazin <charles@sarraz.in>`
`21`	`21`	`*`
`22`		`- * @deprecated You should use LdapInterface instead`
	`22`	`+ * @deprecated since version 3.1, to be removed in 4.0. Use the LdapInterface instead.`
`23`	`23`	`*/`
`24`	`24`	`interface LdapClientInterface extends LdapInterface`
`25`	`25`	`{`