X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Ffilerepo%2FMigrateFileRepoLayoutTest.php;h=d3f9374c533672e7b356cad4b7e7d4c9a62bfb41;hb=ec215d010c16285a7da5c7a1a0ccc8fb26341ca5;hp=ee0cf2d559d3c7caf5c8bc95c360f849f02093fb;hpb=170e23a2410fd0402019a4477a95075d531f5828;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php index ee0cf2d559..d3f9374c53 100644 --- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php +++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php @@ -13,19 +13,19 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase { $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' ) + $dbMock = $this->getMockBuilder( 'DatabaseMysqli' ) ->disableOriginalConstructor() ->getMock(); @@ -36,30 +36,31 @@ 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 ) ); - $this->migratorMock = $this->getMock( 'MigrateFileRepoLayout', array( 'getRepo' ) ); + $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 ); @@ -98,7 +99,7 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase { public function testMigration() { $this->migratorMock->loadParamsAndArgs( null, - array( 'oldlayout' => 'name', 'newlayout' => 'sha1' ) + [ 'oldlayout' => 'name', 'newlayout' => 'sha1' ] ); ob_start();