From 652c4be7c248720fd0fd91fa0d9bfc2a0fee3352 Mon Sep 17 00:00:00 2001 From: Marius Hoch Date: Fri, 14 Sep 2012 20:57:14 +0200 Subject: [PATCH] Clean up: Declare variables with public instead of var Variables in classes should be declared using public $foo instead of var $foo for various reasons. As we require PHP 5.3 we don't have to take care about that PHP4 left over, but can get rid of it in favour of the more clear and better readable public. See also: http://php.net/manual/en/language.oop5.visibility.php (Divided into several commits to keep reviewable) Change-Id: Ic723d0347ab2e3c78bc0097345c68bbee3dc035a --- languages/Language.php | 14 ++--- languages/LanguageConverter.php | 56 +++++++++---------- languages/classes/LanguageIu.php | 6 +- languages/classes/LanguageKu.php | 4 +- languages/classes/LanguageShi.php | 6 +- languages/classes/LanguageSr.php | 4 +- languages/classes/LanguageUz.php | 4 +- languages/utils/CLDRPluralRuleEvaluator.php | 14 ++--- maintenance/archives/upgradeLogging.php | 6 +- maintenance/generateSitemap.php | 26 ++++----- maintenance/importDump.php | 14 ++--- maintenance/jsparse.php | 2 +- .../language/generateCollationData.php | 20 +++---- .../language/generateNormalizerData.php | 2 +- maintenance/minify.php | 2 +- maintenance/preprocessorFuzzTest.php | 18 +++--- maintenance/purgeParserCache.php | 2 +- maintenance/storage/checkStorage.php | 6 +- maintenance/storage/fixBug20757.php | 8 +-- maintenance/storage/recompressTracked.php | 34 +++++------ maintenance/storage/trackBlobs.php | 10 ++-- maintenance/updateCollation.php | 2 +- 22 files changed, 130 insertions(+), 130 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index 1edca80469..1ece78a4d8 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -48,7 +48,7 @@ class FakeConverter { /** * @var Language */ - var $mLang; + public $mLang; function __construct( $langobj ) { $this->mLang = $langobj; } function autoConvertToAllVariants( $text ) { return array( $this->mLang->getCode() => $text ); } function convert( $t ) { return $t; } @@ -77,21 +77,21 @@ class Language { /** * @var LanguageConverter */ - var $mConverter; + public $mConverter; - var $mVariants, $mCode, $mLoaded = false; - var $mMagicExtensions = array(), $mMagicHookDone = false; + public $mVariants, $mCode, $mLoaded = false; + public $mMagicExtensions = array(), $mMagicHookDone = false; private $mHtmlCode = null; - var $dateFormatStrings = array(); - var $mExtendedSpecialPageAliases; + public $dateFormatStrings = array(); + public $mExtendedSpecialPageAliases; protected $namespaceNames, $mNamespaceIds, $namespaceAliases; /** * ReplacementArray object caches */ - var $transformData = array(); + public $transformData = array(); /** * @var LocalisationCache diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index 8b7d6cbec0..56b885fd36 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -47,28 +47,28 @@ class LanguageConverter { 'zh', ); - var $mMainLanguageCode; - var $mVariants, $mVariantFallbacks, $mVariantNames; - var $mTablesLoaded = false; - var $mTables; + public $mMainLanguageCode; + public $mVariants, $mVariantFallbacks, $mVariantNames; + public $mTablesLoaded = false; + public $mTables; // 'bidirectional' 'unidirectional' 'disable' for each variant - var $mManualLevel; + public $mManualLevel; /** * @var String: memcached key name */ - var $mCacheKey; - - var $mLangObj; - var $mFlags; - var $mDescCodeSep = ':', $mDescVarSep = ';'; - var $mUcfirst = false; - var $mConvRuleTitle = false; - var $mURLVariant; - var $mUserVariant; - var $mHeaderVariant; - var $mMaxDepth = 10; - var $mVarSeparatorPattern; + public $mCacheKey; + + public $mLangObj; + public $mFlags; + public $mDescCodeSep = ':', $mDescVarSep = ';'; + public $mUcfirst = false; + public $mConvRuleTitle = false; + public $mURLVariant; + public $mUserVariant; + public $mHeaderVariant; + public $mMaxDepth = 10; + public $mVarSeparatorPattern; const CACHE_VERSION_KEY = 'VERSION 6'; @@ -1113,17 +1113,17 @@ class LanguageConverter { * @author fdcn , PhiLiP */ class ConverterRule { - var $mText; // original text in -{text}- - var $mConverter; // LanguageConverter object - var $mRuleDisplay = ''; - var $mRuleTitle = false; - var $mRules = '';// string : the text of the rules - var $mRulesAction = 'none'; - var $mFlags = array(); - var $mVariantFlags = array(); - var $mConvTable = array(); - var $mBidtable = array();// array of the translation in each variant - var $mUnidtable = array();// array of the translation in each variant + public $mText; // original text in -{text}- + public $mConverter; // LanguageConverter object + public $mRuleDisplay = ''; + public $mRuleTitle = false; + public $mRules = '';// string : the text of the rules + public $mRulesAction = 'none'; + public $mFlags = array(); + public $mVariantFlags = array(); + public $mConvTable = array(); + public $mBidtable = array();// array of the translation in each variant + public $mUnidtable = array();// array of the translation in each variant /** * Constructor diff --git a/languages/classes/LanguageIu.php b/languages/classes/LanguageIu.php index 9bac5d73ff..7402b08358 100644 --- a/languages/classes/LanguageIu.php +++ b/languages/classes/LanguageIu.php @@ -38,7 +38,7 @@ require_once( __DIR__ . '/../LanguageConverter.php' ); class IuConverter extends LanguageConverter { protected $mDoContentConvert; - var $mToLatin = array( + public $mToLatin = array( 'ᐦ' => 'h', 'ᐃ' => 'i', 'ᐄ' => 'ii', 'ᐅ' => 'u', 'ᐆ' => 'uu', 'ᐊ' => 'a', 'ᐋ' => 'aa', 'ᑉ' => 'p', 'ᐱ' => 'pi', 'ᐲ' => 'pii', 'ᐳ' => 'pu', 'ᐴ' => 'puu', 'ᐸ' => 'pa', 'ᐹ' => 'paa', 'ᑦ' => 't', 'ᑎ' => 'ti', 'ᑏ' => 'tii', 'ᑐ' => 'tu', 'ᑑ' => 'tuu', 'ᑕ' => 'ta', 'ᑖ' => 'taa', @@ -58,7 +58,7 @@ class IuConverter extends LanguageConverter { 'ᖦ' => 'É«', 'ᖠ' => 'É«i', 'ᖡ' => 'É«ii', 'ᖢ' => 'É«u', 'ᖣ' => 'É«uu', 'ᖤ' => 'É«a', 'ᖥ' => 'É«aa', ); - var $mUpperToLowerCaseLatin = array( + public $mUpperToLowerCaseLatin = array( 'A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd', 'E' => 'e', 'F' => 'f', 'G' => 'g', 'H' => 'h', 'I' => 'i', 'J' => 'j', 'K' => 'k', 'L' => 'l', 'M' => 'm', 'N' => 'n', 'O' => 'o', @@ -67,7 +67,7 @@ class IuConverter extends LanguageConverter { 'Z' => 'z', ); - var $mToSyllabics = array( + public $mToSyllabics = array( 'h' => 'ᐦ', 'i' => 'ᐃ', 'ii' => 'ᐄ', 'u' => 'ᐅ', 'uu' => 'ᐆ', 'a' => 'ᐊ', 'aa' => 'ᐋ', 'p' => 'ᑉ', 'pi' => 'ᐱ', 'pii' => 'ᐲ', 'pu' => 'ᐳ', 'puu' => 'ᐴ', 'pa' => 'ᐸ', 'paa' => 'ᐹ', 't' => 'ᑦ', 'ti' => 'ᑎ', 'tii' => 'ᑏ', 'tu' => 'ᑐ', 'tuu' => 'ᑑ', 'ta' => 'ᑕ', 'taa' => 'ᑖ', diff --git a/languages/classes/LanguageKu.php b/languages/classes/LanguageKu.php index 02ec648282..d60f083541 100644 --- a/languages/classes/LanguageKu.php +++ b/languages/classes/LanguageKu.php @@ -30,7 +30,7 @@ require_once( __DIR__ . '/LanguageKu_ku.php' ); * @ingroup Language */ class KuConverter extends LanguageConverter { - var $mArabicToLatin = array( + public $mArabicToLatin = array( 'ب' => 'b', 'ج' => 'c', 'چ' => 'ç', 'د' => 'd', 'ف' => 'f', 'Ú¯' => 'g', 'Ú¾' => 'h', 'ہ' => 'h', 'ه' => 'h', 'Ø­' => 'h', 'ژ' => 'j', 'ك' => 'k', 'Ú©' => 'k', 'ل' => 'l', 'م' => 'm', 'ن' => 'n', 'Ù¾' => 'p', 'ق' => 'q', 'ر' => 'r', 'س' => 's', 'Ø´' => 'ş', @@ -72,7 +72,7 @@ class KuConverter extends LanguageConverter { 'Ù©' => '9', # ٩ ); - var $mLatinToArabic = array( + public $mLatinToArabic = array( 'b' => 'ب', 'c' => 'ج', 'ç' => 'چ', 'd' => 'د', 'f' => 'ف', 'g' => 'Ú¯', 'h' => 'ه', 'j' => 'ژ', 'k' => 'Ú©', 'l' => 'ل', 'm' => 'م', 'n' => 'ن', 'p' => 'Ù¾', 'q' => 'ق', 'r' => 'ر', 's' => 'س', 'ş' => 'Ø´', diff --git a/languages/classes/LanguageShi.php b/languages/classes/LanguageShi.php index 27c5d64f15..36f34078b5 100644 --- a/languages/classes/LanguageShi.php +++ b/languages/classes/LanguageShi.php @@ -39,7 +39,7 @@ class ShiConverter extends LanguageConverter { protected $mDoContentConvert; - var $mToLatin = array( + public $mToLatin = array( 'â´°' => 'a', 'â´±' => 'b', 'â´³' => 'g', 'â´·' => 'd', 'â´¹' => 'ḍ', 'â´»' => 'e', 'â´¼' => 'f', 'â´½' => 'k', 'ⵀ' => 'h', 'ⵃ' => 'ḥ', 'ⵄ' => 'ε', 'ⵅ' => 'x', 'ⵇ' => 'q', 'ⵉ' => 'i', 'ⵊ' => 'j', 'ⵍ' => 'l', 'ⵎ' => 'm', 'ⵏ' => 'n', @@ -48,7 +48,7 @@ class ShiConverter extends LanguageConverter { 'âµ¥' => 'ẓ', 'ⵯ' => 'Ê·', 'ⵖ' => 'É£', 'âµ ' => 'v', 'ⵒ' => 'p', ); - var $mUpperToLowerCaseLatin = array( + public $mUpperToLowerCaseLatin = array( 'A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd', 'E' => 'e', 'F' => 'f', 'G' => 'g', 'H' => 'h', 'I' => 'i', 'J' => 'j', 'K' => 'k', 'L' => 'l', 'M' => 'm', 'N' => 'n', 'O' => 'o', @@ -57,7 +57,7 @@ class ShiConverter extends LanguageConverter { 'Z' => 'z', 'Ɣ' => 'É£', ); - var $mToTifinagh = array( + public $mToTifinagh = array( 'a' => 'â´°', 'b' => 'â´±', 'g' => 'â´³', 'd' => 'â´·', 'ḍ' => 'â´¹', 'e' => 'â´»', 'f' => 'â´¼', 'k' => 'â´½', 'h' => 'ⵀ', 'ḥ' => 'ⵃ', 'ε' => 'ⵄ', 'x' => 'ⵅ', 'q' => 'ⵇ', 'i' => 'ⵉ', 'j' => 'ⵊ', 'l' => 'ⵍ', 'm' => 'ⵎ', 'n' => 'ⵏ', diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php index 4b799f2838..5f1110ddcb 100644 --- a/languages/classes/LanguageSr.php +++ b/languages/classes/LanguageSr.php @@ -35,7 +35,7 @@ require_once( __DIR__ . '/LanguageSr_el.php' ); * @ingroup Language */ class SrConverter extends LanguageConverter { - var $mToLatin = array( + public $mToLatin = array( 'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd', 'ђ' => 'đ', 'е' => 'e', 'ж' => 'ž', 'з' => 'z', 'и' => 'i', 'ј' => 'j', 'к' => 'k', 'л' => 'l', 'љ' => 'lj', 'м' => 'm', @@ -51,7 +51,7 @@ class SrConverter extends LanguageConverter { 'Ð¥' => 'H', 'Ц' => 'C', 'Ч' => 'Č', 'Џ' => 'Dž', 'Ш' => 'Å ', ); - var $mToCyrillics = array( + public $mToCyrillics = array( 'a' => 'а', 'b' => 'б', 'c' => 'ц', 'č' => 'ч', 'ć' => 'ћ', 'd' => 'д', 'dž' => 'џ', 'đ' => 'ђ', 'e' => 'е', 'f' => 'ф', 'g' => 'г', 'h' => 'х', 'i' => 'и', 'j' => 'ј', 'k' => 'к', diff --git a/languages/classes/LanguageUz.php b/languages/classes/LanguageUz.php index bd69e3077f..d6ddf105c3 100644 --- a/languages/classes/LanguageUz.php +++ b/languages/classes/LanguageUz.php @@ -27,7 +27,7 @@ require_once( __DIR__ . '/../LanguageConverter.php' ); * @ingroup Language */ class UzConverter extends LanguageConverter { - var $toLatin = array( + public $toLatin = array( 'а' => 'a', 'А' => 'A', 'б' => 'b', 'Б' => 'B', 'д' => 'd', 'Д' => 'D', @@ -65,7 +65,7 @@ class UzConverter extends LanguageConverter { 'ъ' => 'ʼ', ); - var $toCyrillic = array( + public $toCyrillic = array( 'a' => 'а', 'A' => 'А', 'b' => 'б', 'B' => 'Б', 'd' => 'д', 'D' => 'Д', diff --git a/languages/utils/CLDRPluralRuleEvaluator.php b/languages/utils/CLDRPluralRuleEvaluator.php index 6b11704376..1056ece0e8 100644 --- a/languages/utils/CLDRPluralRuleEvaluator.php +++ b/languages/utils/CLDRPluralRuleEvaluator.php @@ -131,7 +131,7 @@ class CLDRPluralRuleEvaluator { * Evaluator helper class representing a range list. */ class CLDRPluralRuleEvaluator_Range { - var $parts = array(); + public $parts = array(); function __construct( $start, $end = false ) { if ( $end === false ) { @@ -208,9 +208,9 @@ class CLDRPluralRuleEvaluator_Range { * Helper class for converting rules to reverse polish notation (RPN). */ class CLDRPluralRuleConverter { - var $rule, $pos, $end; - var $operators = array(); - var $operands = array(); + public $rule, $pos, $end; + public $operators = array(); + public $operands = array(); /** * Precedence levels. Note that there's no need to worry about associativity @@ -447,7 +447,7 @@ class CLDRPluralRuleConverter { * The base class for operators and expressions, describing a region of the input string. */ class CLDRPluralRuleConverter_Fragment { - var $parser, $pos, $length, $end; + public $parser, $pos, $length, $end; function __construct( $parser, $pos, $length ) { $this->parser = $parser; @@ -473,7 +473,7 @@ class CLDRPluralRuleConverter_Fragment { * validation. */ class CLDRPluralRuleConverter_Expression extends CLDRPluralRuleConverter_Fragment { - var $type, $rpn; + public $type, $rpn; function __construct( $parser, $type, $rpn, $pos, $length ) { parent::__construct( $parser, $pos, $length ); @@ -498,7 +498,7 @@ class CLDRPluralRuleConverter_Expression extends CLDRPluralRuleConverter_Fragmen * messages), and the binary operator at that location. */ class CLDRPluralRuleConverter_Operator extends CLDRPluralRuleConverter_Fragment { - var $name; + public $name; /** * Each op type has three characters: left operand type, right operand type and result type diff --git a/maintenance/archives/upgradeLogging.php b/maintenance/archives/upgradeLogging.php index 2c28011b5a..a957957f34 100644 --- a/maintenance/archives/upgradeLogging.php +++ b/maintenance/archives/upgradeLogging.php @@ -34,9 +34,9 @@ class UpdateLogging { /** * @var DatabaseBase */ - var $dbw; - var $batchSize = 1000; - var $minTs = false; + public $dbw; + public $batchSize = 1000; + public $minTs = false; function execute() { $this->dbw = wfGetDB( DB_MASTER ); diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php index f3a5d875e8..adea97eaf7 100644 --- a/maintenance/generateSitemap.php +++ b/maintenance/generateSitemap.php @@ -44,7 +44,7 @@ class GenerateSitemap extends Maintenance { * * @var int */ - var $url_limit; + public $url_limit; /** * The maximum size of a sitemap file @@ -53,77 +53,77 @@ class GenerateSitemap extends Maintenance { * * @var int */ - var $size_limit; + public $size_limit; /** * The path to prepend to the filename * * @var string */ - var $fspath; + public $fspath; /** * The URL path to prepend to filenames in the index; should resolve to the same directory as $fspath * * @var string */ - var $urlpath; + public $urlpath; /** * Whether or not to use compression * * @var bool */ - var $compress; + public $compress; /** * Whether or not to include redirection pages * * @var bool */ - var $skipRedirects; + public $skipRedirects; /** * The number of entries to save in each sitemap file * * @var array */ - var $limit = array(); + public $limit = array(); /** * Key => value entries of namespaces and their priorities * * @var array */ - var $priorities = array(); + public $priorities = array(); /** * A one-dimensional array of namespaces in the wiki * * @var array */ - var $namespaces = array(); + public $namespaces = array(); /** * When this sitemap batch was generated * * @var string */ - var $timestamp; + public $timestamp; /** * A database slave object * * @var object */ - var $dbr; + public $dbr; /** * A resource pointing to the sitemap index file * * @var resource */ - var $findex; + public $findex; /** @@ -131,7 +131,7 @@ class GenerateSitemap extends Maintenance { * * @var resource */ - var $file; + public $file; /** * Identifier to use in filenames, default $wgDBname diff --git a/maintenance/importDump.php b/maintenance/importDump.php index f51d7ad732..904b6247de 100644 --- a/maintenance/importDump.php +++ b/maintenance/importDump.php @@ -32,13 +32,13 @@ require_once( __DIR__ . '/Maintenance.php' ); * @ingroup Maintenance */ class BackupReader extends Maintenance { - var $reportingInterval = 100; - var $pageCount = 0; - var $revCount = 0; - var $dryRun = false; - var $uploads = false; - var $imageBasePath = false; - var $nsFilter = false; + public $reportingInterval = 100; + public $pageCount = 0; + public $revCount = 0; + public $dryRun = false; + public $uploads = false; + public $imageBasePath = false; + public $nsFilter = false; function __construct() { parent::__construct(); diff --git a/maintenance/jsparse.php b/maintenance/jsparse.php index ceafc3909a..1a2e121c0d 100644 --- a/maintenance/jsparse.php +++ b/maintenance/jsparse.php @@ -29,7 +29,7 @@ require_once( __DIR__ . '/Maintenance.php' ); * @ingroup Maintenance */ class JSParseHelper extends Maintenance { - var $errs = 0; + public $errs = 0; public function __construct() { parent::__construct(); diff --git a/maintenance/language/generateCollationData.php b/maintenance/language/generateCollationData.php index e34d9a1308..e2ad6a7112 100644 --- a/maintenance/language/generateCollationData.php +++ b/maintenance/language/generateCollationData.php @@ -30,19 +30,19 @@ require_once( __DIR__ .'/../Maintenance.php' ); */ class GenerateCollationData extends Maintenance { /** The directory with source data files in it */ - var $dataDir; + public $dataDir; /** The primary weights, indexed by codepoint */ - var $weights; + public $weights; /** * A hashtable keyed by codepoint, where presence indicates that a character * has a decomposition mapping. This makes it non-preferred for group header * selection. */ - var $mappedChars; + public $mappedChars; - var $debugOutFile; + public $debugOutFile; /** * Important tertiary weights from UTS #10 section 7.2 @@ -285,12 +285,12 @@ class GenerateCollationData extends Maintenance { } class UcdXmlReader { - var $fileName; - var $callback; - var $groupAttrs; - var $xml; - var $blocks = array(); - var $currentBlock; + public $fileName; + public $callback; + public $groupAttrs; + public $xml; + public $blocks = array(); + public $currentBlock; function __construct( $fileName ) { $this->fileName = $fileName; diff --git a/maintenance/language/generateNormalizerData.php b/maintenance/language/generateNormalizerData.php index 54dfa39a5d..33163d4939 100644 --- a/maintenance/language/generateNormalizerData.php +++ b/maintenance/language/generateNormalizerData.php @@ -32,7 +32,7 @@ require_once( __DIR__ . '/../../includes/normal/UtfNormalUtil.php' ); * @ingroup MaintenanceLanguage */ class GenerateNormalizerData extends Maintenance { - var $dataFile; + public $dataFile; public function __construct() { parent::__construct(); diff --git a/maintenance/minify.php b/maintenance/minify.php index 9f5a909d64..0846a64c08 100644 --- a/maintenance/minify.php +++ b/maintenance/minify.php @@ -29,7 +29,7 @@ require_once( __DIR__ . '/Maintenance.php' ); * @ingroup Maintenance */ class MinifyScript extends Maintenance { - var $outDir; + public $outDir; public function __construct() { parent::__construct(); diff --git a/maintenance/preprocessorFuzzTest.php b/maintenance/preprocessorFuzzTest.php index a53bc88c23..49c7aee3b9 100644 --- a/maintenance/preprocessorFuzzTest.php +++ b/maintenance/preprocessorFuzzTest.php @@ -26,7 +26,7 @@ require_once( __DIR__ . '/commandLine.inc' ); $wgHooks['BeforeParserFetchTemplateAndtitle'][] = 'PPFuzzTester::templateHook'; class PPFuzzTester { - var $hairs = array( + public $hairs = array( '[[', ']]', '{{', '{{', '}}', '}}', '{{{', '}}}', '<', '>', '', '', '', '', '', @@ -39,12 +39,12 @@ class PPFuzzTester { // extensions // '', '', '', ); - var $minLength = 0; - var $maxLength = 20; - var $maxTemplates = 5; - // var $outputTypes = array( 'OT_HTML', 'OT_WIKI', 'OT_PREPROCESS' ); - var $entryPoints = array( 'testSrvus', 'testPst', 'testPreprocess' ); - var $verbose = false; + public $minLength = 0; + public $maxLength = 20; + public $maxTemplates = 5; + // public $outputTypes = array( 'OT_HTML', 'OT_WIKI', 'OT_PREPROCESS' ); + public $entryPoints = array( 'testSrvus', 'testPst', 'testPreprocess' ); + public $verbose = false; static $currentTest = false; function execute() { @@ -140,7 +140,7 @@ class PPFuzzTester { } class PPFuzzTest { - var $templates, $mainText, $title, $entryPoint, $output; + public $templates, $mainText, $title, $entryPoint, $output; function __construct( $tester ) { global $wgMaxSigChars; @@ -219,7 +219,7 @@ class PPFuzzTest { } class PPFuzzUser extends User { - var $ppfz_test, $mDataLoaded; + public $ppfz_test, $mDataLoaded; function load() { if ( $this->mDataLoaded ) { diff --git a/maintenance/purgeParserCache.php b/maintenance/purgeParserCache.php index 1c417980eb..f067dc6a35 100644 --- a/maintenance/purgeParserCache.php +++ b/maintenance/purgeParserCache.php @@ -30,7 +30,7 @@ require( __DIR__ . '/Maintenance.php' ); * @ingroup Maintenance */ class PurgeParserCache extends Maintenance { - var $lastProgress; + public $lastProgress; function __construct() { parent::__construct(); diff --git a/maintenance/storage/checkStorage.php b/maintenance/storage/checkStorage.php index 6c669bfa07..0b6ecce7b6 100644 --- a/maintenance/storage/checkStorage.php +++ b/maintenance/storage/checkStorage.php @@ -42,10 +42,10 @@ if ( !defined( 'MEDIAWIKI' ) ) { */ class CheckStorage { const CONCAT_HEADER = 'O:27:"concatenatedgziphistoryblob"'; - var $oldIdMap, $errors; - var $dbStore = null; + public $oldIdMap, $errors; + public $dbStore = null; - var $errorDescriptions = array( + public $errorDescriptions = array( 'restore text' => 'Damaged text, need to be restored from a backup', 'restore revision' => 'Damaged revision row, need to be restored from a backup', 'unfixable' => 'Unexpected errors with no automated fixing method', diff --git a/maintenance/storage/fixBug20757.php b/maintenance/storage/fixBug20757.php index 52ee825cea..bda87ac434 100644 --- a/maintenance/storage/fixBug20757.php +++ b/maintenance/storage/fixBug20757.php @@ -24,10 +24,10 @@ require_once( __DIR__ . '/../Maintenance.php' ); class FixBug20757 extends Maintenance { - var $batchSize = 10000; - var $mapCache = array(); - var $mapCacheSize = 0; - var $maxMapCacheSize = 1000000; + public $batchSize = 10000; + public $mapCache = array(); + public $mapCacheSize = 0; + public $maxMapCacheSize = 1000000; function __construct() { parent::__construct(); diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php index 4098077f15..b5bdbf76b8 100644 --- a/maintenance/storage/recompressTracked.php +++ b/maintenance/storage/recompressTracked.php @@ -43,19 +43,19 @@ $job = RecompressTracked::newFromCommandLine( $args, $options ); $job->execute(); class RecompressTracked { - var $destClusters; - var $batchSize = 1000; - var $orphanBatchSize = 1000; - var $reportingInterval = 10; - var $numProcs = 1; - var $useDiff, $pageBlobClass, $orphanBlobClass; - var $slavePipes, $slaveProcs, $prevSlaveId; - var $copyOnly = false; - var $isChild = false; - var $slaveId = false; - var $noCount = false; - var $debugLog, $infoLog, $criticalLog; - var $store; + public $destClusters; + public $batchSize = 1000; + public $orphanBatchSize = 1000; + public $reportingInterval = 10; + public $numProcs = 1; + public $useDiff, $pageBlobClass, $orphanBlobClass; + public $slavePipes, $slaveProcs, $prevSlaveId; + public $copyOnly = false; + public $isChild = false; + public $slaveId = false; + public $noCount = false; + public $debugLog, $infoLog, $criticalLog; + public $store; static $optionsWithArgs = array( 'procs', 'slave-id', 'debug-log', 'info-log', 'critical-log' ); static $cmdLineOptionMap = array( @@ -670,10 +670,10 @@ class RecompressTracked { * Class to represent a recompression operation for a single CGZ blob */ class CgzCopyTransaction { - var $parent; - var $blobClass; - var $cgz; - var $referrers; + public $parent; + public $blobClass; + public $cgz; + public $referrers; /** * Create a transaction from a RecompressTracked object diff --git a/maintenance/storage/trackBlobs.php b/maintenance/storage/trackBlobs.php index 214168a831..2f3c8c6ab2 100644 --- a/maintenance/storage/trackBlobs.php +++ b/maintenance/storage/trackBlobs.php @@ -37,12 +37,12 @@ $tracker->run(); echo "All done.\n"; class TrackBlobs { - var $clusters, $textClause; - var $doBlobOrphans; - var $trackedBlobs = array(); + public $clusters, $textClause; + public $doBlobOrphans; + public $trackedBlobs = array(); - var $batchSize = 1000; - var $reportingInterval = 10; + public $batchSize = 1000; + public $reportingInterval = 10; function __construct( $clusters ) { $this->clusters = $clusters; diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php index b732508f12..04a2d47b72 100644 --- a/maintenance/updateCollation.php +++ b/maintenance/updateCollation.php @@ -38,7 +38,7 @@ class UpdateCollation extends Maintenance { const BATCH_SIZE = 50; // Number of rows to process in one batch const SYNC_INTERVAL = 20; // Wait for slaves after this many batches - var $sizeHistogram = array(); + public $sizeHistogram = array(); public function __construct() { parent::__construct(); -- 2.20.1