diff options
author | Aaron Schulz <aschulz@wikimedia.org> | 2016-09-18 17:22:36 -0700 |
---|---|---|
committer | Aaron Schulz <aschulz@wikimedia.org> | 2016-09-19 19:55:09 +0000 |
commit | f7e3ac3f95ce2b5a9f73326e854d1c301b513078 (patch) | |
tree | fe70905a0d7b96c6b1fa311808a0790bb6ad55fc /tests/phpunit/mocks/filebackend/MockFSFile.php | |
parent | 95eed85fb9c085cd2da8200335ec16640054e18f (diff) | |
download | mediawikicore-f7e3ac3f95ce2b5a9f73326e854d1c301b513078.tar.gz mediawikicore-f7e3ac3f95ce2b5a9f73326e854d1c301b513078.zip |
FSFile and TempFSFile cleanups
* Remove wf* function dependencies. This includes wfTempDir().
Callers now should specify the directory, though it will try to do
most of the wfTempDir() logic anyway if they do not.
* Update callers to inject wfTempDir() so $wgTmpDirectory is used by
TempFSFile instead of it probing to find a valid directory itself.
* Move most of the wfTempDir() logic to TempFSFile::getUsableTempDirectory().
* Remove unused getMimeType() method.
Change-Id: Idd55936b07f9448a6c90577708722b7b52b8fe66
Diffstat (limited to 'tests/phpunit/mocks/filebackend/MockFSFile.php')
-rw-r--r-- | tests/phpunit/mocks/filebackend/MockFSFile.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/phpunit/mocks/filebackend/MockFSFile.php b/tests/phpunit/mocks/filebackend/MockFSFile.php index bdeed58a81f0..6797f5955462 100644 --- a/tests/phpunit/mocks/filebackend/MockFSFile.php +++ b/tests/phpunit/mocks/filebackend/MockFSFile.php @@ -50,15 +50,11 @@ class MockFSFile extends FSFile { return wfTimestamp( TS_MW ); } - public function getMimeType() { - return 'text/mock'; - } - public function getProps( $ext = true ) { return [ 'fileExists' => $this->exists(), 'size' => $this->getSize(), - 'file-mime' => $this->getMimeType(), + 'file-mime' => 'text/mock', 'sha1' => $this->getSha1Base36(), ]; } |