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 "parserTests: Add parser test with filename containing single quotes"
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
FileRepo.php
diff --git
a/includes/filerepo/FileRepo.php
b/includes/filerepo/FileRepo.php
index
51cef81
..
60f1607
100644
(file)
--- a/
includes/filerepo/FileRepo.php
+++ b/
includes/filerepo/FileRepo.php
@@
-45,7
+45,8
@@
class FileRepo {
const NAME_AND_TIME_ONLY = 1;
/** @var bool Whether to fetch commons image description pages and display
const NAME_AND_TIME_ONLY = 1;
/** @var bool Whether to fetch commons image description pages and display
- * them on the local wiki */
+ * them on the local wiki
+ */
public $fetchDescription;
/** @var int */
public $fetchDescription;
/** @var int */
@@
-67,7
+68,8
@@
class FileRepo {
protected $thumbScriptUrl;
/** @var bool Whether to skip media file transformation on parse and rely
protected $thumbScriptUrl;
/** @var bool Whether to skip media file transformation on parse and rely
- * on a 404 handler instead. */
+ * on a 404 handler instead.
+ */
protected $transformVia404;
/** @var string URL of image description pages, e.g.
protected $transformVia404;
/** @var string URL of image description pages, e.g.
@@
-121,13
+123,13
@@
class FileRepo {
/** @var bool Whether all zones should be private (e.g. private wiki repo) */
protected $isPrivate;
/** @var bool Whether all zones should be private (e.g. private wiki repo) */
protected $isPrivate;
- /** @var
array
callable Override these in the base class */
+ /** @var callable Override these in the base class */
protected $fileFactory = [ UnregisteredLocalFile::class, 'newFromTitle' ];
protected $fileFactory = [ UnregisteredLocalFile::class, 'newFromTitle' ];
- /** @var
array callable|bool
Override these in the base class */
+ /** @var
callable|false
Override these in the base class */
protected $oldFileFactory = false;
protected $oldFileFactory = false;
- /** @var
array callable|bool
Override these in the base class */
+ /** @var
callable|false
Override these in the base class */
protected $fileFactoryKey = false;
protected $fileFactoryKey = false;
- /** @var
array callable|bool
Override these in the base class */
+ /** @var
callable|false
Override these in the base class */
protected $oldFileFactoryKey = false;
/** @var string URL of where to proxy thumb.php requests to.
protected $oldFileFactoryKey = false;
/** @var string URL of where to proxy thumb.php requests to.
@@
-230,7
+232,7
@@
class FileRepo {
/**
* Check if a single zone or list of zones is defined for usage
*
/**
* Check if a single zone or list of zones is defined for usage
*
- * @param
array
$doZones Only do a particular zones
+ * @param
string[]|string
$doZones Only do a particular zones
* @throws MWException
* @return Status
*/
* @throws MWException
* @return Status
*/
@@
-734,7
+736,7
@@
class FileRepo {
/**
* Make an url to this repo
*
/**
* Make an url to this repo
*
- * @param string $query Query string to append
+ * @param string
|string[]
$query Query string to append
* @param string $entry Entry point; defaults to index
* @return string|bool False on failure
*/
* @param string $entry Entry point; defaults to index
* @return string|bool False on failure
*/
@@
-1739,7
+1741,7
@@
class FileRepo {
/**
* Create a new good result
*
/**
* Create a new good result
*
- * @param null|
string
$value
+ * @param null|
mixed
$value
* @return Status
*/
public function newGood( $value = null ) {
* @return Status
*/
public function newGood( $value = null ) {