From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 22 Dec 2017 11:33:27 +0000 (+0000)
Subject: Merge "[WikiImporter::notice] use wfDebug instead of echo in notice()"
X-Git-Tag: 1.31.0-rc.0~1129
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=315e3d6d589bb3df47aa70017620f7308309fec4;hp=6db33c1a4b81e46c56457e3a433de12e11eeb3b0;p=lhc%2Fweb%2Fwiklou.git

Merge "[WikiImporter::notice] use wfDebug instead of echo in notice()"
---

diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index 36b45a1f54..562819ec4e 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -1374,8 +1374,8 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 * This works the same as getWithSetCallback() except:
 	 *   - a) The $keys argument expects the result of WANObjectCache::makeMultiKeys()
 	 *   - b) The $callback argument expects a callback returning a map of (ID => new value)
-	 *        for all entity IDs in $regenById and it takes the following arguments:
-	 *          - $ids: a list of entity IDs to regenerate
+	 *        for all entity IDs in $ids and it takes the following arguments:
+	 *          - $ids: a list of entity IDs that require cache regeneration
 	 *          - &$ttls: a reference to the (entity ID => new TTL) map
 	 *          - &$setOpts: a reference to options for set() which can be altered
 	 *   - c) The return value is a map of (cache key => value) in the order of $keyedIds
diff --git a/resources/src/jquery/jquery.tablesorter.less b/resources/src/jquery/jquery.tablesorter.less
index 11f472ec01..ce24b0de65 100644
--- a/resources/src/jquery/jquery.tablesorter.less
+++ b/resources/src/jquery/jquery.tablesorter.less
@@ -2,18 +2,20 @@
 
 /* Table Sorting */
 
-table.jquery-tablesorter th.headerSort {
-	.background-image-svg( 'images/sort_both.svg', 'images/sort_both.png' );
-	cursor: pointer;
-	background-repeat: no-repeat;
-	background-position: center right;
-	padding-right: 21px;
-}
+table.jquery-tablesorter {
+	th.headerSort {
+		.background-image-svg( 'images/sort_both.svg', 'images/sort_both.png' );
+		cursor: pointer;
+		background-repeat: no-repeat;
+		background-position: center right;
+		padding-right: 21px;
+	}
 
-table.jquery-tablesorter th.headerSortUp {
-	.background-image-svg( 'images/sort_up.svg', 'images/sort_up.png' );
-}
+	th.headerSortUp {
+		.background-image-svg( 'images/sort_up.svg', 'images/sort_up.png' );
+	}
 
-table.jquery-tablesorter th.headerSortDown {
-	.background-image-svg( 'images/sort_down.svg', 'images/sort_down.png' );
+	th.headerSortDown {
+		.background-image-svg( 'images/sort_down.svg', 'images/sort_down.png' );
+	}
 }
diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php
index 01762b92ef..566dc9285a 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -57,7 +57,7 @@ class RevisionTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideConstructFromArray
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromArray( $rowArray ) {
 		$rev = new Revision( $rowArray, 0, $this->getMockTitle() );
@@ -68,7 +68,7 @@ class RevisionTest extends MediaWikiTestCase {
 
 	/**
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromEmptyArray() {
 		$rev = new Revision( [], 0, $this->getMockTitle() );
@@ -106,7 +106,7 @@ class RevisionTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideConstructFromArray_userSetAsExpected
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 *
 	 * @param array $rowArray
 	 * @param mixed $expectedUserId null to expect the current wgUser ID
@@ -166,7 +166,7 @@ class RevisionTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideConstructFromArrayThrowsExceptions
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromArrayThrowsExceptions( $rowArray, Exception $expectedException ) {
 		$this->setExpectedException(
@@ -179,7 +179,7 @@ class RevisionTest extends MediaWikiTestCase {
 
 	/**
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromNothing() {
 		$this->setExpectedException(
@@ -265,7 +265,7 @@ class RevisionTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideConstructFromRow
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromRow( array $arrayData, $assertions ) {
 		$data = 'Hello goat.'; // needs to match model and format