Merge "Added ORMIterator interface which can be used for type hinting (in particular...

diff --combined includes/AutoLoader.php
index d29c4e3,6631241..09eea7d
--- 1/includes/AutoLoader.php
--- 2/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -470,6 -470,7 +470,7 @@@ $wgAutoloadLocalClasses = array
        'MySQLMasterPos' => 'includes/db/DatabaseMysql.php',
        'ORAField' => 'includes/db/DatabaseOracle.php',
        'ORAResult' => 'includes/db/DatabaseOracle.php',
+       'ORMIterator' => 'includes/db/ORMIterator',
        'ORMResult' => 'includes/db/ORMResult.php',
        'ORMRow' => 'includes/db/ORMRow.php',
        'ORMTable' => 'includes/db/ORMTable.php',
@@@ -992,9 -993,6 +993,9 @@@
        'AnsiTermColorer'  => 'maintenance/term/MWTerm.php',
        'DummyTermColorer' => 'maintenance/term/MWTerm.php',
  
 +      # mw-config
 +      'InstallerOverrides' => 'mw-config/overrides.php',
 +
        # tests
        'DbTestPreviewer' => 'tests/testHelpers.inc',
        'DbTestRecorder' => 'tests/testHelpers.inc',

diff --combined includes/db/IORMTable.php
index 619faf5,0c5528c..8fa7220
--- 1/includes/db/IORMTable.php
--- 2/includes/db/IORMTable.php
+++ b/includes/db/IORMTable.php
@@@ -62,9 -62,6 +62,9 @@@ interface IORMTable 
         * * array
         * * blob
         *
 +       * TODO: get rid of the id field. Every row instance needs to have
 +       * one so this is just causing hassle at various locations by requiring an extra check for field name.
 +       *
         * @since 1.20
         *
         * @return array
@@@ -106,7 -103,7 +106,7 @@@
         * @return ORMResult
         */
        public function select( $fields = null, array $conditions = array(),
-                                                       array $options = array(), $functionName  = null );
+                                                       array $options = array(), $functionName = null );
  
        /**
         * Selects the the specified fields of the records matching the provided
@@@ -122,7 -119,7 +122,7 @@@
         * @return array of self
         */
        public function selectObjects( $fields = null, array $conditions = array(),
-                                                                  array $options = array(), $functionName  = null );
+                                                                  array $options = array(), $functionName = null );
  
        /**
         * Do the actual select.
@@@ -137,7 -134,7 +137,7 @@@
         * @return ResultWrapper
         */
        public function rawSelect( $fields = null, array $conditions = array(),
-                                                          array $options = array(), $functionName  = null );
+                                                          array $options = array(), $functionName = null );
  
        /**
         * Selects the the specified fields of the records matching the provided
@@@ -162,7 -159,7 +162,7 @@@
         * @return array of array
         */
        public function selectFields( $fields = null, array $conditions = array(),
-                                                                 array $options = array(), $collapse = true, $functionName  = null );
+                                                                 array $options = array(), $collapse = true, $functionName = null );
  
        /**
         * Selects the the specified fields of the first matching record.
@@@ -444,4 -441,4 +444,4 @@@
         */
        public function canHaveField( $name );
  
--}
++}