Merge "Rm unused 'remembermypassword' message, doc another"

[lhc/web/wiklou.git] / tests / phpunit / includes / filebackend / SwiftFileBackendTest.php

diff --git a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
index adcbe74..95ffb70 100644 (file)
--- a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
@@ -13,7 +13,7 @@ class SwiftFileBackendTest extends MediaWikiTestCase {
                parent::setUp();
 
                $this->backend = TestingAccessWrapper::newFromObject(
-                       new SwiftFileBackend( array(
+                       new SwiftFileBackend( [
                                'name'             => 'local-swift-testing',
                                'class'            => 'SwiftFileBackend',
                                'wikiId'           => 'unit-testing',
@@ -22,72 +22,72 @@ class SwiftFileBackendTest extends MediaWikiTestCase {
                                'swiftUser'        => 'test:tester',
                                'swiftKey'         => 'testing',
                                'swiftTempUrlKey'  => 'b3968d0207b54ece87cccc06515a89d4' // unused
-                       ) )
+                       ] )
                );
        }
 
        /**
-        * @dataProvider provider_testSanitzeHdrs
-        * @covers SwiftFileBackend::sanitzeHdrs
+        * @dataProvider provider_testSanitizeHdrs
+        * @covers SwiftFileBackend::sanitizeHdrs
         * @covers SwiftFileBackend::getCustomHeaders
         */
-       public function testSanitzeHdrs( $raw, $sanitized ) {
-               $hdrs = $this->backend->sanitizeHdrs( array( 'headers' => $raw ) );
+       public function testSanitizeHdrs( $raw, $sanitized ) {
+               $hdrs = $this->backend->sanitizeHdrs( [ 'headers' => $raw ] );
 
                $this->assertEquals( $hdrs, $sanitized, 'sanitizeHdrs() has expected result' );
        }
 
-       public static function provider_testSanitzeHdrs() {
-               return array(
-                       array(
-                               array(
+       public static function provider_testSanitizeHdrs() {
+               return [
+                       [
+                               [
                                        'content-length' => 345,
                                        'content-type'   => 'image+bitmap/jpeg',
                                        'content-disposition' => 'inline',
                                        'content-duration' => 35.6363,
                                        'content-Custom' => 'hello',
                                        'x-content-custom' => 'hello'
-                               ),
-                               array(
+                               ],
+                               [
                                        'content-disposition' => 'inline',
                                        'content-duration' => 35.6363,
                                        'content-custom' => 'hello',
                                        'x-content-custom' => 'hello'
-                               )
-                       ),
-                       array(
-                               array(
+                               ]
+                       ],
+                       [
+                               [
                                        'content-length' => 345,
                                        'content-type'   => 'image+bitmap/jpeg',
                                        'content-Disposition' => 'inline; filename=xxx; ' . str_repeat( 'o', 1024 ),
                                        'content-duration' => 35.6363,
                                        'content-custom' => 'hello',
                                        'x-content-custom' => 'hello'
-                               ),
-                               array(
+                               ],
+                               [
                                        'content-disposition' => 'inline;filename=xxx',
                                        'content-duration' => 35.6363,
                                        'content-custom' => 'hello',
                                        'x-content-custom' => 'hello'
-                               )
-                       ),
-                       array(
-                               array(
+                               ]
+                       ],
+                       [
+                               [
                                        'content-length' => 345,
                                        'content-type'   => 'image+bitmap/jpeg',
-                                       'content-disposition' => 'filename='. str_repeat( 'o', 1024 ) . ';inline',
+                                       'content-disposition' => 'filename=' . str_repeat( 'o', 1024 ) . ';inline',
                                        'content-duration' => 35.6363,
                                        'content-custom' => 'hello',
                                        'x-content-custom' => 'hello'
-                               ),
-                               array(
+                               ],
+                               [
                                        'content-disposition' => '',
                                        'content-duration' => 35.6363,
                                        'content-custom' => 'hello',
                                        'x-content-custom' => 'hello'
-                               )
-                       )
-               );
+                               ]
+                       ]
+               ];
        }
 
        /**
@@ -101,21 +101,21 @@ class SwiftFileBackendTest extends MediaWikiTestCase {
        }
 
        public static function provider_testGetMetadataHeaders() {
-               return array(
-                       array(
-                               array(
+               return [
+                       [
+                               [
                                        'content-length' => 345,
                                        'content-custom' => 'hello',
                                        'x-content-custom' => 'hello',
                                        'x-object-meta-custom' => 5,
                                        'x-object-meta-sha1Base36' => 'a3deadfg...',
-                               ),
-                               array(
+                               ],
+                               [
                                        'x-object-meta-custom' => 5,
                                        'x-object-meta-sha1base36' => 'a3deadfg...',
-                               )
-                       )
-               );
+                               ]
+                       ]
+               ];
        }
 
        /**
@@ -129,21 +129,20 @@ class SwiftFileBackendTest extends MediaWikiTestCase {
        }
 
        public static function provider_testGetMetadata() {
-               return array(
-                       array(
-                               array(
+               return [
+                       [
+                               [
                                        'content-length' => 345,
                                        'content-custom' => 'hello',
                                        'x-content-custom' => 'hello',
                                        'x-object-meta-custom' => 5,
                                        'x-object-meta-sha1Base36' => 'a3deadfg...',
-                               ),
-                               array(
+                               ],
+                               [
                                        'custom' => 5,
                                        'sha1base36' => 'a3deadfg...',
-                               )
-                       )
-               );
+                               ]
+                       ]
+               ];
        }
 }
-