Events on user registrations now strictly typed

diff --git a/EVENTS.txt b/EVENTS.txt
index a3fd43bd6a98c256c7a0f2a67141036225894323..f97617bdb0b75f2a357c0624d4cb0ce75eeae498 100644 (file)
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -781,12 +781,10 @@ SendImConfirmationCode: Send a confirmation code to confirm a user owns an IM sc
 - $user: user requesting the confirmation
 
 StartUserRegister: When a new user is being registered
-- &$profile: new profile data (no ID)
-- &$user: new user account (no ID or URI)
+- $profile: Profile object with new profile data (no ID yet)
 
 EndUserRegister: When a new user has been registered
-- &$profile: new profile data
-- &$user: new user account
+- $profile: Profile object with new profile data
 
 StartRobotsTxt: Before outputting the robots.txt page
 - &$action: RobotstxtAction being shown

diff --git a/classes/User.php b/classes/User.php
index 7a56e0f12ee217881e57338ac46e3208d9a55c43..cc6e55d1bde3ab936829102e19560b08024c6ed8 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -335,7 +335,7 @@ class User extends Managed_DataObject
 
         $user->created = common_sql_now();
 
-        if (Event::handle('StartUserRegister', array(&$user, &$profile))) {
+        if (Event::handle('StartUserRegister', array($profile))) {
 
             $profile->query('BEGIN');
 
@@ -459,7 +459,7 @@ class User extends Managed_DataObject
                 }
             }
 
-            Event::handle('EndUserRegister', array(&$profile, &$user));
+            Event::handle('EndUserRegister', array($profile));
         }
 
         return $user;

diff --git a/plugins/AutoSandbox/AutoSandboxPlugin.php b/plugins/AutoSandbox/AutoSandboxPlugin.php
index e197254f7f0419b5516416a2102f2dbb163a0f26..ca48020ea3b8668d73947010a2eff615eb121914 100644 (file)
--- a/plugins/AutoSandbox/AutoSandboxPlugin.php
+++ b/plugins/AutoSandbox/AutoSandboxPlugin.php
@@ -90,11 +90,11 @@ class AutoSandboxPlugin extends Plugin
          $action->elementEnd('div');
     }
 
-    function onEndUserRegister(&$profile,&$user)
+    public function onEndUserRegister(Profile $profile)
     {
-       $profile->sandbox();
-       if ($this->debug) {
-           common_log(LOG_WARNING, "AutoSandbox: sandboxed of $user->nickname");
+        $profile->sandbox();
+        if ($this->debug) {
+            common_log(LOG_WARNING, "AutoSandbox: sandboxed of $profile->nickname");
         }
     }
 }

diff --git a/plugins/FollowEveryone/FollowEveryonePlugin.php b/plugins/FollowEveryone/FollowEveryonePlugin.php
index 167b4315336acec99a02be4d06b4bd7900ec3ae9..b3f9341e1d3e89d688e7dc76a253905bd4b6ecca 100644 (file)
--- a/plugins/FollowEveryone/FollowEveryonePlugin.php
+++ b/plugins/FollowEveryone/FollowEveryonePlugin.php
@@ -55,24 +55,23 @@ class FollowEveryonePlugin extends Plugin
      * the new user to them. Exceptions (like silenced users or whatever)
      * are caught, logged, and ignored.
      *
-     * @param Profile &$newProfile The new user's profile
-     * @param User    &$newUser    The new user
+     * @param Profile $profile The new user's profile
      *
      * @return boolean hook value
      */
-    function onEndUserRegister(&$newProfile, &$newUser)
+    public function onEndUserRegister(Profile $profile)
     {
         $otherUser = new User();
-        $otherUser->whereAdd('id != ' . $newUser->id);
+        $otherUser->whereAdd('id != ' . $profile->id);
 
         if ($otherUser->find()) {
             while ($otherUser->fetch()) {
                 $otherProfile = $otherUser->getProfile();
                 try {
                     if (User_followeveryone_prefs::followEveryone($otherUser->id)) {
-                        Subscription::start($otherProfile, $newProfile);
+                        Subscription::start($otherProfile, $profile);
                     }
-                    Subscription::start($newProfile, $otherProfile);
+                    Subscription::start($profile, $otherProfile);
                 } catch (Exception $e) {
                     common_log(LOG_WARNING, $e->getMessage());
                     continue;
@@ -82,7 +81,7 @@ class FollowEveryonePlugin extends Plugin
 
         $ufep = new User_followeveryone_prefs();
 
-        $ufep->user_id        = $newUser->id;
+        $ufep->user_id        = $profile->id;
         $ufep->followeveryone = true;
 
         $ufep->insert();

diff --git a/plugins/ForceGroup/ForceGroupPlugin.php b/plugins/ForceGroup/ForceGroupPlugin.php
index c8e6709fc8534d931f9e8be5569ae4406d1385f7..06d5521d039147d86ce39602e4e3bc8930396edb 100644 (file)
--- a/plugins/ForceGroup/ForceGroupPlugin.php
+++ b/plugins/ForceGroup/ForceGroupPlugin.php
@@ -61,9 +61,8 @@ class ForceGroupPlugin extends Plugin
         return true;
     }
 
-    function onEndUserRegister($profile, $user)
+    public function onEndUserRegister(Profile $profile)
     {
-        $profile = $user->getProfile();
         foreach ($this->join as $nickname) {
             $group = User_group::getForNickname($nickname);
             if ($group && !$profile->isMember($group)) {
@@ -73,7 +72,7 @@ class ForceGroupPlugin extends Plugin
                     // TRANS: Server exception.
                     // TRANS: %1$s is a user nickname, %2$s is a group nickname.
                     throw new ServerException(sprintf(_m('Could not join user %1$s to group %2$s.'),
-                                               $user->nickname, $group->nickname));
+                                               $profile->nickname, $group->nickname));
                 }
             }
         }

diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
index be986fa2b818ca03edc4cc832bb50c00757b8388..2cfd98aad77dc169a27bbd5546e28b4d9ac6da9a 100644 (file)
--- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php
+++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
@@ -142,11 +142,10 @@ class RegisterThrottlePlugin extends Plugin
      * We record the successful registration and IP address.
      *
      * @param Profile $profile new user's profile
-     * @param User $user new user
      *
      * @return boolean hook value
      */
-    function onEndUserRegister($profile, $user)
+    public function onEndUserRegister(Profile $profile)
     {
         $ipaddress = $this->_getIpAddress();
 
@@ -157,7 +156,7 @@ class RegisterThrottlePlugin extends Plugin
 
         $reg = new Registration_ip();
 
-        $reg->user_id   = $user->id;
+        $reg->user_id   = $profile->id;
         $reg->ipaddress = $ipaddress;
 
         $result = $reg->insert();

diff --git a/plugins/UserLimit/UserLimitPlugin.php b/plugins/UserLimit/UserLimitPlugin.php
index 412f8604a55d7b4e9295e3490f07f88aceeefd0b..eec008180baacef9c1bba0901010c12419ad168b 100644 (file)
--- a/plugins/UserLimit/UserLimitPlugin.php
+++ b/plugins/UserLimit/UserLimitPlugin.php
@@ -49,7 +49,7 @@ class UserLimitPlugin extends Plugin
 {
     public $maxUsers = null;
 
-    function onStartUserRegister(&$user, &$profile)
+    public function onStartUserRegister(Profile $profile)
     {
         $this->_checkMaxUsers();
         return true;