Merge "Convert onTransactionIdle() callers to DeferredUpdate subclasses"

diff --git a/composer.json b/composer.json
index 54eb3c0..1bd3d4c 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
        },
        "require-dev": {
                "jakub-onderka/php-parallel-lint": "0.9.2",
-               "justinrainbow/json-schema": "~1.3",
+               "justinrainbow/json-schema": "~1.6",
                "mediawiki/mediawiki-codesniffer": "0.7.2",
                "monolog/monolog": "~1.18.2",
                "nikic/php-parser": "1.4.1",

diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php
index 6b0f887..0ebfab7 100644 (file)
--- a/includes/media/MediaHandler.php
+++ b/includes/media/MediaHandler.php
@@ -43,7 +43,7 @@ abstract class MediaHandler {
         * Get a MediaHandler for a given MIME type from the instance cache
         *
         * @param string $type
-        * @return MediaHandler
+        * @return MediaHandler|bool
         */
        static function getHandler( $type ) {
                global $wgMediaHandlers;