Merge pull request #3023 from stof/fix_deprecation_warnings

stof · web-flow · commit dcc2ec6bae83 · 2021-09-08T10:46:31.000+02:00
Remove deprecation warnings triggered when loading some interfaces
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+### 2.2.1 (2021-09-08)
+
+* Fixed a deprecation warning about groups being triggered when loading the User class of the bundle.
+
 ### 2.2.0 (2021-08-26)
 
 * Deprecated the Groups feature.
diff --git a/Model/GroupInterface.php b/Model/GroupInterface.php
@@ -11,13 +11,11 @@
 
 namespace FOS\UserBundle\Model;
 
-@trigger_error('Using Groups is deprecated since version 2.2 and will be removed in 3.0.', E_USER_DEPRECATED);
-
 /**
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  * @author Christophe Coevoet <stof@notk.org>
  *
- * @deprecated
+ * @deprecated Using Groups is deprecated since version 2.2 and will be removed in 3.0.
  */
 interface GroupInterface
 {
diff --git a/Model/GroupableInterface.php b/Model/GroupableInterface.php
@@ -11,14 +11,12 @@
 
 namespace FOS\UserBundle\Model;
 
-@trigger_error('Using Groups is deprecated since version 2.2 and will be removed in 3.0.', E_USER_DEPRECATED);
-
 /**
  * @author Thibault Duplessis <thibault.duplessis@gmail.com>
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  * @author Christophe Coevoet <stof@notk.org>
  *
- * @deprecated
+ * @deprecated Using Groups is deprecated since version 2.2 and will be removed in 3.0.
  */
 interface GroupableInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,11 @@`
`11`	`11`
`12`	`12`	`namespace FOS\UserBundle\Model;`
`13`	`13`
`14`		`-@trigger_error('Using Groups is deprecated since version 2.2 and will be removed in 3.0.', E_USER_DEPRECATED);`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* @author Johannes M. Schmitt <[email protected]>`
`18`	`16`	`* @author Christophe Coevoet <[email protected]>`
`19`	`17`	`*`
`20`		`- * @deprecated`
	`18`	`+ * @deprecated Using Groups is deprecated since version 2.2 and will be removed in 3.0.`
`21`	`19`	`*/`
`22`	`20`	`interface GroupInterface`
`23`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,12 @@`
`11`	`11`
`12`	`12`	`namespace FOS\UserBundle\Model;`
`13`	`13`
`14`		`-@trigger_error('Using Groups is deprecated since version 2.2 and will be removed in 3.0.', E_USER_DEPRECATED);`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* @author Thibault Duplessis <[email protected]>`
`18`	`16`	`* @author Johannes M. Schmitt <[email protected]>`
`19`	`17`	`* @author Christophe Coevoet <[email protected]>`
`20`	`18`	`*`
`21`		`- * @deprecated`
	`19`	`+ * @deprecated Using Groups is deprecated since version 2.2 and will be removed in 3.0.`
`22`	`20`	`*/`
`23`	`21`	`interface GroupableInterface`
`24`	`22`	`{`