X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Ffilebackend%2FSwiftFileBackendTest.php;h=9cd2b100cd989b3701590f7b8b989bd54d9a716d;hb=9b83841b9b44457b498770b847ac72f53031c34d;hp=877cb6020b6bbd48b2ccce5d6c01e75868f7485f;hpb=8d1c5a70f753fe6b7d2533a30b07fe03e6583a1d;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php index 877cb6020b..9cd2b100cd 100644 --- a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php +++ b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php @@ -1,9 +1,16 @@ backend = TestingAccessWrapper::newFromObject( - new SwiftFileBackend( array( + new SwiftFileBackend( [ 'name' => 'local-swift-testing', 'class' => 'SwiftFileBackend', 'wikiId' => 'unit-testing', @@ -22,77 +29,74 @@ class SwiftFileBackendTest extends MediaWikiTestCase { 'swiftUser' => 'test:tester', 'swiftKey' => 'testing', 'swiftTempUrlKey' => 'b3968d0207b54ece87cccc06515a89d4' // unused - ) ) + ] ) ); } /** - * @dataProvider provider_testSanitzeHdrs - * @covers SwiftFileBackend::sanitzeHdrs - * @covers SwiftFileBackend::getCustomHeaders + * @dataProvider provider_testSanitizeHdrs */ - 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-duration' => 35.6363, 'content-custom' => 'hello', 'x-content-custom' => 'hello' - ), - array( + ], + [ 'content-disposition' => '', 'content-duration' => 35.6363, 'content-custom' => 'hello', 'x-content-custom' => 'hello' - ) - ) - ); + ] + ] + ]; } /** * @dataProvider provider_testGetMetadataHeaders - * @covers SwiftFileBackend::getMetadataHeaders */ public function testGetMetadataHeaders( $raw, $sanitized ) { $hdrs = $this->backend->getMetadataHeaders( $raw ); @@ -101,26 +105,25 @@ 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...', - ) - ) - ); + ] + ] + ]; } /** * @dataProvider provider_testGetMetadata - * @covers SwiftFileBackend::getMetadata */ public function testGetMetadata( $raw, $sanitized ) { $hdrs = $this->backend->getMetadata( $raw ); @@ -129,20 +132,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...', - ) - ) - ); + ] + ] + ]; } }