Renamed GroupAwareUserInterface to GroupableInterface without extending UserInterface

stof · stof · commit b0adfbf37883 · 2011-07-28T21:59:01.000+02:00
diff --git a/Model/GroupableInterface.php b/Model/GroupableInterface.php
@@ -16,7 +16,7 @@
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  * @author Christophe Coevoet <stof@notk.org>
  */
-interface GroupAwareUserInterface extends UserInterface
+interface GroupableInterface
 {
     /**
      * Gets the groups granted to the user.
diff --git a/Model/User.php b/Model/User.php
@@ -22,7 +22,7 @@
  * @author Thibault Duplessis <thibault.duplessis@gmail.com>
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-abstract class User implements GroupAwareUserInterface
+abstract class User implements UserInterface, GroupableInterface
 {
     const ROLE_DEFAULT = 'ROLE_USER';
     const ROLE_SUPER_ADMIN = 'ROLE_SUPER_ADMIN';

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* @author Johannes M. Schmitt <schmittjoh@gmail.com>`
`17`	`17`	`* @author Christophe Coevoet <stof@notk.org>`
`18`	`18`	`*/`
`19`		`-interface GroupAwareUserInterface extends UserInterface`
	`19`	`+interface GroupableInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* Gets the groups granted to the user.`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* @author Thibault Duplessis <thibault.duplessis@gmail.com>`
`23`	`23`	`* @author Johannes M. Schmitt <schmittjoh@gmail.com>`
`24`	`24`	`*/`
`25`		`-abstract class User implements GroupAwareUserInterface`
	`25`	`+abstract class User implements UserInterface, GroupableInterface`
`26`	`26`	`{`
`27`	`27`	`const ROLE_DEFAULT = 'ROLE_USER';`
`28`	`28`	`const ROLE_SUPER_ADMIN = 'ROLE_SUPER_ADMIN';`