From beb1c4a0eced04ce2098433c383f1fbe469569c9 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 17 May 2013 02:16:59 +0200 Subject: [PATCH] phpcs: More require/include is not a function Follows-up I1343872de7, Ia533aedf63 and I2df2f80b81. Also updated usage in text in documentation and the installer LocalSettingsGenerator. Most of them were handled by this regex: - find: (require|include|require_once|include_once)\s*\(\s*(.+?)\s*\)\s*;$ - replace: $1 $2; Change-Id: I6b38aad9a5149c9c43ce18bd8edbab14b8ce43fa --- api.php | 4 +-- docs/hooks.txt | 2 +- docs/php-memcached/Documentation | 2 +- img_auth.php | 2 +- includes/Setup.php | 10 +++---- includes/installer/LocalSettingsGenerator.php | 2 +- includes/normal/README | 4 +-- includes/resourceloader/ResourceLoader.php | 2 +- index.php | 4 +-- languages/Language.php | 8 +++--- languages/classes/LanguageGan.php | 6 ++--- languages/classes/LanguageIu.php | 2 +- languages/classes/LanguageKk.php | 6 ++--- languages/classes/LanguageKu.php | 4 +-- languages/classes/LanguageShi.php | 2 +- languages/classes/LanguageSr.php | 6 ++--- languages/classes/LanguageTg.php | 2 +- languages/classes/LanguageUz.php | 2 +- languages/classes/LanguageZh.php | 6 ++--- load.php | 4 +-- maintenance/Maintenance.php | 6 ++--- maintenance/archives/upgradeLogging.php | 2 +- maintenance/attachLatest.php | 2 +- maintenance/backup.inc | 2 +- maintenance/backupTextPass.inc | 2 +- maintenance/benchmarks/Benchmarker.php | 2 +- maintenance/benchmarks/bench_HTTP_HTTPS.php | 2 +- .../benchmarks/bench_delete_truncate.php | 2 +- maintenance/benchmarks/bench_if_switch.php | 2 +- .../benchmarks/bench_strtr_str_replace.php | 2 +- .../benchmarks/bench_utf8_title_check.php | 2 +- .../benchmarks/bench_wfBaseConvert.php | 2 +- maintenance/benchmarks/bench_wfIsWindows.php | 2 +- maintenance/benchmarks/benchmarkHooks.php | 2 +- maintenance/benchmarks/benchmarkPurge.php | 2 +- maintenance/cdb.php | 2 +- maintenance/changePassword.php | 2 +- maintenance/checkBadRedirects.php | 2 +- maintenance/checkImages.php | 2 +- maintenance/checkSyntax.php | 2 +- maintenance/checkUsernames.php | 2 +- maintenance/cleanupAncientTables.php | 2 +- maintenance/cleanupCaps.php | 2 +- maintenance/cleanupImages.php | 2 +- maintenance/cleanupPreferences.php | 2 +- maintenance/cleanupRemovedModules.php | 2 +- maintenance/cleanupSpam.php | 2 +- maintenance/cleanupTable.inc | 2 +- maintenance/cleanupTitles.php | 2 +- maintenance/cleanupUploadStash.php | 2 +- maintenance/cleanupWatchlist.php | 2 +- maintenance/clearCacheStats.php | 2 +- maintenance/clearInterwikiCache.php | 2 +- maintenance/commandLine.inc | 4 +-- maintenance/compareParsers.php | 2 +- maintenance/convertLinks.php | 2 +- maintenance/convertUserOptions.php | 2 +- maintenance/copyFileBackend.php | 2 +- maintenance/copyJobQueue.php | 2 +- maintenance/createAndPromote.php | 2 +- maintenance/deleteArchivedFiles.php | 4 +-- maintenance/deleteArchivedRevisions.php | 4 +-- maintenance/deleteBatch.php | 2 +- maintenance/deleteDefaultMessages.php | 2 +- maintenance/deleteEqualMessages.php | 2 +- maintenance/deleteImageMemcached.php | 2 +- maintenance/deleteOldRevisions.php | 2 +- maintenance/deleteOrphanedRevisions.php | 2 +- maintenance/deleteRevision.php | 2 +- maintenance/deleteSelfExternals.php | 2 +- maintenance/dev/includes/router.php | 2 +- maintenance/doMaintenance.php | 20 +++++++------- maintenance/dumpBackup.php | 4 +-- maintenance/dumpIterator.php | 2 +- maintenance/dumpLinks.php | 2 +- maintenance/dumpSisterSites.php | 2 +- maintenance/dumpTextPass.php | 4 +-- maintenance/dumpUploads.php | 2 +- maintenance/edit.php | 2 +- maintenance/eval.php | 2 +- maintenance/fetchText.php | 2 +- maintenance/fileOpPerfTest.php | 2 +- maintenance/findHooks.php | 2 +- maintenance/fixDoubleRedirects.php | 2 +- maintenance/fixExtLinksProtocolRelative.php | 2 +- maintenance/fixSlaveDesync.php | 2 +- maintenance/fixTimestamps.php | 2 +- maintenance/fixUserRegistration.php | 2 +- maintenance/formatInstallDoc.php | 2 +- maintenance/fuzz-tester.php | 20 +++++++------- maintenance/generateSitemap.php | 2 +- maintenance/getConfiguration.php | 2 +- maintenance/getLagTimes.php | 2 +- maintenance/getSlaveServer.php | 2 +- maintenance/getText.php | 2 +- maintenance/hiphop/run-server | 2 +- maintenance/importDump.php | 2 +- maintenance/importImages.php | 4 +-- maintenance/importSiteScripts.php | 2 +- maintenance/importTextFile.php | 2 +- maintenance/initEditCount.php | 2 +- maintenance/initSiteStats.php | 2 +- maintenance/install.php | 4 +-- maintenance/jsparse.php | 2 +- maintenance/lag.php | 2 +- maintenance/language/alltrans.php | 2 +- maintenance/language/checkDupeMessages.php | 6 ++--- maintenance/language/checkExtensions.php | 2 +- maintenance/language/checkLanguage.php | 2 +- maintenance/language/countMessages.php | 4 +-- maintenance/language/date-formats.php | 2 +- maintenance/language/digit2html.php | 4 +-- maintenance/language/dumpMessages.php | 2 +- .../language/generateCollationData.php | 2 +- .../language/generateNormalizerData.php | 4 +-- maintenance/language/langmemusage.php | 4 +-- maintenance/language/languages.inc | 4 +-- maintenance/language/rebuildLanguage.php | 4 +-- maintenance/language/transstat.php | 4 +-- maintenance/language/validate.php | 6 ++--- maintenance/language/writeMessagesArray.inc | 4 +-- maintenance/mcc.php | 2 +- maintenance/mctest.php | 2 +- maintenance/mergeMessageFileList.php | 4 +-- maintenance/migrateUserGroup.php | 2 +- maintenance/minify.php | 2 +- maintenance/moveBatch.php | 2 +- maintenance/mwdocgen.php | 2 +- maintenance/namespaceDupes.php | 2 +- maintenance/nextJobDB.php | 2 +- maintenance/nukeNS.php | 2 +- maintenance/nukePage.php | 2 +- maintenance/oracle/alterSharedConstraints.php | 2 +- maintenance/orphans.php | 2 +- maintenance/parse.php | 2 +- maintenance/patchSql.php | 2 +- maintenance/populateCategory.php | 2 +- maintenance/populateFilearchiveSha1.php | 2 +- maintenance/populateImageSha1.php | 2 +- maintenance/populateLogSearch.php | 2 +- maintenance/populateLogUsertext.php | 2 +- maintenance/populateParentId.php | 2 +- maintenance/populateRevisionLength.php | 2 +- maintenance/populateRevisionSha1.php | 2 +- maintenance/preprocessDump.php | 2 +- maintenance/preprocessorFuzzTest.php | 2 +- maintenance/protect.php | 2 +- maintenance/pruneFileCache.php | 2 +- maintenance/purgeDeletedFiles.php | 2 +- maintenance/purgeList.php | 2 +- maintenance/purgeOldText.php | 2 +- maintenance/purgeParserCache.php | 2 +- maintenance/reassignEdits.php | 2 +- maintenance/rebuildFileCache.php | 2 +- maintenance/rebuildImages.php | 2 +- maintenance/rebuildLocalisationCache.php | 2 +- maintenance/rebuildall.php | 2 +- maintenance/rebuildmessages.php | 2 +- maintenance/rebuildrecentchanges.php | 2 +- maintenance/rebuildtextindex.php | 2 +- maintenance/refreshFileHeaders.php | 2 +- maintenance/refreshImageMetadata.php | 2 +- maintenance/refreshLinks.php | 2 +- maintenance/removeUnusedAccounts.php | 2 +- maintenance/renameDbPrefix.php | 2 +- maintenance/renderDump.php | 2 +- maintenance/resetUserTokens.php | 2 +- maintenance/rollbackEdits.php | 2 +- maintenance/runBatchedQuery.php | 2 +- maintenance/runJobs.php | 2 +- maintenance/showCacheStats.php | 2 +- maintenance/showJobs.php | 2 +- maintenance/showSiteStats.php | 2 +- maintenance/sql.php | 2 +- maintenance/sqlite.php | 2 +- maintenance/storage/checkStorage.php | 2 +- maintenance/storage/compressOld.php | 2 +- maintenance/storage/dumpRev.php | 2 +- maintenance/storage/fixBug20757.php | 2 +- maintenance/storage/moveToExternal.php | 4 +-- maintenance/storage/orphanStats.php | 2 +- maintenance/storage/recompressTracked.php | 2 +- maintenance/storage/resolveStubs.php | 2 +- maintenance/storage/storageTypeStats.php | 2 +- maintenance/storage/testCompression.php | 2 +- maintenance/storage/trackBlobs.php | 2 +- maintenance/syncFileBackend.php | 2 +- maintenance/undelete.php | 2 +- maintenance/update.php | 4 +-- maintenance/updateArticleCount.php | 2 +- maintenance/updateCollation.php | 2 +- maintenance/updateDoubleWidthSearch.php | 2 +- maintenance/updateRestrictions.php | 2 +- maintenance/updateSearchIndex.php | 2 +- maintenance/updateSpecialPages.php | 6 ++--- maintenance/userOptions.inc | 2 +- maintenance/waitForSlave.php | 2 +- mw-config/index.php | 2 +- opensearch_desc.php | 2 +- profileinfo.php | 2 +- serialized/serialize.php | 4 +-- tests/RunSeleniumTests.php | 6 ++--- tests/parserTests.php | 4 +-- tests/phpunit/bootstrap.php | 2 +- .../includes/api/generateRandomImages.php | 6 ++--- tests/phpunit/includes/media/XMPTest.php | 2 +- .../includes/parser/MediaWikiParserTest.php | 2 +- tests/phpunit/phpunit.php | 6 ++--- .../phpunit/suites/UploadFromUrlTestSuite.php | 2 +- tests/qunit/data/generateJqueryMsgData.php | 2 +- .../MediaWikiButtonsAvailabilityTestCase.php | 2 +- ...iaWikiDifferentDatabaseAccountTestCase.php | 2 +- ...ediaWikiDifferntDatabasePrefixTestCase.php | 2 +- ...ikiErrorsConnectToDatabasePageTestCase.php | 2 +- .../MediaWikiErrorsNamepageTestCase.php | 2 +- .../MediaWikiHelpFieldHintTestCase.php | 2 +- .../MediaWikiInstallationCommonFunction.php | 6 ++--- .../installer/MediaWikiInstallerTestSuite.php | 26 +++++++++---------- .../MediaWikiMySQLDataBaseTestCase.php | 2 +- .../MediaWikiMySQLiteDataBaseTestCase.php | 2 +- .../MediaWikiOnAlreadyInstalledTestCase.php | 2 +- .../MediaWikiRestartInstallationTestCase.php | 2 +- .../MediaWikiRightFrameworkLinksTestCase.php | 2 +- ...diaWikiUpgradeExistingDatabaseTestCase.php | 2 +- .../MediaWikiUserInterfaceTestCase.php | 2 +- .../suites/SimpleSeleniumTestSuite.php | 2 +- thumb_handler.php | 2 +- wiki.phtml | 2 +- 228 files changed, 314 insertions(+), 314 deletions(-) diff --git a/api.php b/api.php index 9d7f6480ed..8fab878cfa 100644 --- a/api.php +++ b/api.php @@ -36,12 +36,12 @@ define( 'MW_API', true ); // Bail if PHP is too low if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) { // We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+ - require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' ); + require dirname( __FILE__ ) . '/includes/PHPVersionError.php'; wfPHPVersionError( 'api.php' ); } // Initialise common code. -require ( __DIR__ . '/includes/WebStart.php' ); +require __DIR__ . '/includes/WebStart.php'; wfProfileIn( 'api.php' ); $starttime = microtime( true ); diff --git a/docs/hooks.txt b/docs/hooks.txt index f94a1b002e..a6fa9fed76 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -120,7 +120,7 @@ If the code is well enough isolated, it can even be excluded when not used -- making for some slight savings in memory and load-up performance at runtime. Admins who want to have all the reversed titles can add: - require_once('extensions/ReverseTitle.php'); + require_once 'extensions/ReverseTitle.php'; ...to their LocalSettings.php file; those of us who don't want or need it can just leave it out. diff --git a/docs/php-memcached/Documentation b/docs/php-memcached/Documentation index c9056053ae..32e340ac31 100644 --- a/docs/php-memcached/Documentation +++ b/docs/php-memcached/Documentation @@ -163,7 +163,7 @@ MemCacheClient::set_compression($setting) EXAMPLE: extensions as $extName ) { $encExtName = self::escapePhpString( $extName ); - $localSettings .= "require_once( \"\$IP/extensions/$encExtName/$encExtName.php\" );\n"; + $localSettings .= "require_once \"\$IP/extensions/$encExtName/$encExtName.php\";\n"; } } diff --git a/includes/normal/README b/includes/normal/README index b82eb93f8d..99e749b60e 100644 --- a/includes/normal/README +++ b/includes/normal/README @@ -54,6 +54,6 @@ been thoroughly tested on other configurations. If the php_normal.so module is loaded in php.ini, the normalization functions will automatically use it. If you can't (or don't want to) load it in php.ini, -you may be able to load it using the dl() function before include()ing or -require()ing UtfNormal.php, and it will be picked up. +you may be able to load it using the dl() function before the inclusion of +UtfNormal.php, and it will be picked up. diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index e4fd982ece..543bd1d300 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -202,7 +202,7 @@ class ResourceLoader { $this->addSource( $wgResourceLoaderSources ); // Register core modules - $this->register( include( "$IP/resources/Resources.php" ) ); + $this->register( include "$IP/resources/Resources.php" ); // Register extension modules wfRunHooks( 'ResourceLoaderRegisterModules', array( &$this ) ); $this->register( $wgResourceModules ); diff --git a/index.php b/index.php index 6039769496..ff71c202af 100644 --- a/index.php +++ b/index.php @@ -42,14 +42,14 @@ # 5.1, respectively. if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) { // We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+ - require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' ); + require dirname( __FILE__ ) . '/includes/PHPVersionError.php'; wfPHPVersionError( 'index.php' ); } # Initialise common code. This gives us access to GlobalFunctions, the # AutoLoader, and the globals $wgRequest, $wgOut, $wgUser, $wgLang and # $wgContLang, amongst others; it does *not* load $wgTitle -require ( __DIR__ . '/includes/WebStart.php' ); +require __DIR__ . '/includes/WebStart.php'; $mediaWiki = new MediaWiki(); $mediaWiki->run(); diff --git a/languages/Language.php b/languages/Language.php index 137b9a97cc..c73ccd1eab 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -32,7 +32,7 @@ if ( !defined( 'MEDIAWIKI' ) ) { # Read language names global $wgLanguageNames; -require_once( __DIR__ . '/Names.php' ); +require_once __DIR__ . '/Names.php'; if ( function_exists( 'mb_strtoupper' ) ) { mb_internal_encoding( 'UTF-8' ); @@ -378,7 +378,7 @@ class Language { static $coreLanguageNames; if ( $coreLanguageNames === null ) { - include( MWInit::compiledPath( 'languages/Names.php' ) ); + include MWInit::compiledPath( 'languages/Names.php' ); } if ( isset( $coreLanguageNames[$tag] ) @@ -415,7 +415,7 @@ class Language { } if ( file_exists( "$IP/languages/classes/$class.php" ) ) { - include_once( "$IP/languages/classes/$class.php" ); + include_once "$IP/languages/classes/$class.php"; } } @@ -849,7 +849,7 @@ class Language { static $coreLanguageNames; if ( $coreLanguageNames === null ) { - include( MWInit::compiledPath( 'languages/Names.php' ) ); + include MWInit::compiledPath( 'languages/Names.php' ); } $names = array(); diff --git a/languages/classes/LanguageGan.php b/languages/classes/LanguageGan.php index d941d67cf0..d81574d100 100644 --- a/languages/classes/LanguageGan.php +++ b/languages/classes/LanguageGan.php @@ -21,8 +21,8 @@ * @ingroup Language */ -require_once( __DIR__ . '/../LanguageConverter.php' ); -require_once( __DIR__ . '/LanguageZh.php' ); +require_once __DIR__ . '/../LanguageConverter.php'; +require_once __DIR__ . '/LanguageZh.php'; /** * @ingroup Language @@ -58,7 +58,7 @@ class GanConverter extends LanguageConverter { } function loadDefaultTables() { - require( __DIR__ . "/../../includes/ZhConversion.php" ); + require __DIR__ . '/../../includes/ZhConversion.php'; $this->mTables = array( 'gan-hans' => new ReplacementArray( $zh2Hans ), 'gan-hant' => new ReplacementArray( $zh2Hant ), diff --git a/languages/classes/LanguageIu.php b/languages/classes/LanguageIu.php index 4c2d21e32c..abd2e7c895 100644 --- a/languages/classes/LanguageIu.php +++ b/languages/classes/LanguageIu.php @@ -21,7 +21,7 @@ * @ingroup Language */ -require_once( __DIR__ . '/../LanguageConverter.php' ); +require_once __DIR__ . '/../LanguageConverter.php'; /** * Conversion script between Latin and Syllabics for Inuktitut. diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php index c0bdc3f8f0..f96b0d92a4 100644 --- a/languages/classes/LanguageKk.php +++ b/languages/classes/LanguageKk.php @@ -21,8 +21,8 @@ * @ingroup Language */ -require_once( __DIR__ . '/../LanguageConverter.php' ); -require_once( __DIR__ . '/LanguageKk_cyrl.php' ); +require_once __DIR__ . '/../LanguageConverter.php'; +require_once __DIR__ . '/LanguageKk_cyrl.php'; define( 'KK_C_UC', 'АӘБВГҒДЕЁЖЗИЙКҚЛМНҢОӨПРСТУҰҮФХҺЦЧШЩЪЫІЬЭЮЯ' ); # Kazakh Cyrillic uppercase define( 'KK_C_LC', 'аәбвгғдеёжзийкқлмнңоөпрстуұүфхһцчшщъыіьэюя' ); # Kazakh Cyrillic lowercase @@ -62,7 +62,7 @@ class KkConverter extends LanguageConverter { } function loadDefaultTables() { - // require( __DIR__."/../../includes/KkConversion.php" ); + // require __DIR__."/../../includes/KkConversion.php"; // Placeholder for future implementing. Remove variables declarations // after generating KkConversion.php $kk2Cyrl = array(); diff --git a/languages/classes/LanguageKu.php b/languages/classes/LanguageKu.php index e4290ce804..75ac1c77e3 100644 --- a/languages/classes/LanguageKu.php +++ b/languages/classes/LanguageKu.php @@ -21,8 +21,8 @@ * @ingroup Language */ -require_once( __DIR__ . '/../LanguageConverter.php' ); -require_once( __DIR__ . '/LanguageKu_ku.php' ); +require_once __DIR__ . '/../LanguageConverter.php'; +require_once __DIR__ . '/LanguageKu_ku.php'; /** * Kurdish converter routines diff --git a/languages/classes/LanguageShi.php b/languages/classes/LanguageShi.php index ff0181e087..f4180cb8fb 100644 --- a/languages/classes/LanguageShi.php +++ b/languages/classes/LanguageShi.php @@ -21,7 +21,7 @@ * @ingroup Language */ -require_once( __DIR__ . '/../LanguageConverter.php' ); +require_once __DIR__ . '/../LanguageConverter.php'; /** * Conversion script between Latin and Tifinagh for Tachelhit. diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php index 7c5c683e54..e8811ac7a1 100644 --- a/languages/classes/LanguageSr.php +++ b/languages/classes/LanguageSr.php @@ -21,9 +21,9 @@ * @ingroup Language */ -require_once( __DIR__ . '/../LanguageConverter.php' ); -require_once( __DIR__ . '/LanguageSr_ec.php' ); -require_once( __DIR__ . '/LanguageSr_el.php' ); +require_once __DIR__ . '/../LanguageConverter.php'; +require_once __DIR__ . '/LanguageSr_ec.php'; +require_once __DIR__ . '/LanguageSr_el.php'; /** * There are two levels of conversion for Serbian: the script level diff --git a/languages/classes/LanguageTg.php b/languages/classes/LanguageTg.php index 8c82837f24..10755b48de 100644 --- a/languages/classes/LanguageTg.php +++ b/languages/classes/LanguageTg.php @@ -21,7 +21,7 @@ * @ingroup Language */ -require_once( __DIR__ . '/../LanguageConverter.php' ); +require_once __DIR__ . '/../LanguageConverter.php'; /** * Converts Tajiki to latin orthography diff --git a/languages/classes/LanguageUz.php b/languages/classes/LanguageUz.php index d9154f76f1..aa3e4f24af 100644 --- a/languages/classes/LanguageUz.php +++ b/languages/classes/LanguageUz.php @@ -21,7 +21,7 @@ * @ingroup Language */ -require_once( __DIR__ . '/../LanguageConverter.php' ); +require_once __DIR__ . '/../LanguageConverter.php'; /** * @ingroup Language diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php index 31731e788c..d4130183c5 100644 --- a/languages/classes/LanguageZh.php +++ b/languages/classes/LanguageZh.php @@ -21,8 +21,8 @@ * @ingroup Language */ -require_once( __DIR__ . '/../LanguageConverter.php' ); -require_once( __DIR__ . '/LanguageZh_hans.php' ); +require_once __DIR__ . '/../LanguageConverter.php'; +require_once __DIR__ . '/LanguageZh_hans.php'; /** * @ingroup Language @@ -64,7 +64,7 @@ class ZhConverter extends LanguageConverter { } function loadDefaultTables() { - require( __DIR__ . "/../../includes/ZhConversion.php" ); + require __DIR__ . "/../../includes/ZhConversion.php"; $this->mTables = array( 'zh-hans' => new ReplacementArray( $zh2Hans ), 'zh-hant' => new ReplacementArray( $zh2Hant ), diff --git a/load.php b/load.php index d3e980fe83..1790f4833d 100644 --- a/load.php +++ b/load.php @@ -25,11 +25,11 @@ // Bail if PHP is too low if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) { // We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+ - require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' ); + require dirname( __FILE__ ) . '/includes/PHPVersionError.php'; wfPHPVersionError( 'load.php' ); } -require ( __DIR__ . '/includes/WebStart.php' ); +require __DIR__ . '/includes/WebStart.php'; wfProfileIn( 'load.php' ); diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index 94f94022db..98b7d471aa 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -23,7 +23,7 @@ // Make sure we're on PHP5.3.2 or better if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.3.2' ) < 0 ) { // We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+ - require_once( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' ); + require_once dirname( __FILE__ ) . '/../includes/PHPVersionError.php'; wfPHPVersionError( 'cli' ); } @@ -454,7 +454,7 @@ abstract class Maintenance { // Make sure the class is loaded first if ( !MWInit::classExists( $maintClass ) ) { if ( $classFile ) { - require_once( $classFile ); + require_once $classFile; } if ( !MWInit::classExists( $maintClass ) ) { $this->error( "Cannot spawn child: $maintClass" ); @@ -1026,7 +1026,7 @@ abstract class Maintenance { ( strpos( file_get_contents( $file ), '$maintClass' ) === false ) ) { continue; } - require( $file ); + require $file; $vars = get_defined_vars(); if ( array_key_exists( 'maintClass', $vars ) ) { self::$mCoreScripts[$vars['maintClass']] = $file; diff --git a/maintenance/archives/upgradeLogging.php b/maintenance/archives/upgradeLogging.php index f080645892..0749bbf64b 100644 --- a/maintenance/archives/upgradeLogging.php +++ b/maintenance/archives/upgradeLogging.php @@ -21,7 +21,7 @@ * @ingroup MaintenanceArchive */ -require( __DIR__ . '/../commandLine.inc' ); +require __DIR__ . '/../commandLine.inc'; /** * Maintenance script that upgrade for log_id/log_deleted fields in a diff --git a/maintenance/attachLatest.php b/maintenance/attachLatest.php index cb480c27b8..2cf277fe24 100644 --- a/maintenance/attachLatest.php +++ b/maintenance/attachLatest.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to correct wrong values in the `page_latest` field diff --git a/maintenance/backup.inc b/maintenance/backup.inc index bcd59f1525..db045cf2d6 100644 --- a/maintenance/backup.inc +++ b/maintenance/backup.inc @@ -116,7 +116,7 @@ class BackupDumper { */ function loadPlugin( $class, $file ) { if ( $file != '' ) { - require_once( $file ); + require_once $file; } $register = array( $class, 'register' ); call_user_func_array( $register, array( &$this ) ); diff --git a/maintenance/backupTextPass.inc b/maintenance/backupTextPass.inc index 547abab1b1..c5e48f4cc4 100644 --- a/maintenance/backupTextPass.inc +++ b/maintenance/backupTextPass.inc @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/backup.inc' ); +require_once __DIR__ . '/backup.inc'; /** * @ingroup Maintenance diff --git a/maintenance/benchmarks/Benchmarker.php b/maintenance/benchmarks/Benchmarker.php index 9fb39fbd1d..dd558f3232 100644 --- a/maintenance/benchmarks/Benchmarker.php +++ b/maintenance/benchmarks/Benchmarker.php @@ -27,7 +27,7 @@ * @ingroup Benchmark */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Base class for benchmark scripts. diff --git a/maintenance/benchmarks/bench_HTTP_HTTPS.php b/maintenance/benchmarks/bench_HTTP_HTTPS.php index aa477840a7..6f800fb300 100644 --- a/maintenance/benchmarks/bench_HTTP_HTTPS.php +++ b/maintenance/benchmarks/bench_HTTP_HTTPS.php @@ -24,7 +24,7 @@ * @author Platonides */ -require_once( __DIR__ . '/Benchmarker.php' ); +require_once __DIR__ . '/Benchmarker.php'; /** * Maintenance script that benchmarks HTTP request vs HTTPS request. diff --git a/maintenance/benchmarks/bench_delete_truncate.php b/maintenance/benchmarks/bench_delete_truncate.php index d86fec6520..3eff534b92 100644 --- a/maintenance/benchmarks/bench_delete_truncate.php +++ b/maintenance/benchmarks/bench_delete_truncate.php @@ -21,7 +21,7 @@ * @ingroup Benchmark */ -require_once( __DIR__ . '/Benchmarker.php' ); +require_once __DIR__ . '/Benchmarker.php'; /** * Maintenance script that benchmarks SQL DELETE vs SQL TRUNCATE. diff --git a/maintenance/benchmarks/bench_if_switch.php b/maintenance/benchmarks/bench_if_switch.php index c6ef3e4311..80fd9623e9 100644 --- a/maintenance/benchmarks/bench_if_switch.php +++ b/maintenance/benchmarks/bench_if_switch.php @@ -24,7 +24,7 @@ * @author Platonides */ -require_once( __DIR__ . '/Benchmarker.php' ); +require_once __DIR__ . '/Benchmarker.php'; /** * Maintenance script that benchmark if elseif... versus switch case. diff --git a/maintenance/benchmarks/bench_strtr_str_replace.php b/maintenance/benchmarks/bench_strtr_str_replace.php index 4d6bc351fe..bd21b186a3 100644 --- a/maintenance/benchmarks/bench_strtr_str_replace.php +++ b/maintenance/benchmarks/bench_strtr_str_replace.php @@ -23,7 +23,7 @@ * @ingroup Benchmark */ -require_once( __DIR__ . '/Benchmarker.php' ); +require_once __DIR__ . '/Benchmarker.php'; function bfNormalizeTitleStrTr( $str ) { return strtr( $str, '_', ' ' ); diff --git a/maintenance/benchmarks/bench_utf8_title_check.php b/maintenance/benchmarks/bench_utf8_title_check.php index 86d4808b50..078293eb77 100644 --- a/maintenance/benchmarks/bench_utf8_title_check.php +++ b/maintenance/benchmarks/bench_utf8_title_check.php @@ -21,7 +21,7 @@ * @ingroup Benchmark */ -require_once( __DIR__ . '/Benchmarker.php' ); +require_once __DIR__ . '/Benchmarker.php'; /** * This little benchmark executes the regexp used in Language->checkTitleEncoding() diff --git a/maintenance/benchmarks/bench_wfBaseConvert.php b/maintenance/benchmarks/bench_wfBaseConvert.php index 151d25a30f..f8a2156206 100644 --- a/maintenance/benchmarks/bench_wfBaseConvert.php +++ b/maintenance/benchmarks/bench_wfBaseConvert.php @@ -22,7 +22,7 @@ * @author Tyler Romeo */ -require_once( __DIR__ . '/Benchmarker.php' ); +require_once __DIR__ . '/Benchmarker.php'; /** * Maintenance script that benchmarks wfBaseConvert(). diff --git a/maintenance/benchmarks/bench_wfIsWindows.php b/maintenance/benchmarks/bench_wfIsWindows.php index 34b02a8ad3..1cd2016ba9 100644 --- a/maintenance/benchmarks/bench_wfIsWindows.php +++ b/maintenance/benchmarks/bench_wfIsWindows.php @@ -24,7 +24,7 @@ * @author Platonides */ -require_once( __DIR__ . '/Benchmarker.php' ); +require_once __DIR__ . '/Benchmarker.php'; /** * Maintenance script that benchmarks wfIsWindows(). diff --git a/maintenance/benchmarks/benchmarkHooks.php b/maintenance/benchmarks/benchmarkHooks.php index 531fa3181d..3f5d6db0d9 100644 --- a/maintenance/benchmarks/benchmarkHooks.php +++ b/maintenance/benchmarks/benchmarkHooks.php @@ -21,7 +21,7 @@ * @ingroup Benchmark */ -require_once( __DIR__ . '/Benchmarker.php' ); +require_once __DIR__ . '/Benchmarker.php'; /** * Maintenance script that benchmarks %MediaWiki hooks. diff --git a/maintenance/benchmarks/benchmarkPurge.php b/maintenance/benchmarks/benchmarkPurge.php index 0932ee5434..fd863d52e2 100644 --- a/maintenance/benchmarks/benchmarkPurge.php +++ b/maintenance/benchmarks/benchmarkPurge.php @@ -21,7 +21,7 @@ * @ingroup Benchmark */ -require_once( __DIR__ . '/Benchmarker.php' ); +require_once __DIR__ . '/Benchmarker.php'; /** * Maintenance script that benchmarks Squid purge. diff --git a/maintenance/cdb.php b/maintenance/cdb.php index 9e56e1beb1..d42f9f7a88 100644 --- a/maintenance/cdb.php +++ b/maintenance/cdb.php @@ -23,7 +23,7 @@ */ /** */ -require_once( __DIR__ . '/commandLine.inc' ); +require_once __DIR__ . '/commandLine.inc'; function cdbShowHelp( $command ) { $commandList = array( diff --git a/maintenance/changePassword.php b/maintenance/changePassword.php index bf068628e8..5d98e1f57e 100644 --- a/maintenance/changePassword.php +++ b/maintenance/changePassword.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to change the password of a given user. diff --git a/maintenance/checkBadRedirects.php b/maintenance/checkBadRedirects.php index 2db8219ebf..a96e9b80da 100644 --- a/maintenance/checkBadRedirects.php +++ b/maintenance/checkBadRedirects.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to check that pages marked as being redirects really are. diff --git a/maintenance/checkImages.php b/maintenance/checkImages.php index b5faf2e707..e6aea53764 100644 --- a/maintenance/checkImages.php +++ b/maintenance/checkImages.php @@ -20,7 +20,7 @@ * @file * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to check images to see if they exist, are readable, etc. diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php index 0d701ebd94..dc8626dfea 100644 --- a/maintenance/checkSyntax.php +++ b/maintenance/checkSyntax.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to check syntax of all PHP files in MediaWiki. diff --git a/maintenance/checkUsernames.php b/maintenance/checkUsernames.php index 8db39363bc..7deca8017d 100644 --- a/maintenance/checkUsernames.php +++ b/maintenance/checkUsernames.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to check that database usernames are actually valid. diff --git a/maintenance/cleanupAncientTables.php b/maintenance/cleanupAncientTables.php index 9c6ad8fbf3..694efaa64d 100644 --- a/maintenance/cleanupAncientTables.php +++ b/maintenance/cleanupAncientTables.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to cleans up old database tables, dropping old indexes diff --git a/maintenance/cleanupCaps.php b/maintenance/cleanupCaps.php index 8a5e778c29..1a47ac4e52 100644 --- a/maintenance/cleanupCaps.php +++ b/maintenance/cleanupCaps.php @@ -29,7 +29,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/cleanupTable.inc' ); +require_once __DIR__ . '/cleanupTable.inc'; /** * Maintenance script to clean up broken page links when somebody turns on $wgCapitalLinks. diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php index 42cae2ad22..0e0b6194a0 100644 --- a/maintenance/cleanupImages.php +++ b/maintenance/cleanupImages.php @@ -29,7 +29,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/cleanupTable.inc' ); +require_once __DIR__ . '/cleanupTable.inc'; /** * Maintenance script to clean up broken, unparseable upload filenames. diff --git a/maintenance/cleanupPreferences.php b/maintenance/cleanupPreferences.php index 0a89e3a266..06ae17fbcb 100644 --- a/maintenance/cleanupPreferences.php +++ b/maintenance/cleanupPreferences.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that removes hidden preferences from the database. diff --git a/maintenance/cleanupRemovedModules.php b/maintenance/cleanupRemovedModules.php index 5713948bf5..84eec28969 100644 --- a/maintenance/cleanupRemovedModules.php +++ b/maintenance/cleanupRemovedModules.php @@ -22,7 +22,7 @@ * @author Roan Kattouw */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to remove cache entries for removed ResourceLoader modules diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php index 78ea0de89d..4b8c9feb18 100644 --- a/maintenance/cleanupSpam.php +++ b/maintenance/cleanupSpam.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to cleanup all spam from a given hostname. diff --git a/maintenance/cleanupTable.inc b/maintenance/cleanupTable.inc index 57acfd8211..410a55cb23 100644 --- a/maintenance/cleanupTable.inc +++ b/maintenance/cleanupTable.inc @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Generic class to cleanup a database table. Already subclasses Maintenance. diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php index 57eb2b7c6a..895254fb03 100644 --- a/maintenance/cleanupTitles.php +++ b/maintenance/cleanupTitles.php @@ -29,7 +29,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/cleanupTable.inc' ); +require_once __DIR__ . '/cleanupTable.inc'; /** * Maintenance script to clean up broken, unparseable titles. diff --git a/maintenance/cleanupUploadStash.php b/maintenance/cleanupUploadStash.php index e87e7eec2d..9dd62a31bc 100644 --- a/maintenance/cleanupUploadStash.php +++ b/maintenance/cleanupUploadStash.php @@ -25,7 +25,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to remove old or broken uploads from temporary uploaded diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php index 62c7d2f35c..f1a7b481ac 100644 --- a/maintenance/cleanupWatchlist.php +++ b/maintenance/cleanupWatchlist.php @@ -29,7 +29,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/cleanupTable.inc' ); +require_once __DIR__ . '/cleanupTable.inc'; /** * Maintenance script to remove broken, unparseable titles in the watchlist table. diff --git a/maintenance/clearCacheStats.php b/maintenance/clearCacheStats.php index c7f2ce0639..6a96612154 100644 --- a/maintenance/clearCacheStats.php +++ b/maintenance/clearCacheStats.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to remove all statistics tracking from the cache. diff --git a/maintenance/clearInterwikiCache.php b/maintenance/clearInterwikiCache.php index 1e1f547b93..80c9004e43 100644 --- a/maintenance/clearInterwikiCache.php +++ b/maintenance/clearInterwikiCache.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to clear the cache of interwiki prefixes for all local wikis. diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc index 86a558d0e1..be07142208 100644 --- a/maintenance/commandLine.inc +++ b/maintenance/commandLine.inc @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; global $optionsWithArgs; if ( !isset( $optionsWithArgs ) ) { @@ -55,5 +55,5 @@ class CommandLineInc extends Maintenance { } $maintClass = 'CommandLineInc'; -require( RUN_MAINTENANCE_IF_MAIN ); +require RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/compareParsers.php b/maintenance/compareParsers.php index 1fdd00b5fc..fabc257133 100644 --- a/maintenance/compareParsers.php +++ b/maintenance/compareParsers.php @@ -28,7 +28,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/dumpIterator.php' ); +require_once __DIR__ . '/dumpIterator.php'; /** * Maintenance script to take page text out of an XML dump file and render diff --git a/maintenance/convertLinks.php b/maintenance/convertLinks.php index f87f7624cd..17b911108b 100644 --- a/maintenance/convertLinks.php +++ b/maintenance/convertLinks.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to convert from the old links schema (string->ID) diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php index d39b040c62..34c643bbaa 100644 --- a/maintenance/convertUserOptions.php +++ b/maintenance/convertUserOptions.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to convert user options to the new `user_properties` table. diff --git a/maintenance/copyFileBackend.php b/maintenance/copyFileBackend.php index 1c592a9c10..1ccd1217b3 100644 --- a/maintenance/copyFileBackend.php +++ b/maintenance/copyFileBackend.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Copy all files in one container of one backend to another. diff --git a/maintenance/copyJobQueue.php b/maintenance/copyJobQueue.php index c91264ce21..e833115ba9 100644 --- a/maintenance/copyJobQueue.php +++ b/maintenance/copyJobQueue.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Copy all jobs from one job queue system to another. diff --git a/maintenance/createAndPromote.php b/maintenance/createAndPromote.php index 92d3a48e7b..03e690475a 100644 --- a/maintenance/createAndPromote.php +++ b/maintenance/createAndPromote.php @@ -23,7 +23,7 @@ * @author Pablo Castellano */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to create an account and grant it administrator rights. diff --git a/maintenance/deleteArchivedFiles.php b/maintenance/deleteArchivedFiles.php index ca1062cf0f..ad7b54d078 100644 --- a/maintenance/deleteArchivedFiles.php +++ b/maintenance/deleteArchivedFiles.php @@ -24,8 +24,8 @@ * @author Aaron Schulz */ -require_once( __DIR__ . '/Maintenance.php' ); -require_once( __DIR__ . '/deleteArchivedFiles.inc' ); +require_once __DIR__ . '/Maintenance.php'; +require_once __DIR__ . '/deleteArchivedFiles.inc'; /** * Maintenance script to delete archived (non-current) files from the database. diff --git a/maintenance/deleteArchivedRevisions.php b/maintenance/deleteArchivedRevisions.php index 18e0d350bb..ffd581c18a 100644 --- a/maintenance/deleteArchivedRevisions.php +++ b/maintenance/deleteArchivedRevisions.php @@ -24,8 +24,8 @@ * @author Aaron Schulz */ -require_once( __DIR__ . '/Maintenance.php' ); -require_once( __DIR__ . '/deleteArchivedRevisions.inc' ); +require_once __DIR__ . '/Maintenance.php'; +require_once __DIR__ . '/deleteArchivedRevisions.inc'; /** * Maintenance script to delete archived (deleted from public) revisions diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php index de57e30f36..c1cc03cdc2 100644 --- a/maintenance/deleteBatch.php +++ b/maintenance/deleteBatch.php @@ -28,7 +28,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to delete a batch of pages. diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php index 366e4fbc37..7d8c80e497 100644 --- a/maintenance/deleteDefaultMessages.php +++ b/maintenance/deleteDefaultMessages.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that deletes all pages in the MediaWiki namespace diff --git a/maintenance/deleteEqualMessages.php b/maintenance/deleteEqualMessages.php index fd289a4285..1e36363919 100644 --- a/maintenance/deleteEqualMessages.php +++ b/maintenance/deleteEqualMessages.php @@ -19,7 +19,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that deletes all pages in the MediaWiki namespace diff --git a/maintenance/deleteImageMemcached.php b/maintenance/deleteImageMemcached.php index 5d967a0c7f..835de352d2 100644 --- a/maintenance/deleteImageMemcached.php +++ b/maintenance/deleteImageMemcached.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that deletes image information from the object cache. diff --git a/maintenance/deleteOldRevisions.php b/maintenance/deleteOldRevisions.php index ab8a382665..847d863412 100644 --- a/maintenance/deleteOldRevisions.php +++ b/maintenance/deleteOldRevisions.php @@ -22,7 +22,7 @@ * @author Rob Church */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that deletes old (non-current) revisions from the database. diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php index 73b57b345a..f0a9692805 100644 --- a/maintenance/deleteOrphanedRevisions.php +++ b/maintenance/deleteOrphanedRevisions.php @@ -24,7 +24,7 @@ * @todo More efficient cleanup of text records */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that deletes revisions which refer to a nonexisting page. diff --git a/maintenance/deleteRevision.php b/maintenance/deleteRevision.php index 2641cd8922..6bc0f7cd01 100644 --- a/maintenance/deleteRevision.php +++ b/maintenance/deleteRevision.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that deletes one or more revisions by moving them diff --git a/maintenance/deleteSelfExternals.php b/maintenance/deleteSelfExternals.php index f94b1abd5e..a097622815 100644 --- a/maintenance/deleteSelfExternals.php +++ b/maintenance/deleteSelfExternals.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that deletes self-references to $wgServer diff --git a/maintenance/dev/includes/router.php b/maintenance/dev/includes/router.php index d277e577ef..a3cc0ba3f8 100644 --- a/maintenance/dev/includes/router.php +++ b/maintenance/dev/includes/router.php @@ -58,7 +58,7 @@ if ( $ext == 'php' || $ext == 'php5' ) { # We use require and return true here because when you return false # the php webserver will discard post data and things like login # will not function in the dev environment. - require( $file ); + require $file; return true; } $mime = false; diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index f471d50b0c..10984b0621 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -55,20 +55,20 @@ $self = $maintenance->getName(); // Detect compiled mode # Get the MWInit class -require_once( "$IP/includes/Init.php" ); -require_once( "$IP/includes/AutoLoader.php" ); +require_once "$IP/includes/Init.php"; +require_once "$IP/includes/AutoLoader.php"; # Stub the profiler -require_once( "$IP/includes/profiler/Profiler.php" ); +require_once "$IP/includes/profiler/Profiler.php"; # Start the profiler $wgProfiler = array(); if ( file_exists( "$IP/StartProfiler.php" ) ) { - require( "$IP/StartProfiler.php" ); + require "$IP/StartProfiler.php"; } // Some other requires -require_once( "$IP/includes/Defines.php" ); -require_once( MWInit::compiledPath( 'includes/DefaultSettings.php' ) ); +require_once "$IP/includes/Defines.php"; +require_once MWInit::compiledPath( 'includes/DefaultSettings.php' ); if ( defined( 'MW_CONFIG_CALLBACK' ) ) { # Use a callback function to configure MediaWiki @@ -81,16 +81,16 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) { # Maybe a hook? global $cluster; $cluster = 'pmtpa'; - require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) ); + require MWInit::interpretedPath( '../wmf-config/wgConf.php' ); } // Require the configuration (probably LocalSettings.php) - require( $maintenance->loadSettings() ); + require $maintenance->loadSettings(); } if ( $maintenance->getDbType() === Maintenance::DB_ADMIN && is_readable( "$IP/AdminSettings.php" ) ) { - require( MWInit::interpretedPath( 'AdminSettings.php' ) ); + require MWInit::interpretedPath( 'AdminSettings.php' ); } if ( $maintenance->getDbType() === Maintenance::DB_NONE ) { @@ -100,7 +100,7 @@ if ( $maintenance->getDbType() === Maintenance::DB_NONE ) { } $maintenance->finalSetup(); // Some last includes -require_once( MWInit::compiledPath( 'includes/Setup.php' ) ); +require_once MWInit::compiledPath( 'includes/Setup.php' ); // Much much faster startup than creating a title object $wgTitle = null; diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php index 9254adc35a..25a777cd81 100644 --- a/maintenance/dumpBackup.php +++ b/maintenance/dumpBackup.php @@ -29,8 +29,8 @@ $originalDir = getcwd(); $optionsWithArgs = array( 'pagelist', 'start', 'end', 'revstart', 'revend' ); -require_once( __DIR__ . '/commandLine.inc' ); -require_once( __DIR__ . '/backup.inc' ); +require_once __DIR__ . '/commandLine.inc'; +require_once __DIR__ . '/backup.inc'; $dumper = new BackupDumper( $argv ); diff --git a/maintenance/dumpIterator.php b/maintenance/dumpIterator.php index 3a511456bc..dd468a9fc8 100644 --- a/maintenance/dumpIterator.php +++ b/maintenance/dumpIterator.php @@ -26,7 +26,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Base class for interating over a dump. diff --git a/maintenance/dumpLinks.php b/maintenance/dumpLinks.php index 14e27890ae..be0b46332b 100644 --- a/maintenance/dumpLinks.php +++ b/maintenance/dumpLinks.php @@ -30,7 +30,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that generates a plaintext link dump. diff --git a/maintenance/dumpSisterSites.php b/maintenance/dumpSisterSites.php index 6609a70780..5f0c5b7ca9 100644 --- a/maintenance/dumpSisterSites.php +++ b/maintenance/dumpSisterSites.php @@ -25,7 +25,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that generates a page name dump for SisterSites usage. diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php index 2e0d03b1f0..5d783cb9ae 100644 --- a/maintenance/dumpTextPass.php +++ b/maintenance/dumpTextPass.php @@ -26,8 +26,8 @@ $originalDir = getcwd(); -require_once( __DIR__ . '/commandLine.inc' ); -require_once( __DIR__ . '/backupTextPass.inc' ); +require_once __DIR__ . '/commandLine.inc'; +require_once __DIR__ . '/backupTextPass.inc'; $dumper = new TextPassDumper( $argv ); diff --git a/maintenance/dumpUploads.php b/maintenance/dumpUploads.php index 5a0890f453..1a9293cb59 100644 --- a/maintenance/dumpUploads.php +++ b/maintenance/dumpUploads.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to dump a the list of files uploaded, diff --git a/maintenance/edit.php b/maintenance/edit.php index fe5005de54..7fca6518bf 100644 --- a/maintenance/edit.php +++ b/maintenance/edit.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to make a page edit. diff --git a/maintenance/eval.php b/maintenance/eval.php index 95f46ffaa8..abedc61a7d 100644 --- a/maintenance/eval.php +++ b/maintenance/eval.php @@ -34,7 +34,7 @@ $optionsWithArgs = array( 'd' ); /** */ -require_once( __DIR__ . "/commandLine.inc" ); +require_once __DIR__ . "/commandLine.inc"; if ( isset( $options['d'] ) ) { $d = $options['d']; diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php index 02e29fb447..05470d307f 100644 --- a/maintenance/fetchText.php +++ b/maintenance/fetchText.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script used to fetch page text in a subprocess. diff --git a/maintenance/fileOpPerfTest.php b/maintenance/fileOpPerfTest.php index 8adc965cea..ea4be82b58 100644 --- a/maintenance/fileOpPerfTest.php +++ b/maintenance/fileOpPerfTest.php @@ -24,7 +24,7 @@ $wgProfiler = array( 'class' => 'ProfilerSimpleText' ); error_reporting( E_ALL ); -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to test fileop performance. diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php index 12268f9165..373170ff53 100644 --- a/maintenance/findHooks.php +++ b/maintenance/findHooks.php @@ -34,7 +34,7 @@ * @author Antoine Musso */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that compares documented and actually present mismatches. diff --git a/maintenance/fixDoubleRedirects.php b/maintenance/fixDoubleRedirects.php index 8c09f8b562..523be7efe7 100644 --- a/maintenance/fixDoubleRedirects.php +++ b/maintenance/fixDoubleRedirects.php @@ -25,7 +25,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that fixes double redirects. diff --git a/maintenance/fixExtLinksProtocolRelative.php b/maintenance/fixExtLinksProtocolRelative.php index 0ca658983a..55fbd9a350 100644 --- a/maintenance/fixExtLinksProtocolRelative.php +++ b/maintenance/fixExtLinksProtocolRelative.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that fixes any entriy for protocol-relative URLs diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php index e7dbefde3d..e4e557fe53 100644 --- a/maintenance/fixSlaveDesync.php +++ b/maintenance/fixSlaveDesync.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that fixes erroneous page_latest values diff --git a/maintenance/fixTimestamps.php b/maintenance/fixTimestamps.php index 763e0150b4..b0609d1768 100644 --- a/maintenance/fixTimestamps.php +++ b/maintenance/fixTimestamps.php @@ -25,7 +25,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that fixes timestamp corruption caused by one or diff --git a/maintenance/fixUserRegistration.php b/maintenance/fixUserRegistration.php index 524bf20374..097936c982 100644 --- a/maintenance/fixUserRegistration.php +++ b/maintenance/fixUserRegistration.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that fixes the user_registration field. diff --git a/maintenance/formatInstallDoc.php b/maintenance/formatInstallDoc.php index fe547e7b62..e2b3c4199d 100644 --- a/maintenance/formatInstallDoc.php +++ b/maintenance/formatInstallDoc.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that formats RELEASE-NOTE file to wiki text or HTML markup. diff --git a/maintenance/fuzz-tester.php b/maintenance/fuzz-tester.php index 2c9e92b1bd..6b7f38a8e8 100644 --- a/maintenance/fuzz-tester.php +++ b/maintenance/fuzz-tester.php @@ -127,17 +127,17 @@ Wiki configuration for testing: $wgEnableWriteAPI = true; // enable API. // Install & enable Parser Hook extensions to increase code coverage. E.g.: - require_once("extensions/ParserFunctions/ParserFunctions.php"); - require_once("extensions/Cite/Cite.php"); - require_once("extensions/inputbox/inputbox.php"); - require_once("extensions/Sort/Sort.php"); - require_once("extensions/wikihiero/wikihiero.php"); - require_once("extensions/CharInsert/CharInsert.php"); - require_once("extensions/FixedImage/FixedImage.php"); + require_once "extensions/ParserFunctions/ParserFunctions.php"; + require_once "extensions/Cite/Cite.php"; + require_once "extensions/inputbox/inputbox.php"; + require_once "extensions/Sort/Sort.php"; + require_once "extensions/wikihiero/wikihiero.php"; + require_once "extensions/CharInsert/CharInsert.php"; + require_once "extensions/FixedImage/FixedImage.php"; // Install & enable Special Page extensions to increase code coverage. E.g.: - require_once("extensions/Cite/SpecialCite.php"); - require_once("extensions/Renameuser/SpecialRenameuser.php"); + require_once "extensions/Cite/SpecialCite.php"; + require_once "extensions/Renameuser/SpecialRenameuser.php"; // --------- End --------- If you want to try E_STRICT error logging, add this to the above: @@ -181,7 +181,7 @@ TODO: // ///////////////////////// COMMAND LINE HELP //////////////////////////////////// // This is a command line script, load MediaWiki env (gives command line options); -require_once( __DIR__ . '/commandLine.inc' ); +require_once __DIR__ . '/commandLine.inc'; // if the user asked for an explanation of command line options. if ( isset( $options["help"] ) ) { diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php index 86fb97af93..4f6bed5b6a 100644 --- a/maintenance/generateSitemap.php +++ b/maintenance/generateSitemap.php @@ -26,7 +26,7 @@ * @see http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that generates a sitemap for the site. diff --git a/maintenance/getConfiguration.php b/maintenance/getConfiguration.php index 72e3f0605c..57ff08349e 100644 --- a/maintenance/getConfiguration.php +++ b/maintenance/getConfiguration.php @@ -23,7 +23,7 @@ * @author Antoine Musso */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Print serialized output of MediaWiki config vars diff --git a/maintenance/getLagTimes.php b/maintenance/getLagTimes.php index a677e202b2..7365a2ee71 100644 --- a/maintenance/getLagTimes.php +++ b/maintenance/getLagTimes.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that displays replication lag times. diff --git a/maintenance/getSlaveServer.php b/maintenance/getSlaveServer.php index 5d3d9dd5d5..d618825f64 100644 --- a/maintenance/getSlaveServer.php +++ b/maintenance/getSlaveServer.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that reports the hostname of a slave server. diff --git a/maintenance/getText.php b/maintenance/getText.php index c68f9bfa09..9c4bdfb84b 100644 --- a/maintenance/getText.php +++ b/maintenance/getText.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that outputs page text to stdout. diff --git a/maintenance/hiphop/run-server b/maintenance/hiphop/run-server index bd6281b12a..2d71b8712e 100755 --- a/maintenance/hiphop/run-server +++ b/maintenance/hiphop/run-server @@ -1,7 +1,7 @@ #!/usr/bin/hhvm -f */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to re-initialise or update the site statistics table diff --git a/maintenance/install.php b/maintenance/install.php index 031668dffd..d118747aff 100644 --- a/maintenance/install.php +++ b/maintenance/install.php @@ -22,14 +22,14 @@ */ if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) { - require_once( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' ); + require_once dirname( __FILE__ ) . '/../includes/PHPVersionError.php'; wfPHPVersionError( 'cli' ); } define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' ); define( 'MEDIAWIKI_INSTALL', true ); -require_once( dirname( __DIR__ ) . "/maintenance/Maintenance.php" ); +require_once dirname( __DIR__ ) . "/maintenance/Maintenance.php"; /** * Maintenance script to install and configure MediaWiki diff --git a/maintenance/jsparse.php b/maintenance/jsparse.php index 2bcc8c0bbb..3f0a9ba7ec 100644 --- a/maintenance/jsparse.php +++ b/maintenance/jsparse.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to do test JavaScript validity parses using jsmin+'s parser diff --git a/maintenance/lag.php b/maintenance/lag.php index c195c4d628..410bf75655 100644 --- a/maintenance/lag.php +++ b/maintenance/lag.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to show database lag. diff --git a/maintenance/language/alltrans.php b/maintenance/language/alltrans.php index 74a8033936..d0e6e84986 100644 --- a/maintenance/language/alltrans.php +++ b/maintenance/language/alltrans.php @@ -21,7 +21,7 @@ * @ingroup MaintenanceLanguage */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Maintenance script that gets all messages as defined by the diff --git a/maintenance/language/checkDupeMessages.php b/maintenance/language/checkDupeMessages.php index 190b2371b1..ac9d8cb430 100644 --- a/maintenance/language/checkDupeMessages.php +++ b/maintenance/language/checkDupeMessages.php @@ -21,7 +21,7 @@ * @ingroup MaintenanceLanguage */ -require_once( __DIR__ . '/../commandLine.inc' ); +require_once __DIR__ . '/../commandLine.inc'; $messagesDir = __DIR__ . '/../../languages/messages/'; $runTest = false; $run = false; @@ -80,12 +80,12 @@ if ( $run ) { } elseif ( !strcmp( $runMode, 'raw' ) ) { $runMode = 'raw'; } - include( $messagesFile ); + include $messagesFile; $messageExist = isset( $messages ); if ( $messageExist ) { $wgMessages[$langCode] = $messages; } - include( $messagesFileC ); + include $messagesFileC; $messageCExist = isset( $messages ); if ( $messageCExist ) { $wgMessages[$langCodeC] = $messages; diff --git a/maintenance/language/checkExtensions.php b/maintenance/language/checkExtensions.php index 8d44e710dc..79a4dd9835 100644 --- a/maintenance/language/checkExtensions.php +++ b/maintenance/language/checkExtensions.php @@ -21,7 +21,7 @@ * @ingroup MaintenanceLanguage */ -require_once( __DIR__ . '/../commandLine.inc' ); +require_once __DIR__ . '/../commandLine.inc'; require_once 'languages.inc'; require_once 'checkLanguage.inc'; diff --git a/maintenance/language/checkLanguage.php b/maintenance/language/checkLanguage.php index 2b94126822..ec6e12268a 100644 --- a/maintenance/language/checkLanguage.php +++ b/maintenance/language/checkLanguage.php @@ -21,7 +21,7 @@ * @ingroup MaintenanceLanguage */ -require_once( __DIR__ . '/../commandLine.inc' ); +require_once __DIR__ . '/../commandLine.inc'; require_once 'checkLanguage.inc'; require_once 'languages.inc'; diff --git a/maintenance/language/countMessages.php b/maintenance/language/countMessages.php index e9b76cb243..95a7154b4f 100644 --- a/maintenance/language/countMessages.php +++ b/maintenance/language/countMessages.php @@ -21,7 +21,7 @@ * @ingroup MaintenanceLanguage */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Maintenance script that counts how many messages we have defined @@ -59,7 +59,7 @@ class CountMessages extends Maintenance { private function getNumMessages( $file ) { // Separate function to limit scope - require( $file ); + require $file; if ( isset( $messages ) ) { return count( $messages ); } else { diff --git a/maintenance/language/date-formats.php b/maintenance/language/date-formats.php index f8357f9538..146341855e 100644 --- a/maintenance/language/date-formats.php +++ b/maintenance/language/date-formats.php @@ -21,7 +21,7 @@ * @ingroup MaintenanceLanguage */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Maintenance script that tests various language time and date functions. diff --git a/maintenance/language/digit2html.php b/maintenance/language/digit2html.php index 0a0c5e7dde..a6e0456a16 100644 --- a/maintenance/language/digit2html.php +++ b/maintenance/language/digit2html.php @@ -21,7 +21,7 @@ * @ingroup MaintenanceLanguage */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Maintenance script that check digit transformation. @@ -49,7 +49,7 @@ class Digit2Html extends Maintenance { $filename = Language::getMessagesFileName( $code ); $this->output( "Loading language [$code] ... " ); unset( $digitTransformTable ); - require_once( $filename ); + require_once $filename; if ( !isset( $digitTransformTable ) ) { $this->error( "\$digitTransformTable not found for lang: $code" ); continue; diff --git a/maintenance/language/dumpMessages.php b/maintenance/language/dumpMessages.php index c642476cf7..a72e25b882 100644 --- a/maintenance/language/dumpMessages.php +++ b/maintenance/language/dumpMessages.php @@ -23,7 +23,7 @@ * @todo Make this more useful, right now just dumps $wgContLang */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Maintenance script that dumps an entire language, using the keys from English. diff --git a/maintenance/language/generateCollationData.php b/maintenance/language/generateCollationData.php index f1f402ae35..fcf2c960c6 100644 --- a/maintenance/language/generateCollationData.php +++ b/maintenance/language/generateCollationData.php @@ -21,7 +21,7 @@ * @ingroup MaintenanceLanguage */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Generate first letter data files for Collation.php diff --git a/maintenance/language/generateNormalizerData.php b/maintenance/language/generateNormalizerData.php index bd50fe90b4..216445e40a 100644 --- a/maintenance/language/generateNormalizerData.php +++ b/maintenance/language/generateNormalizerData.php @@ -21,9 +21,9 @@ * @ingroup MaintenanceLanguage */ -require_once( __DIR__ . '/../../includes/normal/UtfNormalUtil.php' ); +require_once __DIR__ . '/../../includes/normal/UtfNormalUtil.php'; -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Generates normalizer data files for Arabic and Malayalam. diff --git a/maintenance/language/langmemusage.php b/maintenance/language/langmemusage.php index 6694092318..14485f9884 100644 --- a/maintenance/language/langmemusage.php +++ b/maintenance/language/langmemusage.php @@ -22,8 +22,8 @@ */ /** This is a command line script */ -require_once( __DIR__ . '/../Maintenance.php' ); -require_once( __DIR__ . '/languages.inc' ); +require_once __DIR__ . '/../Maintenance.php'; +require_once __DIR__ . '/languages.inc'; /** * Maintenance script that tries to get the memory usage for each language file. diff --git a/maintenance/language/languages.inc b/maintenance/language/languages.inc index 31bfcb9bc2..6070f4ab7f 100644 --- a/maintenance/language/languages.inc +++ b/maintenance/language/languages.inc @@ -46,7 +46,7 @@ class languages { * @param $exif bool Treat the Exif messages? */ function __construct( $exif = true ) { - require( __DIR__ . '/messageTypes.inc' ); + require __DIR__ . '/messageTypes.inc'; $this->mIgnoredMessages = $wgIgnoredMessages; if ( $exif ) { $this->mOptionalMessages = array_merge( $wgOptionalMessages ); @@ -107,7 +107,7 @@ class languages { $this->mSpecialPageAliases[$code] = array(); $filename = Language::getMessagesFileName( $code ); if ( file_exists( $filename ) ) { - require( $filename ); + require $filename; if ( isset( $messages ) ) { $this->mRawMessages[$code] = $messages; } diff --git a/maintenance/language/rebuildLanguage.php b/maintenance/language/rebuildLanguage.php index 02c41d298e..66948aebc5 100644 --- a/maintenance/language/rebuildLanguage.php +++ b/maintenance/language/rebuildLanguage.php @@ -22,7 +22,7 @@ * @defgroup MaintenanceLanguage MaintenanceLanguage */ -require_once( __DIR__ . '/../commandLine.inc' ); +require_once __DIR__ . '/../commandLine.inc'; require_once 'languages.inc'; require_once 'writeMessagesArray.inc'; @@ -56,7 +56,7 @@ function rebuildLanguage( $languages, $code, $write, $listUnknown, $removeUnknow */ function removeDupes( $oldMsgArray, $dupeMsgSource ) { if ( file_exists( $dupeMsgSource ) ) { - include( $dupeMsgSource ); + include $dupeMsgSource; if ( !isset( $dupeMessages ) ) { echo "There are no duplicated messages in the source file provided."; exit( 1 ); diff --git a/maintenance/language/transstat.php b/maintenance/language/transstat.php index 9cdc85ed5e..61b84a0788 100644 --- a/maintenance/language/transstat.php +++ b/maintenance/language/transstat.php @@ -28,9 +28,9 @@ */ $optionsWithArgs = array( 'output' ); -require_once( __DIR__ . '/../commandLine.inc' ); +require_once __DIR__ . '/../commandLine.inc'; require_once 'languages.inc'; -require_once( __DIR__ . '/StatOutputs.php' ); +require_once __DIR__ . '/StatOutputs.php'; if ( isset( $options['help'] ) ) { diff --git a/maintenance/language/validate.php b/maintenance/language/validate.php index 4f00496f47..63d9b84711 100644 --- a/maintenance/language/validate.php +++ b/maintenance/language/validate.php @@ -36,8 +36,8 @@ define( 'NOT_REALLY_MEDIAWIKI', 1 ); $IP = __DIR__ . '/../..'; -require_once( "$IP/includes/Defines.php" ); -require_once( "$IP/languages/Language.php" ); +require_once "$IP/includes/Defines.php"; +require_once "$IP/languages/Language.php"; $files = array(); foreach ( $argv as $arg ) { @@ -57,7 +57,7 @@ foreach ( $files as $filename ) { } function getVars( $filename ) { - require( $filename ); + require $filename; $vars = get_defined_vars(); unset( $vars['filename'] ); return $vars; diff --git a/maintenance/language/writeMessagesArray.inc b/maintenance/language/writeMessagesArray.inc index 973e9c4344..fc0da3f501 100644 --- a/maintenance/language/writeMessagesArray.inc +++ b/maintenance/language/writeMessagesArray.inc @@ -110,11 +110,11 @@ $messages = array( # Load messages $dir = $prefix ? $prefix : __DIR__; - require( $dir . '/messages.inc' ); + require $dir . '/messages.inc'; self::$messageStructure = $wgMessageStructure; self::$blockComments = $wgBlockComments; - require( $dir . '/messageTypes.inc' ); + require $dir . '/messageTypes.inc'; self::$ignoredMessages = $wgIgnoredMessages; self::$optionalMessages = $wgOptionalMessages; diff --git a/maintenance/mcc.php b/maintenance/mcc.php index 4bed0d4c7b..7b7b761445 100644 --- a/maintenance/mcc.php +++ b/maintenance/mcc.php @@ -23,7 +23,7 @@ */ /** */ -require_once( __DIR__ . '/commandLine.inc' ); +require_once __DIR__ . '/commandLine.inc'; $options = getopt( '', array( 'debug', 'help', 'cache:' ) ); diff --git a/maintenance/mctest.php b/maintenance/mctest.php index 375c80d518..26e1e18543 100644 --- a/maintenance/mctest.php +++ b/maintenance/mctest.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that makes several 'set', 'incr' and 'get' requests diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php index 243c2dd880..2b680d3cd9 100644 --- a/maintenance/mergeMessageFileList.php +++ b/maintenance/mergeMessageFileList.php @@ -25,7 +25,7 @@ # Start from scratch define( 'MW_NO_EXTENSION_MESSAGES', 1 ); -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; $maintClass = 'MergeMessageFileList'; $mmfl = false; @@ -98,7 +98,7 @@ foreach ( $mmfl['setupFiles'] as $fileName ) { if ( empty( $mmfl['quiet'] ) ) { fwrite( STDERR, "Loading data from $fileName\n" ); } - if ( !include_once( $fileName ) ) { + if ( !( include_once $fileName ) ) { fwrite( STDERR, "Unable to read $fileName\n" ); exit( 1 ); } diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php index c62a5d3a65..6903365b47 100644 --- a/maintenance/migrateUserGroup.php +++ b/maintenance/migrateUserGroup.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that re-assigns users from an old group to a new one. diff --git a/maintenance/minify.php b/maintenance/minify.php index 270536b4d9..ec936c830e 100644 --- a/maintenance/minify.php +++ b/maintenance/minify.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that minifies a file or set of files. diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php index d3627a0c2e..34e6428264 100644 --- a/maintenance/moveBatch.php +++ b/maintenance/moveBatch.php @@ -34,7 +34,7 @@ * e.g. immobile_namespace for namespaces which can't be moved */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to move a batch of pages. diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php index 8aac4b385c..3439b74f17 100644 --- a/maintenance/mwdocgen.php +++ b/maintenance/mwdocgen.php @@ -88,7 +88,7 @@ $doxyGenerateMan = false; # define( 'MEDIAWIKI', true ); -require_once( "$mwPath/includes/GlobalFunctions.php" ); +require_once "$mwPath/includes/GlobalFunctions.php"; /** * Read a line from the shell diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php index 555feaae07..ff024682c6 100644 --- a/maintenance/namespaceDupes.php +++ b/maintenance/namespaceDupes.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that checks for articles to fix after diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php index ca550ae9d3..219b5d8e57 100644 --- a/maintenance/nextJobDB.php +++ b/maintenance/nextJobDB.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that picks a database that has pending jobs. diff --git a/maintenance/nukeNS.php b/maintenance/nukeNS.php index 13206d7f5a..479dcf7611 100644 --- a/maintenance/nukeNS.php +++ b/maintenance/nukeNS.php @@ -33,7 +33,7 @@ * based on nukePage by Rob Church */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that removes pages with only one revision from the diff --git a/maintenance/nukePage.php b/maintenance/nukePage.php index f5ce5ec3cf..1870273eb7 100644 --- a/maintenance/nukePage.php +++ b/maintenance/nukePage.php @@ -23,7 +23,7 @@ * @author Rob Church */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that erases a page record from the database. diff --git a/maintenance/oracle/alterSharedConstraints.php b/maintenance/oracle/alterSharedConstraints.php index abe86c3614..435625d5b8 100644 --- a/maintenance/oracle/alterSharedConstraints.php +++ b/maintenance/oracle/alterSharedConstraints.php @@ -27,7 +27,7 @@ * i.e.: GRANT REFERENCES (user_id) ON mwuser TO hubclient; */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; class AlterSharedConstraints extends Maintenance { public function __construct() { diff --git a/maintenance/orphans.php b/maintenance/orphans.php index cdaba1c1bf..b4d255ab8a 100644 --- a/maintenance/orphans.php +++ b/maintenance/orphans.php @@ -28,7 +28,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that looks for 'orphan' revisions hooked to pages which diff --git a/maintenance/parse.php b/maintenance/parse.php index e08252530f..3ac7a281d0 100644 --- a/maintenance/parse.php +++ b/maintenance/parse.php @@ -49,7 +49,7 @@ * @license GNU General Public License 2.0 or later */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to parse some wikitext. diff --git a/maintenance/patchSql.php b/maintenance/patchSql.php index 6a3ca37d3d..31ce156622 100644 --- a/maintenance/patchSql.php +++ b/maintenance/patchSql.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that manually runs an SQL patch outside of the general updaters. diff --git a/maintenance/populateCategory.php b/maintenance/populateCategory.php index 05ba3e6161..4c8cdaa18a 100644 --- a/maintenance/populateCategory.php +++ b/maintenance/populateCategory.php @@ -22,7 +22,7 @@ * @author Simetrical */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Mainteance script to populate the category table. diff --git a/maintenance/populateFilearchiveSha1.php b/maintenance/populateFilearchiveSha1.php index a4d25381c7..c579d4fcd9 100644 --- a/maintenance/populateFilearchiveSha1.php +++ b/maintenance/populateFilearchiveSha1.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( dirname( __FILE__ ) . '/Maintenance.php' ); +require_once dirname( __FILE__ ) . '/Maintenance.php'; /** * Maintenance script to populate the fa_sha1 field. diff --git a/maintenance/populateImageSha1.php b/maintenance/populateImageSha1.php index e9e43096d7..126d22d986 100644 --- a/maintenance/populateImageSha1.php +++ b/maintenance/populateImageSha1.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to populate the img_sha1 field. diff --git a/maintenance/populateLogSearch.php b/maintenance/populateLogSearch.php index c6a5aff669..d65635e57e 100644 --- a/maintenance/populateLogSearch.php +++ b/maintenance/populateLogSearch.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that makes the required database updates for populating the diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php index 44b99243eb..e579e52213 100644 --- a/maintenance/populateLogUsertext.php +++ b/maintenance/populateLogUsertext.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that makes the required database updates for diff --git a/maintenance/populateParentId.php b/maintenance/populateParentId.php index 950a282623..e29fa5f1cf 100644 --- a/maintenance/populateParentId.php +++ b/maintenance/populateParentId.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that makes the required database updates for rev_parent_id diff --git a/maintenance/populateRevisionLength.php b/maintenance/populateRevisionLength.php index 9ab0f51971..3c69125a97 100644 --- a/maintenance/populateRevisionLength.php +++ b/maintenance/populateRevisionLength.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that populates the rev_len field for old revisions diff --git a/maintenance/populateRevisionSha1.php b/maintenance/populateRevisionSha1.php index b2abb612df..89bfb85b4e 100644 --- a/maintenance/populateRevisionSha1.php +++ b/maintenance/populateRevisionSha1.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that fills the rev_sha1 and ar_sha1 columns of revision diff --git a/maintenance/preprocessDump.php b/maintenance/preprocessDump.php index 29739ef222..0dc19e2865 100644 --- a/maintenance/preprocessDump.php +++ b/maintenance/preprocessDump.php @@ -25,7 +25,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/dumpIterator.php' ); +require_once __DIR__ . '/dumpIterator.php'; /** * Maintenance script that takes page text out of an XML dump file and diff --git a/maintenance/preprocessorFuzzTest.php b/maintenance/preprocessorFuzzTest.php index 0a1a9f6f11..563ea4598b 100644 --- a/maintenance/preprocessorFuzzTest.php +++ b/maintenance/preprocessorFuzzTest.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/commandLine.inc' ); +require_once __DIR__ . '/commandLine.inc'; $wgHooks['BeforeParserFetchTemplateAndtitle'][] = 'PPFuzzTester::templateHook'; diff --git a/maintenance/protect.php b/maintenance/protect.php index 61fa392445..ec03f9349d 100644 --- a/maintenance/protect.php +++ b/maintenance/protect.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that protects or unprotects a page. diff --git a/maintenance/pruneFileCache.php b/maintenance/pruneFileCache.php index 42df145805..48d3897790 100644 --- a/maintenance/pruneFileCache.php +++ b/maintenance/pruneFileCache.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that prunes file cache for pages, objects, resources, etc. diff --git a/maintenance/purgeDeletedFiles.php b/maintenance/purgeDeletedFiles.php index 6886e296c7..32b6569236 100644 --- a/maintenance/purgeDeletedFiles.php +++ b/maintenance/purgeDeletedFiles.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that scans the deletion log and purges affected files diff --git a/maintenance/purgeList.php b/maintenance/purgeList.php index 4dc2fd09eb..2f89520189 100644 --- a/maintenance/purgeList.php +++ b/maintenance/purgeList.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that sends purge requests for listed pages to squid. diff --git a/maintenance/purgeOldText.php b/maintenance/purgeOldText.php index 49a31d70e2..3d81e2dfaf 100644 --- a/maintenance/purgeOldText.php +++ b/maintenance/purgeOldText.php @@ -22,7 +22,7 @@ * @author Rob Church */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that purges old text records from the database. diff --git a/maintenance/purgeParserCache.php b/maintenance/purgeParserCache.php index 9b92b32354..ca2a041448 100644 --- a/maintenance/purgeParserCache.php +++ b/maintenance/purgeParserCache.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require( __DIR__ . '/Maintenance.php' ); +require __DIR__ . '/Maintenance.php'; /** * Maintenance script to remove old objects from the parser cache. diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php index 446c9884ff..7e15c09eb8 100644 --- a/maintenance/reassignEdits.php +++ b/maintenance/reassignEdits.php @@ -23,7 +23,7 @@ * @licence GNU General Public Licence 2.0 or later */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that reassigns edits from a user or IP address diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php index ba146ab756..12ed9facaf 100644 --- a/maintenance/rebuildFileCache.php +++ b/maintenance/rebuildFileCache.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that builds file cache for content pages. diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php index 4597d302bb..53bf823f0f 100644 --- a/maintenance/rebuildImages.php +++ b/maintenance/rebuildImages.php @@ -30,7 +30,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to update image metadata records. diff --git a/maintenance/rebuildLocalisationCache.php b/maintenance/rebuildLocalisationCache.php index 8053250e13..ee6ddbbfe6 100644 --- a/maintenance/rebuildLocalisationCache.php +++ b/maintenance/rebuildLocalisationCache.php @@ -29,7 +29,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to rebuild the localisation cache. diff --git a/maintenance/rebuildall.php b/maintenance/rebuildall.php index d52b0e53b8..54444e9aa5 100644 --- a/maintenance/rebuildall.php +++ b/maintenance/rebuildall.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that rebuilds link tracking tables from scratch. diff --git a/maintenance/rebuildmessages.php b/maintenance/rebuildmessages.php index 82c87014bf..f223f1abf5 100644 --- a/maintenance/rebuildmessages.php +++ b/maintenance/rebuildmessages.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that purges all languages from the message cache. diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php index c4afe10c8a..18348258b0 100644 --- a/maintenance/rebuildrecentchanges.php +++ b/maintenance/rebuildrecentchanges.php @@ -23,7 +23,7 @@ * @todo Document */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that rebuilds recent changes from scratch. diff --git a/maintenance/rebuildtextindex.php b/maintenance/rebuildtextindex.php index d32ce7fe8e..a31aba2612 100644 --- a/maintenance/rebuildtextindex.php +++ b/maintenance/rebuildtextindex.php @@ -25,7 +25,7 @@ * @todo document */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that rebuilds search index table from scratch. diff --git a/maintenance/refreshFileHeaders.php b/maintenance/refreshFileHeaders.php index 56998634fb..8b852e3947 100644 --- a/maintenance/refreshFileHeaders.php +++ b/maintenance/refreshFileHeaders.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to refresh file headers from metadata diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php index 23bf7f8d76..7fe5c4c177 100644 --- a/maintenance/refreshImageMetadata.php +++ b/maintenance/refreshImageMetadata.php @@ -27,7 +27,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to refresh image metadata fields. diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php index a54f553053..0e6725cd60 100644 --- a/maintenance/refreshLinks.php +++ b/maintenance/refreshLinks.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to refresh link tables. diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php index 2bb874adc5..2d75722858 100644 --- a/maintenance/removeUnusedAccounts.php +++ b/maintenance/removeUnusedAccounts.php @@ -23,7 +23,7 @@ * @author Rob Church */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that removes unused user accounts from the database. diff --git a/maintenance/renameDbPrefix.php b/maintenance/renameDbPrefix.php index acd2d956d5..ed9d1f5d62 100644 --- a/maintenance/renameDbPrefix.php +++ b/maintenance/renameDbPrefix.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that changes the prefix of database tables. diff --git a/maintenance/renderDump.php b/maintenance/renderDump.php index 1b92f19b69..0cde28c58d 100644 --- a/maintenance/renderDump.php +++ b/maintenance/renderDump.php @@ -28,7 +28,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that takes page text out of an XML dump file diff --git a/maintenance/resetUserTokens.php b/maintenance/resetUserTokens.php index d20dea0f48..241d6328c8 100644 --- a/maintenance/resetUserTokens.php +++ b/maintenance/resetUserTokens.php @@ -23,7 +23,7 @@ * @author Daniel Friesen */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to reset the user_token for all users on the wiki. diff --git a/maintenance/rollbackEdits.php b/maintenance/rollbackEdits.php index 305fea8ade..e5e33c02ed 100644 --- a/maintenance/rollbackEdits.php +++ b/maintenance/rollbackEdits.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to rollback all edits by a given user or IP provided diff --git a/maintenance/runBatchedQuery.php b/maintenance/runBatchedQuery.php index 0515594077..93ba24a9d1 100644 --- a/maintenance/runBatchedQuery.php +++ b/maintenance/runBatchedQuery.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to run a database query in batches and wait for slaves. diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php index 90908bf17e..0f4c184c45 100644 --- a/maintenance/runJobs.php +++ b/maintenance/runJobs.php @@ -25,7 +25,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that runs pending jobs. diff --git a/maintenance/showCacheStats.php b/maintenance/showCacheStats.php index 1eb8d660bf..cd9768d4bb 100644 --- a/maintenance/showCacheStats.php +++ b/maintenance/showCacheStats.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that shows statistics from the cache. diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php index de078d835f..322a849763 100644 --- a/maintenance/showJobs.php +++ b/maintenance/showJobs.php @@ -25,7 +25,7 @@ * @author Antoine Musso */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that reports the number of jobs currently waiting diff --git a/maintenance/showSiteStats.php b/maintenance/showSiteStats.php index 233e9c9ecd..49148b3390 100644 --- a/maintenance/showSiteStats.php +++ b/maintenance/showSiteStats.php @@ -29,7 +29,7 @@ * @license GNU General Public License 2.0 or later */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to show the cached statistics. diff --git a/maintenance/sql.php b/maintenance/sql.php index ff3771c781..216db93f92 100644 --- a/maintenance/sql.php +++ b/maintenance/sql.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that sends SQL queries from the specified file to the database. diff --git a/maintenance/sqlite.php b/maintenance/sqlite.php index 1ca8500356..8a785245ac 100644 --- a/maintenance/sqlite.php +++ b/maintenance/sqlite.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that performs some operations specific to SQLite database backend. diff --git a/maintenance/storage/checkStorage.php b/maintenance/storage/checkStorage.php index 632e04a6d5..03dc113ac3 100644 --- a/maintenance/storage/checkStorage.php +++ b/maintenance/storage/checkStorage.php @@ -22,7 +22,7 @@ */ if ( !defined( 'MEDIAWIKI' ) ) { - require_once( __DIR__ . '/../commandLine.inc' ); + require_once __DIR__ . '/../commandLine.inc'; $cs = new CheckStorage; $fix = isset( $options['fix'] ); diff --git a/maintenance/storage/compressOld.php b/maintenance/storage/compressOld.php index 947f402e9f..8cb554875b 100644 --- a/maintenance/storage/compressOld.php +++ b/maintenance/storage/compressOld.php @@ -41,7 +41,7 @@ * @ingroup Maintenance ExternalStorage */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Maintenance script that compress the text of a wiki. diff --git a/maintenance/storage/dumpRev.php b/maintenance/storage/dumpRev.php index 577201c528..f12bbd1b73 100644 --- a/maintenance/storage/dumpRev.php +++ b/maintenance/storage/dumpRev.php @@ -21,7 +21,7 @@ * @ingroup Maintenance ExternalStorage */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Maintenance script that gets the text of a revision, diff --git a/maintenance/storage/fixBug20757.php b/maintenance/storage/fixBug20757.php index 36f2658382..101aa068ba 100644 --- a/maintenance/storage/fixBug20757.php +++ b/maintenance/storage/fixBug20757.php @@ -21,7 +21,7 @@ * @ingroup Maintenance ExternalStorage */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Maintenance script to fix bug 20757. diff --git a/maintenance/storage/moveToExternal.php b/maintenance/storage/moveToExternal.php index 6122dddf28..348fb773b4 100644 --- a/maintenance/storage/moveToExternal.php +++ b/maintenance/storage/moveToExternal.php @@ -24,8 +24,8 @@ define( 'REPORTING_INTERVAL', 1 ); if ( !defined( 'MEDIAWIKI' ) ) { - require_once( __DIR__ . '/../commandLine.inc' ); - require_once( __DIR__ . '/../../includes/externalstore/ExternalStoreDB.php' ); + require_once __DIR__ . '/../commandLine.inc'; + require_once __DIR__ . '/../../includes/externalstore/ExternalStoreDB.php'; require_once 'resolveStubs.php'; $fname = 'moveToExternal'; diff --git a/maintenance/storage/orphanStats.php b/maintenance/storage/orphanStats.php index 8b4fc937bc..1df1501e8d 100644 --- a/maintenance/storage/orphanStats.php +++ b/maintenance/storage/orphanStats.php @@ -21,7 +21,7 @@ * @ingroup Maintenance ExternalStorage */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; /** * Maintenance script that shows some statistics on the blob_orphans table, diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php index 2a6d017dc0..b266316527 100644 --- a/maintenance/storage/recompressTracked.php +++ b/maintenance/storage/recompressTracked.php @@ -23,7 +23,7 @@ */ $optionsWithArgs = RecompressTracked::getOptionsWithArgs(); -require( __DIR__ . '/../commandLine.inc' ); +require __DIR__ . '/../commandLine.inc'; if ( count( $args ) < 1 ) { echo "Usage: php recompressTracked.php [options] [... ...] diff --git a/maintenance/storage/resolveStubs.php b/maintenance/storage/resolveStubs.php index 414eab81c7..e47d6407e9 100644 --- a/maintenance/storage/resolveStubs.php +++ b/maintenance/storage/resolveStubs.php @@ -27,7 +27,7 @@ define( 'REPORTING_INTERVAL', 100 ); if ( !defined( 'MEDIAWIKI' ) ) { $optionsWithArgs = array( 'm' ); - require_once( __DIR__ . '/../commandLine.inc' ); + require_once __DIR__ . '/../commandLine.inc'; resolveStubs(); } diff --git a/maintenance/storage/storageTypeStats.php b/maintenance/storage/storageTypeStats.php index dca7042cb2..e33057f612 100644 --- a/maintenance/storage/storageTypeStats.php +++ b/maintenance/storage/storageTypeStats.php @@ -19,7 +19,7 @@ * @ingroup Maintenance ExternalStorage */ -require_once( __DIR__ . '/../Maintenance.php' ); +require_once __DIR__ . '/../Maintenance.php'; class StorageTypeStats extends Maintenance { function execute() { diff --git a/maintenance/storage/testCompression.php b/maintenance/storage/testCompression.php index e13e1b10a9..fdc28d9b6b 100644 --- a/maintenance/storage/testCompression.php +++ b/maintenance/storage/testCompression.php @@ -22,7 +22,7 @@ */ $optionsWithArgs = array( 'start', 'limit', 'type' ); -require( __DIR__ . '/../commandLine.inc' ); +require __DIR__ . '/../commandLine.inc'; if ( !isset( $args[0] ) ) { echo "Usage: php testCompression.php [--type=] [--start=] [--limit=] \n"; diff --git a/maintenance/storage/trackBlobs.php b/maintenance/storage/trackBlobs.php index 2f3c8c6ab2..7857dd9509 100644 --- a/maintenance/storage/trackBlobs.php +++ b/maintenance/storage/trackBlobs.php @@ -22,7 +22,7 @@ * @see wfWaitForSlaves() */ -require( __DIR__ . '/../commandLine.inc' ); +require __DIR__ . '/../commandLine.inc'; if ( count( $args ) < 1 ) { diff --git a/maintenance/syncFileBackend.php b/maintenance/syncFileBackend.php index 00bb7b3a74..f0be709f9b 100644 --- a/maintenance/syncFileBackend.php +++ b/maintenance/syncFileBackend.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that syncs one file backend to another based on diff --git a/maintenance/undelete.php b/maintenance/undelete.php index 94917b54ac..c890c69b6c 100644 --- a/maintenance/undelete.php +++ b/maintenance/undelete.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; class Undelete extends Maintenance { public function __construct() { diff --git a/maintenance/update.php b/maintenance/update.php index 4d73c78ec1..6fcec2c4cb 100644 --- a/maintenance/update.php +++ b/maintenance/update.php @@ -26,12 +26,12 @@ */ if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) { - require( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' ); + require dirname( __FILE__ ) . '/../includes/PHPVersionError.php'; wfPHPVersionError( 'cli' ); } $wgUseMasterForMaintenance = true; -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to run database schema updates. diff --git a/maintenance/updateArticleCount.php b/maintenance/updateArticleCount.php index 49d581165f..7964a21f82 100644 --- a/maintenance/updateArticleCount.php +++ b/maintenance/updateArticleCount.php @@ -23,7 +23,7 @@ * @author Rob Church */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to provide a better count of the number of articles diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php index 94b2537b42..b847c23b05 100644 --- a/maintenance/updateCollation.php +++ b/maintenance/updateCollation.php @@ -26,7 +26,7 @@ #$optionsWithArgs = array( 'begin', 'max-slave-lag' ); -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that will find all rows in the categorylinks table diff --git a/maintenance/updateDoubleWidthSearch.php b/maintenance/updateDoubleWidthSearch.php index 6d91a6494e..41988d1b25 100644 --- a/maintenance/updateDoubleWidthSearch.php +++ b/maintenance/updateDoubleWidthSearch.php @@ -23,7 +23,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to normalize double-byte latin UTF-8 characters. diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php index 420843eb89..175447e780 100644 --- a/maintenance/updateRestrictions.php +++ b/maintenance/updateRestrictions.php @@ -24,7 +24,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that updates page_restrictions table from diff --git a/maintenance/updateSearchIndex.php b/maintenance/updateSearchIndex.php index 97707be186..0691bee811 100644 --- a/maintenance/updateSearchIndex.php +++ b/maintenance/updateSearchIndex.php @@ -28,7 +28,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script for periodic off-peak updating of the search index. diff --git a/maintenance/updateSpecialPages.php b/maintenance/updateSpecialPages.php index 5472623db7..181c22229d 100644 --- a/maintenance/updateSpecialPages.php +++ b/maintenance/updateSpecialPages.php @@ -22,7 +22,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to update cached special pages. @@ -67,7 +67,7 @@ class UpdateSpecialPages extends Maintenance { } // This is needed to initialise $wgQueryPages - require_once( "$IP/includes/QueryPage.php" ); + require_once "$IP/includes/QueryPage.php"; foreach ( $wgQueryPages as $page ) { list( $class, $special ) = $page; @@ -94,7 +94,7 @@ class UpdateSpecialPages extends Maintenance { } else { if ( !class_exists( $class ) ) { $file = $specialObj->getFile(); - require_once( $file ); + require_once $file; } $queryPage = new $class; } diff --git a/maintenance/userOptions.inc b/maintenance/userOptions.inc index ddbda49cd2..51da80d344 100644 --- a/maintenance/userOptions.inc +++ b/maintenance/userOptions.inc @@ -25,7 +25,7 @@ $options = array( 'list', 'nowarn', 'quiet', 'usage', 'dry' ); $optionsWithArgs = array( 'old', 'new' ); -require_once( __DIR__ . '/commandLine.inc' ); +require_once __DIR__ . '/commandLine.inc'; /** * @ingroup Maintenance diff --git a/maintenance/waitForSlave.php b/maintenance/waitForSlave.php index 28e1a5430b..a62d1618ef 100644 --- a/maintenance/waitForSlave.php +++ b/maintenance/waitForSlave.php @@ -22,7 +22,7 @@ * @see wfWaitForSlaves() */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script to wait until slave lag goes under a certain value. diff --git a/mw-config/index.php b/mw-config/index.php index 270a8b26fe..570b426edc 100644 --- a/mw-config/index.php +++ b/mw-config/index.php @@ -24,7 +24,7 @@ define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' ); define( 'MEDIAWIKI_INSTALL', true ); chdir( dirname( __DIR__ ) ); -require( dirname( __DIR__ ) . '/includes/WebStart.php' ); +require dirname( __DIR__ ) . '/includes/WebStart.php'; wfInstallerMain(); diff --git a/opensearch_desc.php b/opensearch_desc.php index cb8b1bec9d..ecd5051cd9 100644 --- a/opensearch_desc.php +++ b/opensearch_desc.php @@ -20,7 +20,7 @@ * @file */ -require_once( __DIR__ . '/includes/WebStart.php' ); +require_once __DIR__ . '/includes/WebStart.php'; if ( $wgRequest->getVal( 'ctype' ) == 'application/xml' ) { // Makes testing tweaks about a billion times easier diff --git a/profileinfo.php b/profileinfo.php index f18dfbff8e..8120599e02 100644 --- a/profileinfo.php +++ b/profileinfo.php @@ -28,7 +28,7 @@ ini_set( 'zlib.output_compression', 'off' ); $wgEnableProfileInfo = $wgProfileToDatabase = false; -require ( __DIR__ . '/includes/WebStart.php' ); +require __DIR__ . '/includes/WebStart.php'; header( 'Content-Type: text/html; charset=utf-8' ); diff --git a/serialized/serialize.php b/serialized/serialize.php index 09aec79e9d..766c1a5116 100644 --- a/serialized/serialize.php +++ b/serialized/serialize.php @@ -24,7 +24,7 @@ if ( !defined( 'MEDIAWIKI' ) ) { $wgNoDBParam = true; $optionsWithArgs = array( 'o' ); - require_once( __DIR__ .'/../maintenance/commandLine.inc' ); + require_once __DIR__ .'/../maintenance/commandLine.inc'; $stderr = fopen( 'php://stderr', 'w' ); if ( !isset( $args[0] ) ) { @@ -65,7 +65,7 @@ if ( !defined( 'MEDIAWIKI' ) ) { //---------------------------------------------------------------------------- function getVars( $_gv_filename ) { - require( $_gv_filename ); + require $_gv_filename; $vars = get_defined_vars(); unset( $vars['_gv_filename'] ); diff --git a/tests/RunSeleniumTests.php b/tests/RunSeleniumTests.php index 0136a2a94e..c25dff7fcd 100644 --- a/tests/RunSeleniumTests.php +++ b/tests/RunSeleniumTests.php @@ -30,7 +30,7 @@ if ( PHP_SAPI != 'cli' ) { define( 'SELENIUMTEST', true ); -require( __DIR__ . '/../maintenance/Maintenance.php' ); +require __DIR__ . '/../maintenance/Maintenance.php'; require_once 'PHPUnit/Runner/Version.php'; if ( version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '>=' ) ) { @@ -44,7 +44,7 @@ if ( version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '>=' ) ) { require_once 'PHPUnit/Extensions/SeleniumTestCase.php'; include_once 'PHPUnit/Util/Log/JUnit.php'; -require_once( __DIR__ . "/selenium/SeleniumServerManager.php" ); +require_once __DIR__ . "/selenium/SeleniumServerManager.php"; class SeleniumTester extends Maintenance { protected $selenium; @@ -133,7 +133,7 @@ class SeleniumTester extends Maintenance { } foreach ( $seleniumTestSuites as $testSuiteName => $testSuiteFile ) { - require( $testSuiteFile ); + require $testSuiteFile; $suite = new $testSuiteName(); $suite->setName( $testSuiteName ); $suite->addTests(); diff --git a/tests/parserTests.php b/tests/parserTests.php index c04c159bed..debb35751b 100644 --- a/tests/parserTests.php +++ b/tests/parserTests.php @@ -27,8 +27,8 @@ $otions = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record', 'run-disabled', 'run-parsoid' ); $optionsWithArgs = array( 'regex', 'filter', 'seed', 'setversion' ); -require_once( __DIR__ . '/../maintenance/commandLine.inc' ); -require_once( __DIR__ . '/TestsAutoLoader.php' ); +require_once __DIR__ . '/../maintenance/commandLine.inc'; +require_once __DIR__ . '/TestsAutoLoader.php'; if ( isset( $options['help'] ) ) { echo << */ -require( __DIR__ . '/../../../maintenance/Maintenance.php' ); +require __DIR__ . '/../../../maintenance/Maintenance.php'; class GenerateJqueryMsgData extends Maintenance { diff --git a/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php b/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php index 4583360d2e..9c060fa2cb 100644 --- a/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php +++ b/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php @@ -23,7 +23,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 30 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php b/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php index 6375d660ce..117e5c800e 100644 --- a/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php +++ b/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php @@ -23,7 +23,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 04 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php b/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php index fad4e06f86..ed08928d99 100644 --- a/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php +++ b/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php @@ -23,7 +23,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 02 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php b/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php index 37f5af2fc8..da10eec464 100644 --- a/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php +++ b/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php @@ -24,7 +24,7 @@ */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 09 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php b/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php index 536ceb66eb..3b2f012647 100644 --- a/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php +++ b/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php @@ -23,7 +23,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 10 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php b/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php index f0efce6e5a..f7f5910a97 100644 --- a/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php +++ b/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php @@ -23,7 +23,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 29 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiInstallationCommonFunction.php b/tests/selenium/installer/MediaWikiInstallationCommonFunction.php index a9a8fc3821..472d2ed67a 100644 --- a/tests/selenium/installer/MediaWikiInstallationCommonFunction.php +++ b/tests/selenium/installer/MediaWikiInstallationCommonFunction.php @@ -24,9 +24,9 @@ */ require_once 'PHPUnit/Extensions/SeleniumTestCase.php'; -require_once ( __DIR__ . '/MediaWikiInstallationConfig.php' ); -require_once ( __DIR__ . '/MediaWikiInstallationMessage.php' ); -require_once ( __DIR__ . '/MediaWikiInstallationVariables.php' ); +require_once __DIR__ . '/MediaWikiInstallationConfig.php'; +require_once __DIR__ . '/MediaWikiInstallationMessage.php'; +require_once __DIR__ . '/MediaWikiInstallationVariables.php'; class MediaWikiInstallationCommonFunction extends PHPUnit_Extensions_SeleniumTestCase { function setUp() { diff --git a/tests/selenium/installer/MediaWikiInstallerTestSuite.php b/tests/selenium/installer/MediaWikiInstallerTestSuite.php index 6946cc75a2..e32a9e6430 100644 --- a/tests/selenium/installer/MediaWikiInstallerTestSuite.php +++ b/tests/selenium/installer/MediaWikiInstallerTestSuite.php @@ -29,19 +29,19 @@ if ( PHP_SAPI != 'cli' ) { require_once 'PHPUnit/Framework/TestSuite.php'; -require_once ( __DIR__ . '/MediaWikiUserInterfaceTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiButtonsAvailabilityTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiHelpFieldHintTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiRightFrameworkLinksTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiRestartInstallationTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiErrorsConnectToDatabasePageTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiErrorsNamepageTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiMySQLDataBaseTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiMySQLiteDataBaseTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiUpgradeExistingDatabaseTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiDifferntDatabasePrefixTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiDifferentDatabaseAccountTestCase.php' ); -require_once ( __DIR__ . '/MediaWikiOnAlreadyInstalledTestCase.php' ); +require_once __DIR__ . '/MediaWikiUserInterfaceTestCase.php'; +require_once __DIR__ . '/MediaWikiButtonsAvailabilityTestCase.php'; +require_once __DIR__ . '/MediaWikiHelpFieldHintTestCase.php'; +require_once __DIR__ . '/MediaWikiRightFrameworkLinksTestCase.php'; +require_once __DIR__ . '/MediaWikiRestartInstallationTestCase.php'; +require_once __DIR__ . '/MediaWikiErrorsConnectToDatabasePageTestCase.php'; +require_once __DIR__ . '/MediaWikiErrorsNamepageTestCase.php'; +require_once __DIR__ . '/MediaWikiMySQLDataBaseTestCase.php'; +require_once __DIR__ . '/MediaWikiMySQLiteDataBaseTestCase.php'; +require_once __DIR__ . '/MediaWikiUpgradeExistingDatabaseTestCase.php'; +require_once __DIR__ . '/MediaWikiDifferntDatabasePrefixTestCase.php'; +require_once __DIR__ . '/MediaWikiDifferentDatabaseAccountTestCase.php'; +require_once __DIR__ . '/MediaWikiOnAlreadyInstalledTestCase.php'; $suite = new PHPUnit_Framework_TestSuite( 'ArrayTest' ); $result = new PHPUnit_Framework_TestResult; diff --git a/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php b/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php index 92f26d050d..823bb8cbcc 100644 --- a/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php +++ b/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php @@ -23,7 +23,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 01 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php b/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php index e9be370462..11d04376ac 100644 --- a/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php +++ b/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php @@ -24,7 +24,7 @@ */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 06 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php index ce27500b60..6c77dee21f 100644 --- a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php +++ b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php @@ -24,7 +24,7 @@ */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** diff --git a/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php b/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php index f34210cba2..1a026f1435 100644 --- a/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php +++ b/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php @@ -23,7 +23,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 11, 12 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php b/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php index 039d71a429..709085f1c5 100644 --- a/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php +++ b/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php @@ -23,7 +23,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 14, 15, 16, 17 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php b/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php index cd901d186f..0f969b7ac7 100644 --- a/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php +++ b/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php @@ -23,7 +23,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 05 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php b/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php index 97331523ca..71ef6849bb 100644 --- a/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php +++ b/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php @@ -23,7 +23,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); +require_once __DIR__ . '/MediaWikiInstallationCommonFunction.php'; /** * Test Case ID : 18 - 27 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/suites/SimpleSeleniumTestSuite.php b/tests/selenium/suites/SimpleSeleniumTestSuite.php index 446836a295..9fe6fb82ec 100644 --- a/tests/selenium/suites/SimpleSeleniumTestSuite.php +++ b/tests/selenium/suites/SimpleSeleniumTestSuite.php @@ -3,7 +3,7 @@ * Sample test suite. * Two ways to configure MW for these tests * 1) If you are running multiple test suites, add the following in LocalSettings.php - * require_once("tests/selenium/SimpleSeleniumConfig.php"); + * require_once "tests/selenium/SimpleSeleniumConfig.php"; * $wgSeleniumTestConfigs['SimpleSeleniumTestSuite'] = 'SimpleSeleniumConfig::getSettings'; * OR * 2) Add the following to your Localsettings.php diff --git a/thumb_handler.php b/thumb_handler.php index 69bdddd8ca..7afa9aa774 100644 --- a/thumb_handler.php +++ b/thumb_handler.php @@ -26,4 +26,4 @@ define( 'THUMB_HANDLER', true ); # Execute thumb.php, having set THUMB_HANDLER so that # it knows to extract params from a thumbnail file URL. -require( __DIR__ . '/thumb.php' ); +require __DIR__ . '/thumb.php'; diff --git a/wiki.phtml b/wiki.phtml index 435dff0efc..b5450e1108 100644 --- a/wiki.phtml +++ b/wiki.phtml @@ -1,3 +1,3 @@