Merge "Avoid 'message' in log context in AuthManager"

[lhc/web/wiklou.git] / tests / phpunit / includes / filerepo / MigrateFileRepoLayoutTest.php

diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
index 3f08fd2..92a54fa 100644 (file)
--- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
+++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
@@ -11,19 +11,19 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase {
 
                $filename = 'Foo.png';
 
-               $this->tmpPrefix = wfTempDir() . '/migratefilelayout-test-' . time() . '-' . mt_rand();
+               $this->tmpPrefix = $this->getNewTempDirectory();
 
-               $backend = new FSFileBackend( array(
+               $backend = new FSFileBackend( [
                        'name' => 'local-migratefilerepolayouttest',
                        'wikiId' => wfWikiID(),
-                       'containerPaths' => array(
+                       'containerPaths' => [
                                'migratefilerepolayouttest-original' => "{$this->tmpPrefix}-original",
                                'migratefilerepolayouttest-public' => "{$this->tmpPrefix}-public",
                                'migratefilerepolayouttest-thumb' => "{$this->tmpPrefix}-thumb",
                                'migratefilerepolayouttest-temp' => "{$this->tmpPrefix}-temp",
                                'migratefilerepolayouttest-deleted' => "{$this->tmpPrefix}-deleted",
-                       )
-               ) );
+                       ]
+               ] );
 
                $dbMock = $this->getMockBuilder( 'DatabaseMysql' )
                        ->disableOriginalConstructor()
@@ -36,30 +36,42 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase {
                $dbMock->expects( $this->any() )
                        ->method( 'select' )
                        ->will( $this->onConsecutiveCalls(
-                               new FakeResultWrapper( array( $imageRow ) ), // image
-                               new FakeResultWrapper( array() ), // image
-                               new FakeResultWrapper( array() ) // filearchive
+                               new FakeResultWrapper( [ $imageRow ] ), // image
+                               new FakeResultWrapper( [] ), // image
+                               new FakeResultWrapper( [] ) // filearchive
                        ) );
 
                $repoMock = $this->getMock( 'LocalRepo',
-                       array( 'getMasterDB' ),
-                       array( array(
+                       [ 'getMasterDB' ],
+                       [ [
                                'name' => 'migratefilerepolayouttest',
                                'backend' => $backend
-                       ) ) );
+                       ] ] );
 
-               $repoMock->expects( $this->any() )->method( 'getMasterDB' )->will( $this->returnValue( $dbMock ) );
+               $repoMock
+                       ->expects( $this->any() )
+                       ->method( 'getMasterDB' )
+                       ->will( $this->returnValue( $dbMock ) );
 
-               $this->migratorMock = $this->getMock( 'MigrateFileRepoLayout', array( 'getRepo' ) );
-               $this->migratorMock->expects( $this->any() )->method( 'getRepo' )->will( $this->returnValue( $repoMock ) );
+               $this->migratorMock = $this->getMock( 'MigrateFileRepoLayout', [ 'getRepo' ] );
+               $this->migratorMock
+                       ->expects( $this->any() )
+                       ->method( 'getRepo' )
+                       ->will( $this->returnValue( $repoMock ) );
 
-               $this->tmpFilepath = TempFSFile::factory( 'migratefilelayout-test-', 'png' )->getPath();
+               $this->tmpFilepath = TempFSFile::factory(
+                       'migratefilelayout-test-', 'png', wfTempDir() )->getPath();
 
                file_put_contents( $this->tmpFilepath, $this->text );
 
                $hashPath = $repoMock->getHashPath( $filename );
 
-               $status = $repoMock->store( $this->tmpFilepath, 'public', $hashPath . $filename, FileRepo::OVERWRITE );
+               $status = $repoMock->store(
+                       $this->tmpFilepath,
+                       'public',
+                       $hashPath . $filename,
+                       FileRepo::OVERWRITE
+               );
        }
 
        protected function deleteFilesRecursively( $directory ) {
@@ -85,7 +97,10 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase {
        }
 
        public function testMigration() {
-               $this->migratorMock->loadParamsAndArgs( null, array( 'oldlayout' => 'name', 'newlayout' => 'sha1' ) );
+               $this->migratorMock->loadParamsAndArgs(
+                       null,
+                       [ 'oldlayout' => 'name', 'newlayout' => 'sha1' ]
+               );
 
                ob_start();
 
@@ -105,10 +120,18 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase {
                        . '/'
                        . $sha1;
 
-               $this->assertEquals( file_get_contents( $expectedOriginalFilepath ), $this->text, 'New sha1 file should be exist and have the right contents' );
+               $this->assertEquals(
+                       file_get_contents( $expectedOriginalFilepath ),
+                       $this->text,
+                       'New sha1 file should be exist and have the right contents'
+               );
 
                $expectedPublicFilepath = $this->tmpPrefix . '-public/f/f8/Foo.png';
 
-               $this->assertEquals( file_get_contents( $expectedPublicFilepath ), $this->text, 'Existing name file should still and have the right contents' );
+               $this->assertEquals(
+                       file_get_contents( $expectedPublicFilepath ),
+                       $this->text,
+                       'Existing name file should still and have the right contents'
+               );
        }
 }