Merge "Hygiene: Use “OOUI” as unified name in build and code documentation"

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index f4e81b9..5314925 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -50,7 +50,7 @@ production.
 ==== Upgraded external libraries ====
 * Updated jquery.chosen from v0.9.14 to v1.8.2.
 * Updated composer/spdx-licenses from 1.1.4 to
-  1.2.0 (development dependency).
+  1.3.0 (development dependency).
 * Updated nikic/php-parser from 2.1.0 to 3.1.3
   (development dependency).
 * Updated wikimedia/ip-set from 1.1.0 to 1.2.0.

diff --git a/composer.json b/composer.json
index 4596c4c..1730942 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
                "zordius/lightncandy": "0.23"
        },
        "require-dev": {
-               "composer/spdx-licenses": "1.2.0",
+               "composer/spdx-licenses": "1.3.0",
                "hamcrest/hamcrest-php": "^2.0",
                "jakub-onderka/php-parallel-lint": "0.9.2",
                "jetbrains/phpstorm-stubs": "dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 7e05be6..e76bffc 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -650,6 +650,12 @@ class DifferenceEngine extends ContextSource {
                }
        }
 
+       /**
+        * @param WikiPage $page
+        * @param Revision $rev
+        *
+        * @return ParserOutput|bool False if the revision was not found
+        */
        protected function getParserOutput( WikiPage $page, Revision $rev ) {
                $parserOptions = $page->makeParserOptions( $this->getContext() );
 

diff --git a/includes/http/MWHttpRequest.php b/includes/http/MWHttpRequest.php
index fff72ec..ac16032 100644 (file)
--- a/includes/http/MWHttpRequest.php
+++ b/includes/http/MWHttpRequest.php
@@ -181,7 +181,7 @@ abstract class MWHttpRequest implements LoggerAwareInterface {
         * @return MWHttpRequest
         * @see MWHttpRequest::__construct
         */
-       public static function factory( $url, $options = null, $caller = __METHOD__ ) {
+       public static function factory( $url, array $options = [], $caller = __METHOD__ ) {
                return \MediaWiki\MediaWikiServices::getInstance()
                        ->getHttpRequestFactory()
                        ->create( $url, $options, $caller );

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index db439e3..413d45b 100644 (file)
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -132,6 +132,11 @@
                display: none;
        }
 
+       #jump-to-nav {
+               margin-top: -0.5em;
+               margin-bottom: 0.5em;
+       }
+
        // Make the watchlist-details message display while loading, but make it not take up any
        // space. This makes the min-height trick work better.
        .watchlistDetails {

diff --git a/tests/integration/includes/http/MWHttpRequestTestCase.php b/tests/integration/includes/http/MWHttpRequestTestCase.php
index 3b02e28..cc769d7 100644 (file)
--- a/tests/integration/includes/http/MWHttpRequestTestCase.php
+++ b/tests/integration/includes/http/MWHttpRequestTestCase.php
@@ -195,6 +195,11 @@ abstract class MWHttpRequestTestCase extends PHPUnit_Framework_TestCase {
                $this->assertSame( 401, $request->getStatus() );
        }
 
+       public function testFactoryDefaults() {
+               $request = MWHttpRequest::factory( 'http://acme.test' );
+               $this->assertInstanceOf( MWHttpRequest::class, $request );
+       }
+
        // --------------------
 
        /**
@@ -242,4 +247,5 @@ abstract class MWHttpRequestTestCase extends PHPUnit_Framework_TestCase {
                $this->assertArrayNotHasKey( strtolower( $name ),
                        array_change_key_case( $cookieJar->cookie, CASE_LOWER ) );
        }
+
 }