Merge "ChangesList: Comment out newlines in EnhancedChangesListGroup.mustache"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 3 Apr 2019 23:44:19 +0000 (23:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Apr 2019 23:44:19 +0000 (23:44 +0000)
20 files changed:
.fresnel.yml
autoload.php
includes/DefaultSettings.php
includes/ServiceWiring.php
includes/installer/SqliteInstaller.php
includes/jobqueue/Job.php
includes/jobqueue/JobQueue.php
includes/jobqueue/JobQueueDB.php
includes/jobqueue/JobQueueFederated.php
includes/jobqueue/JobQueueGroup.php
includes/jobqueue/JobQueueMemory.php
includes/jobqueue/JobQueueRedis.php
includes/jobqueue/aggregator/JobQueueAggregator.php [deleted file]
includes/jobqueue/aggregator/JobQueueAggregatorNull.php [deleted file]
includes/jobqueue/aggregator/JobQueueAggregatorRedis.php [deleted file]
includes/logging/LogFormatter.php
languages/Language.php
maintenance/includes/MigrateActors.php
resources/src/mediawiki.legacy/protect.js
resources/src/mediawiki.ui/components/checkbox.less

index e694294..2f71e4b 100644 (file)
@@ -3,8 +3,8 @@ runs: 5
 scenarios:
   Load a page:
     # The only page that exists by default is the main page.
-    # But, its actual name is configurable/unknown (T216791).
-    # Omit 'title' to let MediaWiki show the defaul (which is the main page),
+    # But its actual name is configurable/unknown (T216791).
+    # Omit 'title' to let MediaWiki show the default (which is the main page),
     # and a query string to prevent a normalization redirect.
     url: "{MW_SERVER}{MW_SCRIPT_PATH}/index.php?noredirectplz"
     viewport:
index 95dd2ae..bb1b3b2 100644 (file)
@@ -705,9 +705,6 @@ $wgAutoloadLocalClasses = [
        'JavaScriptMinifier' => __DIR__ . '/includes/libs/JavaScriptMinifier.php',
        'Job' => __DIR__ . '/includes/jobqueue/Job.php',
        'JobQueue' => __DIR__ . '/includes/jobqueue/JobQueue.php',
-       'JobQueueAggregator' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregator.php',
-       'JobQueueAggregatorNull' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregatorNull.php',
-       'JobQueueAggregatorRedis' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php',
        'JobQueueConnectionError' => __DIR__ . '/includes/jobqueue/exception/JobQueueConnectionError.php',
        'JobQueueDB' => __DIR__ . '/includes/jobqueue/JobQueueDB.php',
        'JobQueueEnqueueUpdate' => __DIR__ . '/includes/deferred/JobQueueEnqueueUpdate.php',
index f16b8cb..cedba70 100644 (file)
@@ -7571,14 +7571,6 @@ $wgJobTypeConf = [
        'default' => [ 'class' => JobQueueDB::class, 'order' => 'random', 'claimTTL' => 3600 ],
 ];
 
-/**
- * Which aggregator to use for tracking which queues have jobs.
- * These settings should be global to all wikis.
- */
-$wgJobQueueAggregator = [
-       'class' => JobQueueAggregatorNull::class
-];
-
 /**
  * Whether to include the number of jobs that are queued
  * for the API's maxlag parameter.
index b1cdc81..e121898 100644 (file)
@@ -203,12 +203,12 @@ return [
        },
 
        'LinkRenderer' => function ( MediaWikiServices $services ) : LinkRenderer {
-               global $wgUser;
-
                if ( defined( 'MW_NO_SESSION' ) ) {
                        return $services->getLinkRendererFactory()->create();
                } else {
-                       return $services->getLinkRendererFactory()->createForUser( $wgUser );
+                       return $services->getLinkRendererFactory()->createForUser(
+                               RequestContext::getMain()->getUser()
+                       );
                }
        },
 
index a8abba9..fa0d2a5 100644 (file)
@@ -231,6 +231,7 @@ class SqliteInstaller extends DatabaseInstaller {
                $status->merge( $this->makeStubDBFile( $dir, $db ) );
                $status->merge( $this->makeStubDBFile( $dir, "wikicache" ) );
                $status->merge( $this->makeStubDBFile( $dir, "{$db}_l10n_cache" ) );
+               $status->merge( $this->makeStubDBFile( $dir, "{$db}_jobqueue" ) );
                if ( !$status->isOK() ) {
                        return $status;
                }
@@ -283,6 +284,39 @@ EOT;
                        return Status::newFatal( 'config-sqlite-connection-error', $e->getMessage() );
                }
 
+               # Create the job queue DB
+               try {
+                       $conn = Database::factory(
+                               'sqlite', [ 'dbname' => "{$db}_jobqueue", 'dbDirectory' => $dir ] );
+                       # @todo: don't duplicate job definition, though it's very static
+                       $sql =
+<<<EOT
+       CREATE TABLE job (
+               job_id INTEGER  NOT NULL PRIMARY KEY AUTOINCREMENT,
+               job_cmd BLOB NOT NULL default '',
+               job_namespace INTEGER NOT NULL,
+               job_title TEXT  NOT NULL,
+               job_timestamp BLOB NULL default NULL,
+               job_params BLOB NOT NULL,
+               job_random integer  NOT NULL default 0,
+               job_attempts integer  NOT NULL default 0,
+               job_token BLOB NOT NULL default '',
+               job_token_timestamp BLOB NULL default NULL,
+               job_sha1 BLOB NOT NULL default ''
+       );
+       CREATE INDEX job_sha1 ON job (job_sha1);
+       CREATE INDEX job_cmd_token ON job (job_cmd,job_token,job_random);
+       CREATE INDEX job_cmd_token_id ON job (job_cmd,job_token,job_id);
+       CREATE INDEX job_cmd ON job (job_cmd, job_namespace, job_title, job_params);
+       CREATE INDEX job_timestamp ON job (job_timestamp);
+EOT;
+                       $conn->query( $sql );
+                       $conn->query( "PRAGMA journal_mode=WAL" ); // this is permanent
+                       $conn->close();
+               } catch ( DBConnectionError $e ) {
+                       return Status::newFatal( 'config-sqlite-connection-error', $e->getMessage() );
+               }
+
                # Open the main DB
                return $this->getConnection();
        }
@@ -340,7 +374,9 @@ EOT;
         */
        public function getLocalSettings() {
                $dir = LocalSettingsGenerator::escapePhpString( $this->getVar( 'wgSQLiteDataDir' ) );
-
+               // These tables have frequent writes and are thus split off from the main one.
+               // Since the code using these tables only uses transactions for writes then set
+               // them to using BEGIN IMMEDIATE. This avoids frequent lock errors on first write.
                return "# SQLite-specific settings
 \$wgSQLiteDataDir = \"{$dir}\";
 \$wgObjectCaches[CACHE_DB] = [
@@ -350,7 +386,9 @@ EOT;
                'type' => 'sqlite',
                'dbname' => 'wikicache',
                'tablePrefix' => '',
+               'variables' => [ 'synchronous' => 'NORMAL' ],
                'dbDirectory' => \$wgSQLiteDataDir,
+               'trxMode' => 'IMMEDIATE',
                'flags' => 0
        ]
 ];
@@ -358,8 +396,22 @@ EOT;
        'type' => 'sqlite',
        'dbname' => \"{\$wgDBname}_l10n_cache\",
        'tablePrefix' => '',
+       'variables' => [ 'synchronous' => 'NORMAL' ],
        'dbDirectory' => \$wgSQLiteDataDir,
+       'trxMode' => 'IMMEDIATE',
        'flags' => 0
+];
+\$wgJobTypeConf['default'] = [
+       'class' => 'JobQueueDB',
+       'claimTTL' => 3600,
+       'server' => [
+               'type' => 'sqlite',
+               'dbname' => \"{\$wgDBname}_jobqueue\",
+               'tablePrefix' => '',
+               'dbDirectory' => \$wgSQLiteDataDir,
+               'trxMode' => 'IMMEDIATE',
+               'flags' => 0
+       ]
 ];";
        }
 }
index 24fc473..22ff446 100644 (file)
@@ -156,6 +156,36 @@ abstract class Job implements IJobSpecification {
                return $this->params;
        }
 
+       /**
+        * @param string|null $field Metadata field or null to get all the metadata
+        * @return mixed|null Value; null if missing
+        * @since 1.33
+        */
+       public function getMetadata( $field = null ) {
+               if ( $field === null ) {
+                       return $this->metadata;
+               }
+
+               return $this->metadata[$field] ?? null;
+       }
+
+       /**
+        * @param string $field Key name to set the value for
+        * @param mixed $value The value to set the field for
+        * @return mixed|null The prior field value; null if missing
+        * @since 1.33
+        */
+       public function setMetadata( $field, $value ) {
+               $old = $this->getMetadata( $field );
+               if ( $value === null ) {
+                       unset( $this->metadata[$field] );
+               } else {
+                       $this->metadata[$field] = $value;
+               }
+
+               return $old;
+       }
+
        /**
         * @return int|null UNIX timestamp to delay running this job until, otherwise null
         * @since 1.22
index c9f17cf..8cfed3b 100644 (file)
@@ -44,8 +44,6 @@ abstract class JobQueue {
 
        /** @var BagOStuff */
        protected $dupCache;
-       /** @var JobQueueAggregator */
-       protected $aggr;
 
        const QOS_ATOMIC = 1; // integer; "all-or-nothing" job insertions
 
@@ -69,7 +67,6 @@ abstract class JobQueue {
                        throw new JobQueueError( __CLASS__ . " does not support '{$this->order}' order." );
                }
                $this->dupCache = wfGetCache( CACHE_ANYTHING );
-               $this->aggr = $params['aggregator'] ?? new JobQueueAggregatorNull( [] );
                $this->readOnlyReason = $params['readOnlyReason'] ?? false;
        }
 
@@ -338,7 +335,6 @@ abstract class JobQueue {
                }
 
                $this->doBatchPush( $jobs, $flags );
-               $this->aggr->notifyQueueNonEmpty( $this->domain, $this->type );
 
                foreach ( $jobs as $job ) {
                        if ( $job->isRootJob() ) {
@@ -376,10 +372,6 @@ abstract class JobQueue {
 
                $job = $this->doPop();
 
-               if ( !$job ) {
-                       $this->aggr->notifyQueueEmpty( $this->domain, $this->type );
-               }
-
                // Flag this job as an old duplicate based on its "root" job...
                try {
                        if ( $job && $this->isRootJobOldDuplicate( $job ) ) {
index 74a6559..7aecfe9 100644 (file)
@@ -317,8 +317,8 @@ class JobQueueDB extends JobQueue {
                                $title = Title::makeTitle( $row->job_namespace, $row->job_title );
                                $job = Job::factory( $row->job_cmd, $title,
                                        self::extractBlob( $row->job_params ) );
-                               $job->metadata['id'] = $row->job_id;
-                               $job->metadata['timestamp'] = $row->job_timestamp;
+                               $job->setMetadata( 'id', $row->job_id );
+                               $job->setMetadata( 'timestamp', $row->job_timestamp );
                                break; // done
                        } while ( true );
 
@@ -484,7 +484,8 @@ class JobQueueDB extends JobQueue {
         * @throws MWException
         */
        protected function doAck( Job $job ) {
-               if ( !isset( $job->metadata['id'] ) ) {
+               $id = $job->getMetadata( 'id' );
+               if ( $id === null ) {
                        throw new MWException( "Job of type '{$job->getType()}' has no ID." );
                }
 
@@ -493,8 +494,11 @@ class JobQueueDB extends JobQueue {
                $scope = $this->getScopedNoTrxFlag( $dbw );
                try {
                        // Delete a row with a single DELETE without holding row locks over RTTs...
-                       $dbw->delete( 'job',
-                               [ 'job_cmd' => $this->type, 'job_id' => $job->metadata['id'] ], __METHOD__ );
+                       $dbw->delete(
+                               'job',
+                               [ 'job_cmd' => $this->type, 'job_id' => $id ],
+                               __METHOD__
+                       );
 
                        JobQueue::incrStats( 'acks', $this->type );
                } catch ( DBError $e ) {
@@ -617,8 +621,8 @@ class JobQueueDB extends JobQueue {
                                                Title::makeTitle( $row->job_namespace, $row->job_title ),
                                                strlen( $row->job_params ) ? unserialize( $row->job_params ) : []
                                        );
-                                       $job->metadata['id'] = $row->job_id;
-                                       $job->metadata['timestamp'] = $row->job_timestamp;
+                                       $job->setMetadata( 'id', $row->job_id );
+                                       $job->setMetadata( 'timestamp', $row->job_timestamp );
 
                                        return $job;
                                }
@@ -724,7 +728,6 @@ class JobQueueDB extends JobQueue {
                                        $affected = $dbw->affectedRows();
                                        $count += $affected;
                                        JobQueue::incrStats( 'recycles', $this->type, $affected );
-                                       $this->aggr->notifyQueueNonEmpty( $this->domain, $this->type );
                                }
                        }
 
index 2025bf7..30ab7e7 100644 (file)
@@ -287,7 +287,7 @@ class JobQueueFederated extends JobQueue {
                                $job = false;
                        }
                        if ( $job ) {
-                               $job->metadata['QueuePartition'] = $partition;
+                               $job->setMetadata( 'QueuePartition', $partition );
 
                                return $job;
                        } else {
@@ -300,11 +300,12 @@ class JobQueueFederated extends JobQueue {
        }
 
        protected function doAck( Job $job ) {
-               if ( !isset( $job->metadata['QueuePartition'] ) ) {
+               $partition = $job->getMetadata( 'QueuePartition' );
+               if ( $partition === null ) {
                        throw new MWException( "The given job has no defined partition name." );
                }
 
-               $this->partitionQueues[$job->metadata['QueuePartition']]->ack( $job );
+               $this->partitionQueues[$partition]->ack( $job );
        }
 
        protected function doIsRootJobOldDuplicate( Job $job ) {
index 7ae9713..b9c4157 100644 (file)
@@ -114,7 +114,6 @@ class JobQueueGroup {
                } else {
                        $conf = $conf + $wgJobTypeConf['default'];
                }
-               $conf['aggregator'] = JobQueueAggregator::singleton();
                if ( !isset( $conf['readOnlyReason'] ) ) {
                        $conf['readOnlyReason'] = $this->readOnlyReason;
                }
index 9b1fbdf..6c45e96 100644 (file)
@@ -132,7 +132,7 @@ class JobQueueMemory extends JobQueue {
                $job = $this->jobFromSpecInternal( $spec );
 
                end( $claimed );
-               $job->metadata['claimId'] = key( $claimed );
+               $job->setMetadata( 'claimId', key( $claimed ) );
 
                return $job;
        }
@@ -148,7 +148,7 @@ class JobQueueMemory extends JobQueue {
                }
 
                $claimed =& $this->getQueueData( 'claimed' );
-               unset( $claimed[$job->metadata['claimId']] );
+               $job->setMetadata( 'claimId', null );
        }
 
        /**
index 5e7a115..4d07a09 100644 (file)
@@ -385,11 +385,11 @@ LUA;
         * @throws JobQueueError
         */
        protected function doAck( Job $job ) {
-               if ( !isset( $job->metadata['uuid'] ) ) {
+               $uuid = $job->getMetadata( 'uuid' );
+               if ( $uuid === null ) {
                        throw new UnexpectedValueException( "Job of type '{$job->getType()}' has no UUID." );
                }
 
-               $uuid = $job->metadata['uuid'];
                $conn = $this->getConnection();
                try {
                        static $script =
@@ -643,10 +643,11 @@ LUA;
                        }
                        $title = Title::makeTitle( $item['namespace'], $item['title'] );
                        $job = Job::factory( $item['type'], $title, $item['params'] );
-                       $job->metadata['uuid'] = $item['uuid'];
-                       $job->metadata['timestamp'] = $item['timestamp'];
+                       $job->setMetadata( 'uuid', $item['uuid'] );
+                       $job->setMetadata( 'timestamp', $item['timestamp'] );
                        // Add in attempt count for debugging at showJobs.php
-                       $job->metadata['attempts'] = $conn->hGet( $this->getQueueKey( 'h-attempts' ), $uid );
+                       $job->setMetadata( 'attempts',
+                               $conn->hGet( $this->getQueueKey( 'h-attempts' ), $uid ) );
 
                        return $job;
                } catch ( RedisException $e ) {
@@ -704,8 +705,8 @@ LUA;
        protected function getJobFromFields( array $fields ) {
                $title = Title::makeTitle( $fields['namespace'], $fields['title'] );
                $job = Job::factory( $fields['type'], $title, $fields['params'] );
-               $job->metadata['uuid'] = $fields['uuid'];
-               $job->metadata['timestamp'] = $fields['timestamp'];
+               $job->setMetadata( 'uuid', $fields['uuid'] );
+               $job->setMetadata( 'timestamp', $fields['timestamp'] );
 
                return $job;
        }
diff --git a/includes/jobqueue/aggregator/JobQueueAggregator.php b/includes/jobqueue/aggregator/JobQueueAggregator.php
deleted file mode 100644 (file)
index b44fc45..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Job queue aggregator code.
- *
- * 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
- */
-
-/**
- * Class to handle tracking information about all queues
- *
- * @ingroup JobQueue
- * @since 1.21
- */
-abstract class JobQueueAggregator {
-       /** @var JobQueueAggregator */
-       protected static $instance = null;
-
-       /**
-        * @param array $params
-        */
-       public function __construct( array $params ) {
-       }
-
-       /**
-        * @throws MWException
-        * @return JobQueueAggregator
-        */
-       final public static function singleton() {
-               global $wgJobQueueAggregator;
-
-               if ( !isset( self::$instance ) ) {
-                       $class = $wgJobQueueAggregator['class'];
-                       $obj = new $class( $wgJobQueueAggregator );
-                       if ( !( $obj instanceof JobQueueAggregator ) ) {
-                               throw new MWException( "Class '$class' is not a JobQueueAggregator class." );
-                       }
-                       self::$instance = $obj;
-               }
-
-               return self::$instance;
-       }
-
-       /**
-        * Destroy the singleton instance
-        *
-        * @return void
-        */
-       final public static function destroySingleton() {
-               self::$instance = null;
-       }
-
-       /**
-        * Mark a queue as being empty
-        *
-        * @param string $wiki
-        * @param string $type
-        * @return bool Success
-        */
-       final public function notifyQueueEmpty( $wiki, $type ) {
-               $ok = $this->doNotifyQueueEmpty( $wiki, $type );
-
-               return $ok;
-       }
-
-       /**
-        * @see JobQueueAggregator::notifyQueueEmpty()
-        * @param string $wiki
-        * @param string $type
-        * @return bool
-        */
-       abstract protected function doNotifyQueueEmpty( $wiki, $type );
-
-       /**
-        * Mark a queue as being non-empty
-        *
-        * @param string $wiki
-        * @param string $type
-        * @return bool Success
-        */
-       final public function notifyQueueNonEmpty( $wiki, $type ) {
-               $ok = $this->doNotifyQueueNonEmpty( $wiki, $type );
-
-               return $ok;
-       }
-
-       /**
-        * @see JobQueueAggregator::notifyQueueNonEmpty()
-        * @param string $wiki
-        * @param string $type
-        * @return bool
-        */
-       abstract protected function doNotifyQueueNonEmpty( $wiki, $type );
-
-       /**
-        * Get the list of all of the queues with jobs
-        *
-        * @return array (job type => (list of wiki IDs))
-        */
-       final public function getAllReadyWikiQueues() {
-               $res = $this->doGetAllReadyWikiQueues();
-
-               return $res;
-       }
-
-       /**
-        * @see JobQueueAggregator::getAllReadyWikiQueues()
-        */
-       abstract protected function doGetAllReadyWikiQueues();
-
-       /**
-        * Purge all of the aggregator information
-        *
-        * @return bool Success
-        */
-       final public function purge() {
-               $res = $this->doPurge();
-
-               return $res;
-       }
-
-       /**
-        * @see JobQueueAggregator::purge()
-        */
-       abstract protected function doPurge();
-
-       /**
-        * Get all databases that have a pending job.
-        * This poll all the queues and is this expensive.
-        *
-        * @return array (job type => (list of wiki IDs))
-        */
-       protected function findPendingWikiQueues() {
-               global $wgLocalDatabases;
-
-               $pendingDBs = []; // (job type => (db list))
-               foreach ( $wgLocalDatabases as $wikiId ) {
-                       foreach ( JobQueueGroup::singleton( $wikiId )->getQueuesWithJobs() as $type ) {
-                               $pendingDBs[$type][] = $wikiId;
-                       }
-               }
-
-               return $pendingDBs;
-       }
-}
diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorNull.php b/includes/jobqueue/aggregator/JobQueueAggregatorNull.php
deleted file mode 100644 (file)
index c44d70e..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Job queue aggregator code.
- *
- * 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
- */
-
-/**
- * @ingroup JobQueue
- */
-class JobQueueAggregatorNull extends JobQueueAggregator {
-       protected function doNotifyQueueEmpty( $wiki, $type ) {
-               return true;
-       }
-
-       protected function doNotifyQueueNonEmpty( $wiki, $type ) {
-               return true;
-       }
-
-       protected function doGetAllReadyWikiQueues() {
-               return [];
-       }
-
-       protected function doPurge() {
-               return true;
-       }
-}
diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
deleted file mode 100644 (file)
index 7d0e1e6..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Job queue aggregator code that uses PhpRedis.
- *
- * 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
- */
-use Psr\Log\LoggerInterface;
-
-/**
- * Class to handle tracking information about all queues using PhpRedis
- *
- * The mediawiki/services/jobrunner background service must be set up and running.
- *
- * @ingroup JobQueue
- * @ingroup Redis
- * @since 1.21
- */
-class JobQueueAggregatorRedis extends JobQueueAggregator {
-       /** @var RedisConnectionPool */
-       protected $redisPool;
-       /** @var LoggerInterface */
-       protected $logger;
-       /** @var array List of Redis server addresses */
-       protected $servers;
-
-       /**
-        * @param array $params Possible keys:
-        *   - redisConfig  : An array of parameters to RedisConnectionPool::__construct().
-        *   - redisServers : Array of server entries, the first being the primary and the
-        *                    others being fallback servers. Each entry is either a hostname/port
-        *                    combination or the absolute path of a UNIX socket.
-        *                    If a hostname is specified but no port, the standard port number
-        *                    6379 will be used. Required.
-        */
-       public function __construct( array $params ) {
-               parent::__construct( $params );
-               $this->servers = $params['redisServers'] ?? [ $params['redisServer'] ]; // b/c
-               $params['redisConfig']['serializer'] = 'none';
-               $this->redisPool = RedisConnectionPool::singleton( $params['redisConfig'] );
-               $this->logger = \MediaWiki\Logger\LoggerFactory::getInstance( 'redis' );
-       }
-
-       protected function doNotifyQueueEmpty( $wiki, $type ) {
-               return true; // managed by the service
-       }
-
-       protected function doNotifyQueueNonEmpty( $wiki, $type ) {
-               return true; // managed by the service
-       }
-
-       protected function doGetAllReadyWikiQueues() {
-               $conn = $this->getConnection();
-               if ( !$conn ) {
-                       return [];
-               }
-               try {
-                       $map = $conn->hGetAll( $this->getReadyQueueKey() );
-
-                       if ( is_array( $map ) && isset( $map['_epoch'] ) ) {
-                               unset( $map['_epoch'] ); // ignore
-                               $pendingDBs = []; // (type => list of wikis)
-                               foreach ( $map as $key => $time ) {
-                                       list( $type, $wiki ) = $this->decodeQueueName( $key );
-                                       $pendingDBs[$type][] = $wiki;
-                               }
-                       } else {
-                               throw new UnexpectedValueException(
-                                       "No queue listing found; make sure redisJobChronService is running."
-                               );
-                       }
-
-                       return $pendingDBs;
-               } catch ( RedisException $e ) {
-                       $this->redisPool->handleError( $conn, $e );
-
-                       return [];
-               }
-       }
-
-       protected function doPurge() {
-               return true; // fully and only refreshed by the service
-       }
-
-       /**
-        * Get a connection to the server that handles all sub-queues for this queue
-        *
-        * @return RedisConnRef|bool Returns false on failure
-        * @throws MWException
-        */
-       protected function getConnection() {
-               $conn = false;
-               foreach ( $this->servers as $server ) {
-                       $conn = $this->redisPool->getConnection( $server, $this->logger );
-                       if ( $conn ) {
-                               break;
-                       }
-               }
-
-               return $conn;
-       }
-
-       /**
-        * @return string
-        */
-       private function getReadyQueueKey() {
-               return "jobqueue:aggregator:h-ready-queues:v2"; // global
-       }
-
-       /**
-        * @param string $name
-        * @return string[]
-        */
-       private function decodeQueueName( $name ) {
-               list( $type, $wiki ) = explode( '/', $name, 2 );
-
-               return [ rawurldecode( $type ), rawurldecode( $wiki ) ];
-       }
-}
index 1f37a35..b9bb70c 100644 (file)
@@ -817,6 +817,11 @@ class LogFormatter {
                foreach ( $this->getParametersForApi() as $key => $value ) {
                        $vals = explode( ':', $key, 3 );
                        if ( count( $vals ) !== 3 ) {
+                               if ( $value instanceof __PHP_Incomplete_Class ) {
+                                       wfLogWarning( 'Log entry of type ' . $this->entry->getFullType() .
+                                               ' contains unrecoverable extra parameters.' );
+                                       continue;
+                               }
                                $logParams[$key] = $value;
                                continue;
                        }
index 9ed67f9..f72ac1a 100644 (file)
@@ -3556,12 +3556,8 @@ class Language {
         * @return string
         */
        private function truncateInternal(
-               $string, $length, $ellipsis, $adjustLength, $measureLength, $getSubstring
+               $string, $length, $ellipsis, $adjustLength, callable $measureLength, callable $getSubstring
        ) {
-               if ( !is_callable( $measureLength ) || !is_callable( $getSubstring ) ) {
-                       throw new InvalidArgumentException( 'Invalid callback provided' );
-               }
-
                # Check if there is no need to truncate
                if ( $measureLength( $string ) <= abs( $length ) ) {
                        return $string; // no need to truncate
index f5b3666..aff6758 100644 (file)
@@ -504,7 +504,7 @@ class MigrateActors extends LoggedUpdateMaintenance {
                                        'ORDER BY' => $primaryKey,
                                        'LIMIT' => $this->mBatchSize,
                                ],
-                               [ 'actor' => [ 'LEFT JOIN', 'ls_value = ' . $dbw->buildStringCast( 'actor_user' ) ] ]
+                               [ 'actor' => [ 'LEFT JOIN', 'actor_user = ' . $dbw->buildIntegerCast( 'ls_value' ) ] ]
                        );
                        if ( !$res->numRows() ) {
                                break;
index 1d0e335..6988576 100644 (file)
 ( function () {
-       var ProtectionForm,
-               config = require( './config.json' ),
+       var config = require( './config.json' ),
                reasonCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
                reasonByteLimit = mw.config.get( 'wgCommentByteLimit' );
 
-       ProtectionForm = window.ProtectionForm = {
-               /**
-                * Set up the protection chaining interface (i.e. "unlock move permissions" checkbox)
-                * on the protection form
-                *
-                * @return {boolean}
-                */
-               init: function () {
-                       var $cell = $( '<td>' ),
-                               $row = $( '<tr>' ).append( $cell );
-
-                       if ( !$( '#mwProtectSet' ).length ) {
+       /**
+        * Get a list of all protection selectors on the page
+        *
+        * @return {jQuery}
+        */
+       function getLevelSelectors() {
+               return $( 'select[id ^= mwProtect-level-]' );
+       }
+
+       /**
+        * Get a list of all expiry inputs on the page
+        *
+        * @return {jQuery}
+        */
+       function getExpiryInputs() {
+               return $( 'input[id ^= mwProtect-][id $= -expires]' );
+       }
+
+       /**
+        * Get a list of all expiry selector lists on the page
+        *
+        * @return {jQuery}
+        */
+       function getExpirySelectors() {
+               return $( 'select[id ^= mwProtectExpirySelection-]' );
+       }
+
+       /**
+        * Enable/disable protection selectors and expiry inputs
+        *
+        * @param {boolean} val Enable?
+        */
+       function toggleUnchainedInputs( val ) {
+               var setDisabled = function () {
+                       this.disabled = !val;
+               };
+               getLevelSelectors().slice( 1 ).each( setDisabled );
+               getExpiryInputs().slice( 1 ).each( setDisabled );
+               getExpirySelectors().slice( 1 ).each( setDisabled );
+       }
+
+       /**
+        * Checks if a certain protection level is cascadeable.
+        *
+        * @param {string} level
+        * @return {boolean}
+        */
+       function isCascadeableLevel( level ) {
+               return config.CascadingRestrictionLevels.indexOf( level ) !== -1;
+       }
+
+       /**
+        * Sets the disabled attribute on the cascade checkbox depending on the current selected levels
+        */
+       function updateCascadeCheckbox() {
+               getLevelSelectors().each( function () {
+                       if ( !isCascadeableLevel( $( this ).val() ) ) {
+                               $( '#mwProtect-cascade' ).prop( { checked: false, disabled: true } );
                                return false;
+                       } else {
+                               $( '#mwProtect-cascade' ).prop( 'disabled', false );
                        }
+               } );
+       }
+
+       /**
+        * Returns true if the named attribute in all objects in the given array are matching
+        *
+        * @param {Object[]} objects
+        * @param {string} attrName
+        * @return {boolean}
+        */
+       function matchAttribute( objects, attrName ) {
+               // eslint-disable-next-line no-jquery/no-map-util
+               return $.map( objects, function ( object ) {
+                       return object[ attrName ];
+               } ).filter( function ( item, index, a ) {
+                       return index === a.indexOf( item );
+               } ).length === 1;
+       }
+
+       /**
+        * Are all actions protected at the same level, with the same expiry time?
+        *
+        * @return {boolean}
+        */
+       function areAllTypesMatching() {
+               return matchAttribute( getLevelSelectors(), 'selectedIndex' ) &&
+                       matchAttribute( getExpirySelectors(), 'selectedIndex' ) &&
+                       matchAttribute( getExpiryInputs(), 'value' );
+       }
+
+       /**
+        * Is protection chaining off?
+        *
+        * @return {boolean}
+        */
+       function isUnchained() {
+               var element = document.getElementById( 'mwProtectUnchained' );
+               return element ?
+                       element.checked :
+                       true; // No control, so we need to let the user set both levels
+       }
+
+       /**
+        * Find the highest protection level in any selector
+        *
+        * @return {number}
+        */
+       function getMaxLevel() {
+               return Math.max.apply( Math, getLevelSelectors().map( function () {
+                       return this.selectedIndex;
+               } ) );
+       }
+
+       /**
+        * Protect all actions at the specified level
+        *
+        * @param {number} index Protection level
+        */
+       function setAllSelectors( index ) {
+               getLevelSelectors().prop( 'selectedIndex', index );
+       }
+
+       /**
+        * When protection levels are locked together, update the rest
+        * when one action's level changes
+        *
+        * @param {Event} event Level selector that changed
+        */
+       function updateLevels( event ) {
+               if ( !isUnchained() ) {
+                       setAllSelectors( event.target.selectedIndex );
+               }
+               updateCascadeCheckbox();
+       }
+
+       /**
+        * When protection levels are locked together, update the
+        * expiries when one changes
+        *
+        * @param {Event} event Expiry input that changed
+        */
+       function updateExpiry( event ) {
+               if ( !isUnchained() ) {
+                       getExpiryInputs().val( event.target.value );
+               }
+               if ( isUnchained() ) {
+                       $( '#' + event.target.id.replace( /^mwProtect-(\w+)-expires$/, 'mwProtectExpirySelection-$1' ) ).val( 'othertime' );
+               } else {
+                       getExpirySelectors().val( 'othertime' );
+               }
+       }
+
+       /**
+        * When protection levels are locked together, update the
+        * expiry lists when one changes and clear the custom inputs
+        *
+        * @param {Event} event Expiry selector that changed
+        */
+       function updateExpiryList( event ) {
+               if ( !isUnchained() ) {
+                       getExpirySelectors().val( event.target.value );
+                       getExpiryInputs().val( '' );
+               }
+       }
+
+       /**
+        * Update chain status and enable/disable various bits of the UI
+        * when the user changes the "unlock move permissions" checkbox
+        */
+       function onChainClick() {
+               toggleUnchainedInputs( isUnchained() );
+               if ( !isUnchained() ) {
+                       setAllSelectors( getMaxLevel() );
+               }
+               updateCascadeCheckbox();
+       }
+
+       /**
+        * Set up the protection chaining interface (i.e. "unlock move permissions" checkbox)
+        * on the protection form
+        */
+       function init() {
+               var $cell = $( '<td>' ),
+                       $row = $( '<tr>' ).append( $cell );
+
+               if ( !$( '#mwProtectSet' ).length ) {
+                       return;
+               }
 
-                       $( 'form#mw-Protect-Form' ).on( 'submit', this.toggleUnchainedInputs.bind( ProtectionForm, true ) );
-                       this.getExpirySelectors().each( function () {
-                               $( this ).on( 'change', ProtectionForm.updateExpiryList.bind( ProtectionForm, this ) );
-                       } );
-                       this.getExpiryInputs().each( function () {
-                               $( this ).on( 'keyup change', ProtectionForm.updateExpiry.bind( ProtectionForm, this ) );
-                       } );
-                       this.getLevelSelectors().each( function () {
-                               $( this ).on( 'change', ProtectionForm.updateLevels.bind( ProtectionForm, this ) );
-                       } );
-
-                       $( '#mwProtectSet > tbody > tr:first' ).after( $row );
-
-                       // If there is only one protection type, there is nothing to chain
-                       if ( $( '[id ^= mw-protect-table-]' ).length > 1 ) {
-                               $cell.append(
-                                       $( '<input>' )
-                                               .attr( { id: 'mwProtectUnchained', type: 'checkbox' } )
-                                               .on( 'click', this.onChainClick.bind( this ) )
-                                               .prop( 'checked', !this.areAllTypesMatching() ),
-                                       document.createTextNode( ' ' ),
-                                       $( '<label>' )
-                                               .attr( 'for', 'mwProtectUnchained' )
-                                               .text( mw.msg( 'protect-unchain-permissions' ) )
-                               );
-
-                               this.toggleUnchainedInputs( !this.areAllTypesMatching() );
-                       }
-
-                       // Arbitrary 75 to leave some space for the autogenerated null edit's summary
-                       if ( reasonCodePointLimit ) {
-                               $( '#mwProtect-reason' ).codePointLimit( reasonCodePointLimit - 75 );
-                       } else if ( reasonByteLimit ) {
-                               $( '#mwProtect-reason' ).byteLimit( reasonByteLimit - 75 );
-                       }
+               $( 'form#mw-Protect-Form' ).on( 'submit', toggleUnchainedInputs.bind( this, true ) );
+               getExpirySelectors().on( 'change', updateExpiryList );
+               getExpiryInputs().on( 'input change', updateExpiry );
+               getLevelSelectors().on( 'change', updateLevels );
+
+               $( '#mwProtectSet > tbody > tr:first' ).after( $row );
+
+               // If there is only one protection type, there is nothing to chain
+               if ( $( '[id ^= mw-protect-table-]' ).length > 1 ) {
+                       $cell.append(
+                               $( '<input>' )
+                                       .attr( { id: 'mwProtectUnchained', type: 'checkbox' } )
+                                       .on( 'click', onChainClick )
+                                       .prop( 'checked', !areAllTypesMatching() ),
+                               document.createTextNode( ' ' ),
+                               $( '<label>' )
+                                       .attr( 'for', 'mwProtectUnchained' )
+                                       .text( mw.msg( 'protect-unchain-permissions' ) )
+                       );
+
+                       toggleUnchainedInputs( !areAllTypesMatching() );
+               }
 
-                       this.updateCascadeCheckbox();
-                       return true;
-               },
-
-               /**
-                * Sets the disabled attribute on the cascade checkbox depending on the current selected levels
-                */
-               updateCascadeCheckbox: function () {
-                       this.getLevelSelectors().each( function () {
-                               if ( !ProtectionForm.isCascadeableLevel( $( this ).val() ) ) {
-                                       $( '#mwProtect-cascade' ).prop( { checked: false, disabled: true } );
-                                       return false;
-                               } else {
-                                       $( '#mwProtect-cascade' ).prop( 'disabled', false );
-                               }
-                       } );
-               },
-
-               /**
-                * Checks if a certain protection level is cascadeable.
-                *
-                * @param {string} level
-                * @return {boolean}
-                */
-               isCascadeableLevel: function ( level ) {
-                       return config.CascadingRestrictionLevels.indexOf( level ) !== -1;
-               },
-
-               /**
-                * When protection levels are locked together, update the rest
-                * when one action's level changes
-                *
-                * @param {Element} source Level selector that changed
-                */
-               updateLevels: function ( source ) {
-                       if ( !this.isUnchained() ) {
-                               this.setAllSelectors( source.selectedIndex );
-                       }
-                       this.updateCascadeCheckbox();
-               },
-
-               /**
-                * When protection levels are locked together, update the
-                * expiries when one changes
-                *
-                * @param {Element} source expiry input that changed
-                */
-
-               updateExpiry: function ( source ) {
-                       if ( !this.isUnchained() ) {
-                               this.getExpiryInputs().each( function () {
-                                       this.value = source.value;
-                               } );
-                       }
-                       if ( this.isUnchained() ) {
-                               $( '#' + source.id.replace( /^mwProtect-(\w+)-expires$/, 'mwProtectExpirySelection-$1' ) ).val( 'othertime' );
-                       } else {
-                               this.getExpirySelectors().each( function () {
-                                       this.value = 'othertime';
-                               } );
-                       }
-               },
-
-               /**
-                * When protection levels are locked together, update the
-                * expiry lists when one changes and clear the custom inputs
-                *
-                * @param {Element} source Expiry selector that changed
-                */
-               updateExpiryList: function ( source ) {
-                       if ( !this.isUnchained() ) {
-                               this.getExpirySelectors().each( function () {
-                                       this.value = source.value;
-                               } );
-                               this.getExpiryInputs().each( function () {
-                                       this.value = '';
-                               } );
-                       }
-               },
-
-               /**
-                * Update chain status and enable/disable various bits of the UI
-                * when the user changes the "unlock move permissions" checkbox
-                */
-               onChainClick: function () {
-                       this.toggleUnchainedInputs( this.isUnchained() );
-                       if ( !this.isUnchained() ) {
-                               this.setAllSelectors( this.getMaxLevel() );
-                       }
-                       this.updateCascadeCheckbox();
-               },
-
-               /**
-                * Returns true if the named attribute in all objects in the given array are matching
-                *
-                * @param {Object[]} objects
-                * @param {string} attrName
-                * @return {boolean}
-                */
-               matchAttribute: function ( objects, attrName ) {
-                       // eslint-disable-next-line no-jquery/no-map-util
-                       return $.map( objects, function ( object ) {
-                               return object[ attrName ];
-                       } ).filter( function ( item, index, a ) {
-                               return index === a.indexOf( item );
-                       } ).length === 1;
-               },
-
-               /**
-                * Are all actions protected at the same level, with the same expiry time?
-                *
-                * @return {boolean}
-                */
-               areAllTypesMatching: function () {
-                       return this.matchAttribute( this.getLevelSelectors(), 'selectedIndex' ) &&
-                               this.matchAttribute( this.getExpirySelectors(), 'selectedIndex' ) &&
-                               this.matchAttribute( this.getExpiryInputs(), 'value' );
-               },
-
-               /**
-                * Is protection chaining off?
-                *
-                * @return {boolean}
-                */
-               isUnchained: function () {
-                       var element = document.getElementById( 'mwProtectUnchained' );
-                       return element ?
-                               element.checked :
-                               true; // No control, so we need to let the user set both levels
-               },
-
-               /**
-                * Find the highest protection level in any selector
-                *
-                * @return {number}
-                */
-               getMaxLevel: function () {
-                       return Math.max.apply( Math, this.getLevelSelectors().map( function () {
-                               return this.selectedIndex;
-                       } ) );
-               },
-
-               /**
-                * Protect all actions at the specified level
-                *
-                * @param {number} index Protection level
-                */
-               setAllSelectors: function ( index ) {
-                       this.getLevelSelectors().each( function () {
-                               this.selectedIndex = index;
-                       } );
-               },
-
-               /**
-                * Get a list of all protection selectors on the page
-                *
-                * @return {jQuery}
-                */
-               getLevelSelectors: function () {
-                       return $( 'select[id ^= mwProtect-level-]' );
-               },
-
-               /**
-                * Get a list of all expiry inputs on the page
-                *
-                * @return {jQuery}
-                */
-               getExpiryInputs: function () {
-                       return $( 'input[id ^= mwProtect-][id $= -expires]' );
-               },
-
-               /**
-                * Get a list of all expiry selector lists on the page
-                *
-                * @return {jQuery}
-                */
-               getExpirySelectors: function () {
-                       return $( 'select[id ^= mwProtectExpirySelection-]' );
-               },
-
-               /**
-                * Enable/disable protection selectors and expiry inputs
-                *
-                * @param {boolean} val Enable?
-                */
-               toggleUnchainedInputs: function ( val ) {
-                       var setDisabled = function () {
-                               this.disabled = !val;
-                       };
-                       this.getLevelSelectors().slice( 1 ).each( setDisabled );
-                       this.getExpiryInputs().slice( 1 ).each( setDisabled );
-                       this.getExpirySelectors().slice( 1 ).each( setDisabled );
+               // Arbitrary 75 to leave some space for the autogenerated null edit's summary
+               if ( reasonCodePointLimit ) {
+                       $( '#mwProtect-reason' ).codePointLimit( reasonCodePointLimit - 75 );
+               } else if ( reasonByteLimit ) {
+                       $( '#mwProtect-reason' ).byteLimit( reasonByteLimit - 75 );
                }
-       };
 
-       $( ProtectionForm.init.bind( ProtectionForm ) );
+               updateCascadeCheckbox();
+       }
+
+       $( init );
 
 }() );
index 08612d0..92b4b8a 100644 (file)
@@ -74,7 +74,7 @@
                        background-origin: border-box;
                        background-position: center center;
                        background-repeat: no-repeat;
-                       .background-size( 0, 0 );
+                       background-size: 0 0;
                        .box-sizing( border-box );
                        position: absolute;
                        // Ensure alignment of checkbox to middle of the text in long labels, see T85241
@@ -90,7 +90,7 @@
                // Apply a checkmark on the pseudo `:before` element when the input is checked
                &:checked + label:before {
                        .background-image-svg( 'images/checkbox-checked.svg', 'images/checkbox-checked.png' );
-                       .background-size( 90%, 90% );
+                       background-size: 90% 90%;
                }
 
                &:enabled {