Merge "clientpool: Fix non-canonical order of elements (PHPDocs)"

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index d6b8057..fdf4f85 100644 (file)
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -511,7 +511,7 @@ class HistoryPager extends ReverseChronologicalPager {
                        if ( $row->rev_parent_id ) {
                                $revIds[] = $row->rev_parent_id;
                        }
-                       if ( !is_null( $row->user_name ) ) {
+                       if ( $row->user_name !== null ) {
                                $batch->add( NS_USER, $row->user_name );
                                $batch->add( NS_USER_TALK, $row->user_name );
                        } else { # for anons or usernames of imported revisions

diff --git a/includes/block/BlockRestriction.php b/includes/block/BlockRestriction.php
index 5fe9650..3baa063 100644 (file)
--- a/includes/block/BlockRestriction.php
+++ b/includes/block/BlockRestriction.php
@@ -38,7 +38,7 @@ class BlockRestriction {
         * @return Restriction[]
         */
        public static function loadByBlockId( $blockId, IDatabase $db = null ) {
-               if ( is_null( $blockId ) || $blockId === [] ) {
+               if ( $blockId === null || $blockId === [] ) {
                        return [];
                }
 

diff --git a/includes/collation/NumericUppercaseCollation.php b/includes/collation/NumericUppercaseCollation.php
index d249640..3f98003 100644 (file)
--- a/includes/collation/NumericUppercaseCollation.php
+++ b/includes/collation/NumericUppercaseCollation.php
@@ -35,7 +35,7 @@
 class NumericUppercaseCollation extends UppercaseCollation {
 
        /**
-        * @var $digitTransformLang Language How to convert digits (usually the content language)
+        * @var Language $digitTransformLang How to convert digits (usually the content language)
         */
        private $digitTransformLang;
 

diff --git a/includes/media/SVGMetadataExtractor.php b/includes/media/SVGMetadataExtractor.php
index ca398ff..f8b0c3c 100644 (file)
--- a/includes/media/SVGMetadataExtractor.php
+++ b/includes/media/SVGMetadataExtractor.php
@@ -74,7 +74,7 @@ class SVGReader {
 
                if ( $size > $wgSVGMetadataCutoff ) {
                        $this->debug( "SVG is $size bytes, which is bigger than $wgSVGMetadataCutoff. Truncating." );
-                       $contents = file_get_contents( $source, false, null, -1, $wgSVGMetadataCutoff );
+                       $contents = file_get_contents( $source, false, null, 0, $wgSVGMetadataCutoff );
                        if ( $contents === false ) {
                                throw new MWException( 'Error reading SVG file.' );
                        }