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 "Rewrite pref cleanup script"
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
file
/
ForeignAPIFile.php
diff --git
a/includes/filerepo/file/ForeignAPIFile.php
b/includes/filerepo/file/ForeignAPIFile.php
index
f6752d8
..
8dcb289
100644
(file)
--- a/
includes/filerepo/file/ForeignAPIFile.php
+++ b/
includes/filerepo/file/ForeignAPIFile.php
@@
-28,9
+28,12
@@
* @ingroup FileAbstraction
*/
class ForeignAPIFile extends File {
* @ingroup FileAbstraction
*/
class ForeignAPIFile extends File {
+ /** @var bool */
private $mExists;
private $mExists;
+ /** @var array */
+ private $mInfo = [];
- protected $repoClass =
'ForeignApiRepo'
;
+ protected $repoClass =
ForeignApiRepo::class
;
/**
* @param Title|string|bool $title
/**
* @param Title|string|bool $title
@@
-244,7
+247,7
@@
class ForeignAPIFile extends File {
public function getUser( $type = 'text' ) {
if ( $type == 'text' ) {
return isset( $this->mInfo['user'] ) ? strval( $this->mInfo['user'] ) : null;
public function getUser( $type = 'text' ) {
if ( $type == 'text' ) {
return isset( $this->mInfo['user'] ) ? strval( $this->mInfo['user'] ) : null;
- } else
if ( $type == 'id' )
{
+ } else {
return 0; // What makes sense here, for a remote user?
}
}
return 0; // What makes sense here, for a remote user?
}
}
@@
-283,7
+286,7
@@
class ForeignAPIFile extends File {
*/
function getMimeType() {
if ( !isset( $this->mInfo['mime'] ) ) {
*/
function getMimeType() {
if ( !isset( $this->mInfo['mime'] ) ) {
- $magic = M
imeMagic::singleton
();
+ $magic = M
ediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer
();
$this->mInfo['mime'] = $magic->guessTypesForExtension( $this->getExtension() );
}
$this->mInfo['mime'] = $magic->guessTypesForExtension( $this->getExtension() );
}
@@
-297,7
+300,7
@@
class ForeignAPIFile extends File {
if ( isset( $this->mInfo['mediatype'] ) ) {
return $this->mInfo['mediatype'];
}
if ( isset( $this->mInfo['mediatype'] ) ) {
return $this->mInfo['mediatype'];
}
- $magic = M
imeMagic::singleton
();
+ $magic = M
ediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer
();
return $magic->getMediaType( null, $this->getMimeType() );
}
return $magic->getMediaType( null, $this->getMimeType() );
}
@@
-344,9
+347,6
@@
class ForeignAPIFile extends File {
return $files;
}
return $files;
}
- /**
- * @see File::purgeCache()
- */
function purgeCache( $options = [] ) {
$this->purgeThumbnails( $options );
$this->purgeDescriptionPage();
function purgeCache( $options = [] ) {
$this->purgeThumbnails( $options );
$this->purgeDescriptionPage();