Fix some broken identity APIs:

- add_user_to_group and remove_user_from_group should take Group_Definition instances
  to be consistent
- add_user_to_group and remove_user_from_group in drivers/IdentityProvider.php should
  not be static

2 files changed, 10 insertions, 10 deletions

diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index 5de05948..5ca024e9 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -233,14 +233,14 @@ class identity_Core {
   /**
    * @see IdentityProvider_Driver::add_user_to_group.
    */
-  static function add_user_to_group($user, $group_id) {
-    return IdentityProvider::instance()->add_user_to_group($user, $group_id);
+  static function add_user_to_group($user, $group) {
+    return IdentityProvider::instance()->add_user_to_group($user, $group);
   }
 
   /**
    * @see IdentityProvider_Driver::remove_user_to_group.
    */
-  static function remove_user_from_group($user, $group_id) {
-    return IdentityProvider::instance()->remove_user_from_group($user, $group_id);
+  static function remove_user_from_group($user, $group) {
+    return IdentityProvider::instance()->remove_user_from_group($user, $group);
   }
 }
\ No newline at end of file
diff --git a/modules/gallery/libraries/drivers/IdentityProvider.php b/modules/gallery/libraries/drivers/IdentityProvider.php
index 3e85a57b..ac2473f5 100644
--- a/modules/gallery/libraries/drivers/IdentityProvider.php
+++ b/modules/gallery/libraries/drivers/IdentityProvider.php
@@ -116,17 +116,17 @@ interface IdentityProvider_Driver {
 
   /**
    * Add the user to the specified group
-   * @param User_Definition the user to add to the group
-   * @param int             the group_id
+   * @param User_Definition  the user to add
+   * @param Group_Definition the target group
    */
-  static function add_user_to_group($user, $group_id);
+  public function add_user_to_group($user, $group);
 
   /**
    * Remove the user to the specified group
-   * @param User_Definition the user to add to the group
-   * @param int             the group id
+   * @param User_Definition  the user to remove
+   * @param Group_Definition the owning group
    */
-  static function remove_user_from_group($user, $group_id);
+  public function remove_user_from_group($user, $group);
 } // End Identity Driver Definition
 
 interface Group_Definition {}