Merge pull request #3023 from stof/fix_deprecation_warnings

Remove deprecation warnings triggered when loading some interfaces
FriendsOfSymfony · Sep 8, 2021 · dcc2ec6 · dcc2ec6
2 parents 185ca29 + 622ef82
commit dcc2ec6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
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
 {