Merge "resourceloader: Simplify StringSet fallback"

[lhc/web/wiklou.git] / includes / gallery / PackedImageGallery.php

diff --git a/includes/gallery/PackedImageGallery.php b/includes/gallery/PackedImageGallery.php
index b004a95..7aa8c78 100644 (file)
--- a/includes/gallery/PackedImageGallery.php
+++ b/includes/gallery/PackedImageGallery.php
@@ -21,14 +21,14 @@
  */
 
 class PackedImageGallery extends TraditionalImageGallery {
-       function __construct( $mode = 'traditional' ) {
-               parent::__construct( $mode );
+       function __construct( $mode = 'traditional', IContextSource $context = null ) {
+               parent::__construct( $mode, $context );
                // Does not support per row option.
                $this->mPerRow = 0;
        }
 
        /**
-        * We artificially have 1.5 the resolution neccessary so that
+        * We artificially have 1.5 the resolution necessary so that
         * we can scale it up by that much on the client side, without
         * worrying about requesting a new image.
         */
@@ -60,10 +60,10 @@ class PackedImageGallery extends TraditionalImageGallery {
                }
 
                // self::SCALE_FACTOR so the js has some room to manipulate sizes.
-               return array(
+               return [
                        'width' => $width * self::SCALE_FACTOR,
                        'height' => $this->mHeights * self::SCALE_FACTOR,
-               );
+               ];
        }
 
        protected function getThumbDivWidth( $thumbWidth ) {
@@ -95,16 +95,17 @@ class PackedImageGallery extends TraditionalImageGallery {
        /**
         * Add javascript which auto-justifies the rows by manipulating the image sizes.
         * Also ensures that the hover version of this degrades gracefully.
+        * @return array
         */
        protected function getModules() {
-               return array( 'mediawiki.page.gallery' );
+               return [ 'mediawiki.page.gallery' ];
        }
 
        /**
         * Do not support per-row on packed. It really doesn't work
         * since the images have varying widths.
+        * @param int $num
         */
        public function setPerRow( $num ) {
-               return;
        }
 }