dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Parse wikitext in gallery caption"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
media
/
MediaWikiMediaTestCase.php
diff --git
a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
index
a4e8056
..
7a536df
100644
(file)
--- a/
tests/phpunit/includes/media/MediaWikiMediaTestCase.php
+++ b/
tests/phpunit/includes/media/MediaWikiMediaTestCase.php
@@
-70,7
+70,7
@@
abstract class MediaWikiMediaTestCase extends MediaWikiTestCase {
*
* File must be in the path returned by getFilePath()
* @param string $name File name
*
* File must be in the path returned by getFilePath()
* @param string $name File name
- * @param string $type MIME type [optional]
+ * @param string
|null
$type MIME type [optional]
* @return UnregisteredLocalFile
*/
protected function dataFile( $name, $type = null ) {
* @return UnregisteredLocalFile
*/
protected function dataFile( $name, $type = null ) {