From: Siebrand Mazeland Date: Sun, 24 Nov 2013 09:44:10 +0000 (+0100) Subject: Declare visibility on class properties of file repo classes X-Git-Tag: 1.31.0-rc.0~17836^2~7 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=c3bef4243e93ea3e713bbf6853ddf7fd664390c9;p=lhc%2Fweb%2Fwiklou.git Declare visibility on class properties of file repo classes Change-Id: Ia608df217bb893dddae3219b3315cb44e82f5092 --- diff --git a/includes/filerepo/ForeignAPIRepo.php b/includes/filerepo/ForeignAPIRepo.php index 616f881f71..bb16c8bc3e 100644 --- a/includes/filerepo/ForeignAPIRepo.php +++ b/includes/filerepo/ForeignAPIRepo.php @@ -52,13 +52,17 @@ class ForeignAPIRepo extends FileRepo { 'timestamp', ); - var $fileFactory = array( 'ForeignAPIFile', 'newFromTitle' ); - /* Check back with Commons after a day */ - var $apiThumbCacheExpiry = 86400; /* 24*60*60 */ - /* Redownload thumbnail files after a month */ - var $fileCacheExpiry = 2592000; /* 86400*30 */ + protected $fileFactory = array( 'ForeignAPIFile', 'newFromTitle' ); + /** @var int Check back with Commons after a day (24*60*60) */ + protected $apiThumbCacheExpiry = 86400; - protected $mQueryCache = array(); + /** @var int Redownload thumbnail files after a month (86400*30) */ + protected $fileCacheExpiry = 2592000; + + /** @var array */ + private $mQueryCache = array(); + + /** @var array */ protected $mFileExists = array(); /** diff --git a/includes/filerepo/ForeignDBRepo.php b/includes/filerepo/ForeignDBRepo.php index 9cccf3b551..b38416fc86 100644 --- a/includes/filerepo/ForeignDBRepo.php +++ b/includes/filerepo/ForeignDBRepo.php @@ -28,13 +28,19 @@ */ class ForeignDBRepo extends LocalRepo { # Settings - var $dbType, $dbServer, $dbUser, $dbPassword, $dbName, $dbFlags, - $tablePrefix, $hasSharedCache; + protected $dbType; + protected $dbServer; + protected $dbUser; + protected $dbPassword; + protected $dbName; + protected $dbFlags; + protected $tablePrefix; + protected $hasSharedCache; # Other stuff - var $dbConn; - var $fileFactory = array( 'ForeignDBFile', 'newFromTitle' ); - var $fileFromRowFactory = array( 'ForeignDBFile', 'newFromRow' ); + protected $dbConn; + protected $fileFactory = array( 'ForeignDBFile', 'newFromTitle' ); + protected $fileFromRowFactory = array( 'ForeignDBFile', 'newFromRow' ); /** * @param $info array|null diff --git a/includes/filerepo/ForeignDBViaLBRepo.php b/includes/filerepo/ForeignDBViaLBRepo.php index a002aad60e..ad6370624d 100644 --- a/includes/filerepo/ForeignDBViaLBRepo.php +++ b/includes/filerepo/ForeignDBViaLBRepo.php @@ -27,9 +27,11 @@ * @ingroup FileRepo */ class ForeignDBViaLBRepo extends LocalRepo { - var $wiki, $dbName, $tablePrefix; - var $fileFactory = array( 'ForeignDBFile', 'newFromTitle' ); - var $fileFromRowFactory = array( 'ForeignDBFile', 'newFromRow' ); + protected $wiki; + protected $dbName; + protected $tablePrefix; + protected $fileFactory = array( 'ForeignDBFile', 'newFromTitle' ); + protected $fileFromRowFactory = array( 'ForeignDBFile', 'newFromRow' ); /** * @param $info array|null diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php index 49c2b8fa0e..04547657e1 100644 --- a/includes/filerepo/LocalRepo.php +++ b/includes/filerepo/LocalRepo.php @@ -29,12 +29,12 @@ * @ingroup FileRepo */ class LocalRepo extends FileRepo { - var $fileFactory = array( 'LocalFile', 'newFromTitle' ); - var $fileFactoryKey = array( 'LocalFile', 'newFromKey' ); - var $fileFromRowFactory = array( 'LocalFile', 'newFromRow' ); - var $oldFileFactory = array( 'OldLocalFile', 'newFromTitle' ); - var $oldFileFactoryKey = array( 'OldLocalFile', 'newFromKey' ); - var $oldFileFromRowFactory = array( 'OldLocalFile', 'newFromRow' ); + protected $fileFactory = array( 'LocalFile', 'newFromTitle' ); + protected $fileFactoryKey = array( 'LocalFile', 'newFromKey' ); + protected $fileFromRowFactory = array( 'LocalFile', 'newFromRow' ); + protected $oldFileFactory = array( 'OldLocalFile', 'newFromTitle' ); + protected $oldFileFactoryKey = array( 'OldLocalFile', 'newFromKey' ); + protected $oldFileFromRowFactory = array( 'OldLocalFile', 'newFromRow' ); /** * @throws MWException diff --git a/includes/filerepo/RepoGroup.php b/includes/filerepo/RepoGroup.php index 62e9cc0bb3..1a7ae3473c 100644 --- a/includes/filerepo/RepoGroup.php +++ b/includes/filerepo/RepoGroup.php @@ -27,19 +27,24 @@ * @ingroup FileRepo */ class RepoGroup { - /** - * @var LocalRepo - */ - var $localRepo; + /** @var LocalRepo */ + protected $localRepo; - var $foreignRepos, $reposInitialised = false; - var $localInfo, $foreignInfo; - var $cache; + protected $foreignRepos; - /** - * @var RepoGroup - */ + /** @var bool */ + protected $reposInitialised = false; + + protected $localInfo; + protected $foreignInfo; + + /** @var array */ + protected $cache; + + /** @var RepoGroup */ protected static $instance; + + /** Maximum number of cache items */ const MAX_CACHE_SIZE = 500; /**