Merge "ChangesListSpecialPageTest: Use Database::makeList() instead of makeshift...

diff --combined includes/specialpage/ChangesListSpecialPage.php
index c38b0da,14b824f..eb2cada
--- 1/includes/specialpage/ChangesListSpecialPage.php
--- 2/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@@ -22,7 -22,7 +22,7 @@@
   */
  use MediaWiki\Logger\LoggerFactory;
  use Wikimedia\Rdbms\DBQueryTimeoutError;
 -use Wikimedia\Rdbms\ResultWrapper;
 +use Wikimedia\Rdbms\IResultWrapper;
  use Wikimedia\Rdbms\FakeResultWrapper;
  use Wikimedia\Rdbms\IDatabase;
  
@@@ -276,7 -276,7 +276,7 @@@ abstract class ChangesListSpecialPage e
                                                'queryCallable' => function ( $specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
                                                        &$query_options, &$join_conds
                                                ) {
-                                                       $conds[] = 'rc_bot = 0';
+                                                       $conds['rc_bot'] = 0;
                                                },
                                                'cssClassSuffix' => 'bot',
                                                'isRowApplicableCallable' => function ( $ctx, $rc ) {
@@@ -291,7 -291,7 +291,7 @@@
                                                'queryCallable' => function ( $specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
                                                        &$query_options, &$join_conds
                                                ) {
-                                                       $conds[] = 'rc_bot = 1';
+                                                       $conds['rc_bot'] = 1;
                                                },
                                                'cssClassSuffix' => 'human',
                                                'isRowApplicableCallable' => function ( $ctx, $rc ) {
@@@ -866,7 -866,7 +866,7 @@@
        /**
         * Get the database result for this special page instance. Used by ApiFeedRecentChanges.
         *
 -       * @return bool|ResultWrapper Result or false
 +       * @return bool|IResultWrapper Result or false
         */
        public function getRows() {
                $opts = $this->getOptions();
@@@ -1455,7 -1455,7 +1455,7 @@@
         * @param array $query_options Array of query options; see IDatabase::select $options
         * @param array $join_conds Array of join conditions; see IDatabase::select $join_conds
         * @param FormOptions $opts
 -       * @return bool|ResultWrapper Result or false
 +       * @return bool|IResultWrapper Result or false
         */
        protected function doMainQuery( $tables, $fields, $conds,
                $query_options, $join_conds, FormOptions $opts
@@@ -1526,7 -1526,7 +1526,7 @@@
        /**
         * Send output to the OutputPage object, only called if not used feeds
         *
 -       * @param ResultWrapper $rows Database rows
 +       * @param IResultWrapper $rows Database rows
         * @param FormOptions $opts
         */
        public function webOutput( $rows, $opts ) {
@@@ -1545,7 -1545,7 +1545,7 @@@
        /**
         * Build and output the actual changes list.
         *
 -       * @param ResultWrapper $rows Database rows
 +       * @param IResultWrapper $rows Database rows
         * @param FormOptions $opts
         */
        abstract public function outputChangesList( $rows, $opts );