Merge "Fix sessionfailure i18n message during authentication"

[lhc/web/wiklou.git] / tests / phpunit / includes / media / BitmapScalingTest.php

diff --git a/tests/phpunit/includes/media/BitmapScalingTest.php b/tests/phpunit/includes/media/BitmapScalingTest.php
index e4415ec..fb96f7d 100644 (file)
--- a/tests/phpunit/includes/media/BitmapScalingTest.php
+++ b/tests/phpunit/includes/media/BitmapScalingTest.php
@@ -8,10 +8,10 @@ class BitmapScalingTest extends MediaWikiTestCase {
        protected function setUp() {
                parent::setUp();
 
-               $this->setMwGlobals( array(
+               $this->setMwGlobals( [
                        'wgMaxImageArea' => 1.25e7, // 3500x3500
                        'wgCustomConvertCommand' => 'dummy', // Set so that we don't get client side rendering
-               ) );
+               ] );
        }
 
        /**
@@ -27,93 +27,104 @@ class BitmapScalingTest extends MediaWikiTestCase {
        }
 
        public static function provideNormaliseParams() {
-               return array(
+               return [
                        /* Regular resize operations */
-                       array(
-                               array( 1024, 768 ),
-                               array(
+                       [
+                               [ 1024, 768 ],
+                               [
                                        'width' => 512, 'height' => 384,
                                        'physicalWidth' => 512, 'physicalHeight' => 384,
-                                       'page' => 1,
-                               ),
-                               array( 'width' => 512 ),
+                                       'page' => 1, 'interlace' => false,
+                               ],
+                               [ 'width' => 512 ],
                                'Resizing with width set',
-                       ),
-                       array(
-                               array( 1024, 768 ),
-                               array(
+                       ],
+                       [
+                               [ 1024, 768 ],
+                               [
                                        'width' => 512, 'height' => 384,
                                        'physicalWidth' => 512, 'physicalHeight' => 384,
-                                       'page' => 1,
-                               ),
-                               array( 'width' => 512, 'height' => 768 ),
+                                       'page' => 1, 'interlace' => false,
+                               ],
+                               [ 'width' => 512, 'height' => 768 ],
                                'Resizing with height set too high',
-                       ),
-                       array(
-                               array( 1024, 768 ),
-                               array(
+                       ],
+                       [
+                               [ 1024, 768 ],
+                               [
                                        'width' => 512, 'height' => 384,
                                        'physicalWidth' => 512, 'physicalHeight' => 384,
-                                       'page' => 1,
-                               ),
-                               array( 'width' => 1024, 'height' => 384 ),
+                                       'page' => 1, 'interlace' => false,
+                               ],
+                               [ 'width' => 1024, 'height' => 384 ],
                                'Resizing with height set',
-                       ),
+                       ],
 
                        /* Very tall images */
-                       array(
-                               array( 1000, 100 ),
-                               array(
+                       [
+                               [ 1000, 100 ],
+                               [
                                        'width' => 5, 'height' => 1,
                                        'physicalWidth' => 5, 'physicalHeight' => 1,
-                                       'page' => 1,
-                               ),
-                               array( 'width' => 5 ),
+                                       'page' => 1, 'interlace' => false,
+                               ],
+                               [ 'width' => 5 ],
                                'Very wide image',
-                       ),
+                       ],
 
-                       array(
-                               array( 100, 1000 ),
-                               array(
+                       [
+                               [ 100, 1000 ],
+                               [
                                        'width' => 1, 'height' => 10,
                                        'physicalWidth' => 1, 'physicalHeight' => 10,
-                                       'page' => 1,
-                               ),
-                               array( 'width' => 1 ),
+                                       'page' => 1, 'interlace' => false,
+                               ],
+                               [ 'width' => 1 ],
                                'Very high image',
-                       ),
-                       array(
-                               array( 100, 1000 ),
-                               array(
+                       ],
+                       [
+                               [ 100, 1000 ],
+                               [
                                        'width' => 1, 'height' => 5,
                                        'physicalWidth' => 1, 'physicalHeight' => 10,
-                                       'page' => 1,
-                               ),
-                               array( 'width' => 10, 'height' => 5 ),
+                                       'page' => 1, 'interlace' => false,
+                               ],
+                               [ 'width' => 10, 'height' => 5 ],
                                'Very high image with height set',
-                       ),
+                       ],
                        /* Max image area */
-                       array(
-                               array( 4000, 4000 ),
-                               array(
+                       [
+                               [ 4000, 4000 ],
+                               [
                                        'width' => 5000, 'height' => 5000,
                                        'physicalWidth' => 4000, 'physicalHeight' => 4000,
-                                       'page' => 1,
-                               ),
-                               array( 'width' => 5000 ),
+                                       'page' => 1, 'interlace' => false,
+                               ],
+                               [ 'width' => 5000 ],
                                'Bigger than max image size but doesn\'t need scaling',
-                       ),
-               );
+                       ],
+                       /* Max interlace image area */
+                       [
+                               [ 4000, 4000 ],
+                               [
+                                       'width' => 5000, 'height' => 5000,
+                                       'physicalWidth' => 4000, 'physicalHeight' => 4000,
+                                       'page' => 1, 'interlace' => false,
+                               ],
+                               [ 'width' => 5000, 'interlace' => true ],
+                               'Interlace bigger than max interlace area',
+                       ],
+               ];
        }
 
        /**
         * @covers BitmapHandler::doTransform
         */
        public function testTooBigImage() {
-               $file = new FakeDimensionFile( array( 4000, 4000 ) );
+               $file = new FakeDimensionFile( [ 4000, 4000 ] );
                $handler = new BitmapHandler;
-               $params = array( 'width' => '3700' ); // Still bigger than max size.
-               $this->assertEquals( 'TransformTooBigImageAreaError',
+               $params = [ 'width' => '3700' ]; // Still bigger than max size.
+               $this->assertEquals( TransformTooBigImageAreaError::class,
                        get_class( $handler->doTransform( $file, 'dummy path', '', $params ) ) );
        }
 
@@ -121,11 +132,11 @@ class BitmapScalingTest extends MediaWikiTestCase {
         * @covers BitmapHandler::doTransform
         */
        public function testTooBigMustRenderImage() {
-               $file = new FakeDimensionFile( array( 4000, 4000 ) );
+               $file = new FakeDimensionFile( [ 4000, 4000 ] );
                $file->mustRender = true;
                $handler = new BitmapHandler;
-               $params = array( 'width' => '5000' ); // Still bigger than max size.
-               $this->assertEquals( 'TransformTooBigImageAreaError',
+               $params = [ 'width' => '5000' ]; // Still bigger than max size.
+               $this->assertEquals( TransformTooBigImageAreaError::class,
                        get_class( $handler->doTransform( $file, 'dummy path', '', $params ) ) );
        }
 
@@ -133,7 +144,7 @@ class BitmapScalingTest extends MediaWikiTestCase {
         * @covers BitmapHandler::getImageArea
         */
        public function testImageArea() {
-               $file = new FakeDimensionFile( array( 7, 9 ) );
+               $file = new FakeDimensionFile( [ 7, 9 ] );
                $handler = new BitmapHandler;
                $this->assertEquals( 63, $handler->getImageArea( $file ) );
        }