Merge pull request #3024 from stof/fix_more_deprecation

stof · web-flow · commit 813161b132b2 · 2021-09-08T11:54:36.000+02:00
Fix a deprecation about groups being triggered when loading ORM metadata
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+### 2.2.2 (2021-09-08)
+
+* Fixed a deprecation warning about groups being triggered when loading all Doctrine metadata.
+
 ### 2.2.1 (2021-09-08)
 
 * Fixed a deprecation warning about groups being triggered when loading the User class of the bundle.
diff --git a/Model/Group.php b/Model/Group.php
@@ -11,12 +11,10 @@
 
 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>
  *
- * @deprecated
+ * @deprecated Using Groups is deprecated since version 2.2 and will be removed in 3.0.
  */
 abstract class Group implements GroupInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,10 @@`
`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`	`*`
`19`		`- * @deprecated`
	`17`	`+ * @deprecated Using Groups is deprecated since version 2.2 and will be removed in 3.0.`
`20`	`18`	`*/`
`21`	`19`	`abstract class Group implements GroupInterface`
`22`	`20`	`{`