Follows-up
e3ce482e1b4da37.
* Add them to parameters of doSaveUserGroups(), which were the
entrypoint to the error fixed by
e3ce482e1b4da37.
* Add them to parameters of addLogEntry(), which is where the
actual count() error happened.
Bug: T182377
Change-Id: I647a1ebf6dc0e80952efe2a3c1192fd8ac5dc1b7
* containing only those groups that are to have new expiry values set
* @return array Tuple of added, then removed groups
*/
* containing only those groups that are to have new expiry values set
* @return array Tuple of added, then removed groups
*/
- function doSaveUserGroups( $user, $add, $remove, $reason = '', $tags = [],
- $groupExpiries = []
+ function doSaveUserGroups( $user, array $add, array $remove, $reason = '',
+ array $tags = [], array $groupExpiries = []
) {
// Validate input set...
$isself = $user->getName() == $this->getUser()->getName();
) {
// Validate input set...
$isself = $user->getName() == $this->getUser()->getName();
* @param User|UserRightsProxy $user
* @param array $oldGroups
* @param array $newGroups
* @param User|UserRightsProxy $user
* @param array $oldGroups
* @param array $newGroups
+ * @param string $reason
* @param array $tags Change tags for the log entry
* @param array $oldUGMs Associative array of (group name => UserGroupMembership)
* @param array $newUGMs Associative array of (group name => UserGroupMembership)
*/
* @param array $tags Change tags for the log entry
* @param array $oldUGMs Associative array of (group name => UserGroupMembership)
* @param array $newUGMs Associative array of (group name => UserGroupMembership)
*/
- protected function addLogEntry( $user, $oldGroups, $newGroups, $reason, $tags,
- $oldUGMs, $newUGMs
+ protected function addLogEntry( $user, array $oldGroups, array $newGroups, $reason,
+ array $tags, array $oldUGMs, array $newUGMs
) {
// make sure $oldUGMs and $newUGMs are in the same order, and serialise
// each UGM object to a simplified array
) {
// make sure $oldUGMs and $newUGMs are in the same order, and serialise
// each UGM object to a simplified array