Merge "Random documentation tweaks"

[lhc/web/wiklou.git] / includes / UserArray.php

diff --git a/includes/UserArray.php b/includes/UserArray.php
index 6cce48c..90d1134 100644 (file)
--- a/includes/UserArray.php
+++ b/includes/UserArray.php
@@ -1,4 +1,24 @@
 <?php
+/**
+ * Classes to walk into a list of User objects.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
 
 abstract class UserArray implements Iterator {
        /**
@@ -24,11 +44,15 @@ abstract class UserArray implements Iterator {
                $ids = array_map( 'intval', (array)$ids ); // paranoia
                if ( !$ids ) {
                        // Database::select() doesn't like empty arrays
-                       return new ArrayIterator(array());
+                       return new ArrayIterator( array() );
                }
                $dbr = wfGetDB( DB_SLAVE );
-               $res = $dbr->select( 'user', '*', array( 'user_id' => $ids ),
-                       __METHOD__ );
+               $res = $dbr->select(
+                       'user',
+                       User::selectFields(),
+                       array( 'user_id' => array_unique( $ids ) ),
+                       __METHOD__
+               );
                return self::newFromResult( $res );
        }
 
@@ -41,7 +65,7 @@ abstract class UserArray implements Iterator {
        }
 }
 
-class UserArrayFromResult extends UserArray {
+class UserArrayFromResult extends UserArray implements Countable {
 
        /**
         * @var ResultWrapper
@@ -77,6 +101,9 @@ class UserArrayFromResult extends UserArray {
                return $this->res->numRows();
        }
 
+       /**
+        * @return User
+        */
        function current() {
                return $this->current;
        }