From: Timo Tijhof Date: Tue, 7 May 2013 23:00:15 +0000 (+0200) Subject: phpcs: Fix WhiteSpace.LanguageConstructSpacing warnings X-Git-Tag: 1.31.0-rc.0~19726^2 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=50e7985d4d5e9f70bd27e61d84d43514004f23da;p=lhc%2Fweb%2Fwiklou.git phpcs: Fix WhiteSpace.LanguageConstructSpacing warnings Squiz.WhiteSpace.LanguageConstructSpacing: Language constructs must be followed by a single space; expected "require_once expression" but found "require_once(expression)" It is a keyword (e.g. like `new`, `return` and `print`). As such the parentheses don't make sense. Per our code conventions, we use a space after keywords like these. We appeared to have an unwritten exception for `require` that doesn't make sense. About 60% of require/include usage was missing the space and/or had superfluous parentheses. It is as silly as print("foo") or return("foo"), it works because keywords have no significance for whitespace between it and the expression that follows, and since experessions can be wrapped in parentheses for clarity (e.g. when doing string concatenation or mathematical operations) the parenthesis before and after basiclaly just ignored. Change-Id: I2df2f80b8123714bea7e0771bf94b51ad5bb4b87 --- diff --git a/docs/maintenance.txt b/docs/maintenance.txt index 27619c8622..87a32a8037 100644 --- a/docs/maintenance.txt +++ b/docs/maintenance.txt @@ -34,7 +34,7 @@ In it, write the following: $value ) { if ( is_array( $value ) ) { diff --git a/includes/Skin.php b/includes/Skin.php index ca7a91b833..245fac2a59 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -164,7 +164,7 @@ abstract class Skin extends ContextSource { # Grab the skin class and initialise it. if ( !class_exists( $className ) ) { - require_once( "{$wgStyleDirectory}/{$skinName}.php" ); + require_once "{$wgStyleDirectory}/{$skinName}.php"; # Check if we got if not fallback to default skin if ( !class_exists( $className ) ) { @@ -174,7 +174,7 @@ abstract class Skin extends ContextSource { # is no longer valid. wfDebug( "Skin class does not exist: $className\n" ); $className = 'SkinVector'; - require_once( "{$wgStyleDirectory}/Vector.php" ); + require_once "{$wgStyleDirectory}/Vector.php"; } } $skin = new $className( $key ); diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php index c2814e6309..f619c79010 100644 --- a/includes/SpecialPage.php +++ b/includes/SpecialPage.php @@ -676,7 +676,7 @@ class SpecialPage { $func = $this->mFunction; // only load file if the function does not exist if ( !is_callable( $func ) && $this->mFile ) { - require_once( $this->mFile ); + require_once $this->mFile; } $this->outputHeader(); call_user_func( $func, $subPage, $this ); diff --git a/includes/UserMailer.php b/includes/UserMailer.php index 370bac9fe3..e48070aa04 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -260,7 +260,7 @@ class UserMailer { wfDebug( "PEAR Mail_Mime package is not installed. Falling back to text email.\n" ); } else { - require_once( 'Mail/mime.php' ); + require_once 'Mail/mime.php'; if ( wfIsWindows() ) { $body['text'] = str_replace( "\n", "\r\n", $body['text'] ); $body['html'] = str_replace( "\n", "\r\n", $body['html'] ); @@ -300,7 +300,7 @@ class UserMailer { if ( !stream_resolve_include_path( 'Mail.php' ) ) { throw new MWException( 'PEAR mail package is not installed' ); } - require_once( 'Mail.php' ); + require_once 'Mail.php'; wfSuppressWarnings(); diff --git a/includes/WebStart.php b/includes/WebStart.php index bfa3c7118c..81e7c13e24 100644 --- a/includes/WebStart.php +++ b/includes/WebStart.php @@ -92,27 +92,27 @@ if ( $IP === false ) { } # Get MWInit class -require_once( "$IP/includes/Init.php" ); +require_once "$IP/includes/Init.php"; # Start the autoloader, so that extensions can derive classes from core files -require_once( "$IP/includes/AutoLoader.php" ); +require_once "$IP/includes/AutoLoader.php"; # Load the profiler -require_once( "$IP/includes/profiler/Profiler.php" ); +require_once "$IP/includes/profiler/Profiler.php"; # Load up some global defines. -require_once( "$IP/includes/Defines.php" ); +require_once "$IP/includes/Defines.php"; # Start the profiler $wgProfiler = array(); if ( file_exists( "$IP/StartProfiler.php" ) ) { - require( "$IP/StartProfiler.php" ); + require "$IP/StartProfiler.php"; } wfProfileIn( 'WebStart.php-conf' ); # Load default settings -require_once( "$IP/includes/DefaultSettings.php" ); +require_once "$IP/includes/DefaultSettings.php"; if ( defined( 'MW_CONFIG_CALLBACK' ) ) { # Use a callback function to configure MediaWiki @@ -126,16 +126,16 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) { # the wiki installer needs to be launched or the generated file uploaded to # the root wiki directory if ( !file_exists( MW_CONFIG_FILE ) ) { - require_once( "$IP/includes/templates/NoLocalSettings.php" ); + require_once "$IP/includes/templates/NoLocalSettings.php"; die(); } # Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked) - require_once( MW_CONFIG_FILE ); + require_once MW_CONFIG_FILE; } if ( $wgEnableSelenium ) { - require_once( "$IP/includes/SeleniumWebSettings.php" ); + require_once "$IP/includes/SeleniumWebSettings.php"; } wfProfileOut( 'WebStart.php-conf' ); @@ -146,11 +146,11 @@ wfProfileIn( 'WebStart.php-ob_start' ); # that would cause us to potentially mix gzip and non-gzip output, creating a # big mess. if ( !defined( 'MW_NO_OUTPUT_BUFFER' ) && ob_get_level() == 0 ) { - require_once( "$IP/includes/OutputHandler.php" ); + require_once "$IP/includes/OutputHandler.php" ; ob_start( 'wfOutputHandler' ); } wfProfileOut( 'WebStart.php-ob_start' ); if ( !defined( 'MW_NO_SETUP' ) ) { - require_once( "$IP/includes/Setup.php" ); + require_once "$IP/includes/Setup.php"; } diff --git a/includes/api/ApiQueryQueryPage.php b/includes/api/ApiQueryQueryPage.php index 9d0fd0ab1c..9b2bcb35a9 100644 --- a/includes/api/ApiQueryQueryPage.php +++ b/includes/api/ApiQueryQueryPage.php @@ -46,7 +46,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { // We need to do this to make sure $wgQueryPages is set up // This SUCKS global $IP; - require_once( "$IP/includes/QueryPage.php" ); + require_once "$IP/includes/QueryPage.php"; // Build mapping from special page names to QueryPage classes global $wgQueryPages; diff --git a/includes/cache/LocalisationCache.php b/includes/cache/LocalisationCache.php index 8069836b01..0f229f95e8 100644 --- a/includes/cache/LocalisationCache.php +++ b/includes/cache/LocalisationCache.php @@ -499,7 +499,7 @@ class LocalisationCache { wfProfileIn( __METHOD__ ); // Disable APC caching $_apcEnabled = ini_set( 'apc.cache_by_default', '0' ); - include( $_fileName ); + include $_fileName; ini_set( 'apc.cache_by_default', $_apcEnabled ); if ( $_fileType == 'core' || $_fileType == 'extension' ) { diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php index 371306f2fe..f0c5a213bc 100644 --- a/includes/installer/DatabaseUpdater.php +++ b/includes/installer/DatabaseUpdater.php @@ -21,7 +21,7 @@ * @ingroup Deployment */ -require_once( __DIR__ . '/../../maintenance/Maintenance.php' ); +require_once __DIR__ . '/../../maintenance/Maintenance.php'; /** * Class for handling database updates. Roughly based off of updaters.inc, with diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 084f198d1c..b1517e43af 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -491,10 +491,10 @@ abstract class Installer { } unset( $_lsExists ); - require( "$IP/includes/DefaultSettings.php" ); - require( "$IP/LocalSettings.php" ); + require "$IP/includes/DefaultSettings.php"; + require "$IP/LocalSettings.php"; if ( file_exists( "$IP/AdminSettings.php" ) ) { - require( "$IP/AdminSettings.php" ); + require "$IP/AdminSettings.php"; } return get_defined_vars(); } @@ -1391,10 +1391,10 @@ abstract class Installer { global $wgAutoloadClasses; $wgAutoloadClasses = array(); - require( "$IP/includes/DefaultSettings.php" ); + require "$IP/includes/DefaultSettings.php"; foreach ( $exts as $e ) { - require_once( "$IP/extensions/$e/$e.php" ); + require_once "$IP/extensions/$e/$e.php"; } $hooksWeWant = isset( $wgHooks['LoadExtensionSchemaUpdates'] ) ? diff --git a/includes/normal/RandomTest.php b/includes/normal/RandomTest.php index 9dc1c86150..06029868f1 100644 --- a/includes/normal/RandomTest.php +++ b/includes/normal/RandomTest.php @@ -31,10 +31,10 @@ if( PHP_SAPI != 'cli' ) { } /** */ -require_once( 'UtfNormal.php' ); -require_once( '../diff/DifferenceEngine.php' ); +require_once 'UtfNormal.php'; +require_once '../diff/DifferenceEngine.php'; -dl('php_utfnormal.so' ); +dl( 'php_utfnormal.so' ); # mt_srand( 99999 ); diff --git a/includes/normal/UtfNormal.php b/includes/normal/UtfNormal.php index 77ddb79b3d..5a091afc96 100644 --- a/includes/normal/UtfNormal.php +++ b/includes/normal/UtfNormal.php @@ -190,7 +190,7 @@ class UtfNormal { */ static function loadData() { if( !isset( self::$utfCombiningClass ) ) { - require_once( __DIR__ . '/UtfNormalData.inc' ); + require_once __DIR__ . '/UtfNormalData.inc'; } } @@ -491,7 +491,7 @@ class UtfNormal { */ static function NFKD( $string ) { if( !isset( self::$utfCompatibilityDecomp ) ) { - require_once( 'UtfNormalDataK.inc' ); + require_once 'UtfNormalDataK.inc'; } return self::fastCombiningSort( self::fastDecompose( $string, self::$utfCompatibilityDecomp ) ); diff --git a/includes/normal/UtfNormalTest2.php b/includes/normal/UtfNormalTest2.php index 2266696e70..750c00999b 100644 --- a/includes/normal/UtfNormalTest2.php +++ b/includes/normal/UtfNormalTest2.php @@ -65,7 +65,7 @@ $f = fopen($file, "r"); later and slow down the runtime. */ -require_once("./UtfNormal.php"); +require_once './UtfNormal.php'; function normalize_form_c($c) { return UtfNormal::toNFC($c); } function normalize_form_d($c) { return UtfNormal::toNFD($c); } function normalize_form_kc($c) { return UtfNormal::toNFKC($c); } diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index aa018fca25..fcca5a108d 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -283,7 +283,7 @@ class ResourceLoader { // Get core test suites $testModules = array(); - $testModules['qunit'] = include( "$IP/tests/qunit/QUnitTestResources.php" ); + $testModules['qunit'] = include "$IP/tests/qunit/QUnitTestResources.php"; // Get other test suites (e.g. from extensions) wfRunHooks( 'ResourceLoaderTestModules', array( &$testModules, &$this ) ); diff --git a/maintenance/attachLatest.php b/maintenance/attachLatest.php index 475cafc971..cb480c27b8 100644 --- a/maintenance/attachLatest.php +++ b/maintenance/attachLatest.php @@ -83,4 +83,4 @@ class AttachLatest extends Maintenance { } $maintClass = "AttachLatest"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/benchmarks/bench_HTTP_HTTPS.php b/maintenance/benchmarks/bench_HTTP_HTTPS.php index fa76ae2277..aa477840a7 100644 --- a/maintenance/benchmarks/bench_HTTP_HTTPS.php +++ b/maintenance/benchmarks/bench_HTTP_HTTPS.php @@ -62,4 +62,4 @@ class bench_HTTP_HTTPS extends Benchmarker { } $maintClass = 'bench_HTTP_HTTPS'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/benchmarks/bench_delete_truncate.php b/maintenance/benchmarks/bench_delete_truncate.php index d9741496f5..d86fec6520 100644 --- a/maintenance/benchmarks/bench_delete_truncate.php +++ b/maintenance/benchmarks/bench_delete_truncate.php @@ -101,4 +101,4 @@ class BenchmarkDeleteTruncate extends Benchmarker { } $maintClass = "BenchmarkDeleteTruncate"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/benchmarks/bench_if_switch.php b/maintenance/benchmarks/bench_if_switch.php index 1f590d4da1..c6ef3e4311 100644 --- a/maintenance/benchmarks/bench_if_switch.php +++ b/maintenance/benchmarks/bench_if_switch.php @@ -93,4 +93,4 @@ class bench_if_switch extends Benchmarker { } $maintClass = 'bench_if_switch'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/benchmarks/bench_strtr_str_replace.php b/maintenance/benchmarks/bench_strtr_str_replace.php index 10c5cd0b91..4d6bc351fe 100644 --- a/maintenance/benchmarks/bench_strtr_str_replace.php +++ b/maintenance/benchmarks/bench_strtr_str_replace.php @@ -75,4 +75,4 @@ class bench_strtr_str_replace extends Benchmarker { } $maintClass = 'bench_strtr_str_replace'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/benchmarks/bench_utf8_title_check.php b/maintenance/benchmarks/bench_utf8_title_check.php index 7bb44b404b..86d4808b50 100644 --- a/maintenance/benchmarks/bench_utf8_title_check.php +++ b/maintenance/benchmarks/bench_utf8_title_check.php @@ -123,4 +123,4 @@ class bench_utf8_title_check extends Benchmarker { } $maintClass = 'bench_utf8_title_check'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/benchmarks/bench_wfBaseConvert.php b/maintenance/benchmarks/bench_wfBaseConvert.php index a1e5c6a4e8..151d25a30f 100644 --- a/maintenance/benchmarks/bench_wfBaseConvert.php +++ b/maintenance/benchmarks/bench_wfBaseConvert.php @@ -74,4 +74,4 @@ class bench_wfBaseConvert extends Benchmarker { } $maintClass = 'bench_wfBaseConvert'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/benchmarks/bench_wfIsWindows.php b/maintenance/benchmarks/bench_wfIsWindows.php index 854398278b..34b02a8ad3 100644 --- a/maintenance/benchmarks/bench_wfIsWindows.php +++ b/maintenance/benchmarks/bench_wfIsWindows.php @@ -66,4 +66,4 @@ class bench_wfIsWindows extends Benchmarker { } $maintClass = 'bench_wfIsWindows'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/benchmarks/benchmarkHooks.php b/maintenance/benchmarks/benchmarkHooks.php index fdb016f41a..531fa3181d 100644 --- a/maintenance/benchmarks/benchmarkHooks.php +++ b/maintenance/benchmarks/benchmarkHooks.php @@ -84,4 +84,4 @@ class BenchmarkHooks extends Benchmarker { } $maintClass = 'BenchmarkHooks'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/benchmarks/benchmarkPurge.php b/maintenance/benchmarks/benchmarkPurge.php index ec686b2a00..0932ee5434 100644 --- a/maintenance/benchmarks/benchmarkPurge.php +++ b/maintenance/benchmarks/benchmarkPurge.php @@ -112,4 +112,4 @@ class BenchmarkPurge extends Benchmarker { } $maintClass = "BenchmarkPurge"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/changePassword.php b/maintenance/changePassword.php index 861610b714..bf068628e8 100644 --- a/maintenance/changePassword.php +++ b/maintenance/changePassword.php @@ -62,4 +62,4 @@ class ChangePassword extends Maintenance { } $maintClass = "ChangePassword"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/checkBadRedirects.php b/maintenance/checkBadRedirects.php index 4ba7e66b6c..2db8219ebf 100644 --- a/maintenance/checkBadRedirects.php +++ b/maintenance/checkBadRedirects.php @@ -61,4 +61,4 @@ class CheckBadRedirects extends Maintenance { } $maintClass = "CheckBadRedirects"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/checkImages.php b/maintenance/checkImages.php index c05d91517d..b5faf2e707 100644 --- a/maintenance/checkImages.php +++ b/maintenance/checkImages.php @@ -87,4 +87,4 @@ class CheckImages extends Maintenance { } $maintClass = "CheckImages"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php index efb9471b6a..0d701ebd94 100644 --- a/maintenance/checkSyntax.php +++ b/maintenance/checkSyntax.php @@ -370,4 +370,4 @@ class CheckSyntax extends Maintenance { } $maintClass = "CheckSyntax"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/checkUsernames.php b/maintenance/checkUsernames.php index dd5e0022cb..c6ef8dacb5 100644 --- a/maintenance/checkUsernames.php +++ b/maintenance/checkUsernames.php @@ -58,4 +58,4 @@ class CheckUsernames extends Maintenance { } $maintClass = "CheckUsernames"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/cleanupAncientTables.php b/maintenance/cleanupAncientTables.php index 87f14d01a9..9c6ad8fbf3 100644 --- a/maintenance/cleanupAncientTables.php +++ b/maintenance/cleanupAncientTables.php @@ -110,4 +110,4 @@ class CleanupAncientTables extends Maintenance { } $maintClass = "CleanupAncientTables"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/cleanupCaps.php b/maintenance/cleanupCaps.php index ec2aa957d8..8a5e778c29 100644 --- a/maintenance/cleanupCaps.php +++ b/maintenance/cleanupCaps.php @@ -103,4 +103,4 @@ class CapsCleanup extends TableCleanup { } $maintClass = "CapsCleanup"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php index 4e7b937dbf..42cae2ad22 100644 --- a/maintenance/cleanupImages.php +++ b/maintenance/cleanupImages.php @@ -213,4 +213,4 @@ class ImageCleanup extends TableCleanup { } $maintClass = "ImageCleanup"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/cleanupPreferences.php b/maintenance/cleanupPreferences.php index 58c87e5bd4..0a89e3a266 100644 --- a/maintenance/cleanupPreferences.php +++ b/maintenance/cleanupPreferences.php @@ -49,4 +49,4 @@ class CleanupPreferences extends Maintenance { } $maintClass = 'CleanupPreferences'; // Tells it to run the class -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/cleanupRemovedModules.php b/maintenance/cleanupRemovedModules.php index 700ae1a016..5713948bf5 100644 --- a/maintenance/cleanupRemovedModules.php +++ b/maintenance/cleanupRemovedModules.php @@ -91,4 +91,4 @@ class CleanupRemovedModules extends Maintenance { } $maintClass = "CleanupRemovedModules"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php index a41423ae7f..78ea0de89d 100644 --- a/maintenance/cleanupSpam.php +++ b/maintenance/cleanupSpam.php @@ -141,4 +141,4 @@ class CleanupSpam extends Maintenance { } $maintClass = "CleanupSpam"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php index cbbd5d9134..57eb2b7c6a 100644 --- a/maintenance/cleanupTitles.php +++ b/maintenance/cleanupTitles.php @@ -162,4 +162,4 @@ class TitleCleanup extends TableCleanup { } $maintClass = "TitleCleanup"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/cleanupUploadStash.php b/maintenance/cleanupUploadStash.php index 4379b221f7..e87e7eec2d 100644 --- a/maintenance/cleanupUploadStash.php +++ b/maintenance/cleanupUploadStash.php @@ -140,4 +140,4 @@ class UploadStashCleanup extends Maintenance { } $maintClass = "UploadStashCleanup"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php index c3458dc431..62c7d2f35c 100644 --- a/maintenance/cleanupWatchlist.php +++ b/maintenance/cleanupWatchlist.php @@ -90,4 +90,4 @@ class WatchlistCleanup extends TableCleanup { } $maintClass = "WatchlistCleanup"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/clearCacheStats.php b/maintenance/clearCacheStats.php index 7a0d664aa5..c7f2ce0639 100644 --- a/maintenance/clearCacheStats.php +++ b/maintenance/clearCacheStats.php @@ -57,4 +57,4 @@ class ClearCacheStats extends Maintenance { } $maintClass = "ClearCacheStats"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/clearInterwikiCache.php b/maintenance/clearInterwikiCache.php index 88769df2da..1e1f547b93 100644 --- a/maintenance/clearInterwikiCache.php +++ b/maintenance/clearInterwikiCache.php @@ -55,4 +55,4 @@ class ClearInterwikiCache extends Maintenance { } $maintClass = "ClearInterwikiCache"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/compareParsers.php b/maintenance/compareParsers.php index b361117b32..1fdd00b5fc 100644 --- a/maintenance/compareParsers.php +++ b/maintenance/compareParsers.php @@ -156,4 +156,4 @@ class CompareParsers extends DumpIterator { } $maintClass = "CompareParsers"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/convertLinks.php b/maintenance/convertLinks.php index 4e0d0b028c..f87f7624cd 100644 --- a/maintenance/convertLinks.php +++ b/maintenance/convertLinks.php @@ -259,4 +259,4 @@ This gives a huge speed improvement for very large links tables which are MyISAM } $maintClass = "ConvertLinks"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php index e2223e1a78..d39b040c62 100644 --- a/maintenance/convertUserOptions.php +++ b/maintenance/convertUserOptions.php @@ -96,4 +96,4 @@ class ConvertUserOptions extends Maintenance { } $maintClass = "ConvertUserOptions"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/copyFileBackend.php b/maintenance/copyFileBackend.php index fe422b38a3..81bc915912 100644 --- a/maintenance/copyFileBackend.php +++ b/maintenance/copyFileBackend.php @@ -219,4 +219,4 @@ class CopyFileBackend extends Maintenance { } $maintClass = 'CopyFileBackend'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/copyJobQueue.php b/maintenance/copyJobQueue.php index 3e193976ba..c91264ce21 100644 --- a/maintenance/copyJobQueue.php +++ b/maintenance/copyJobQueue.php @@ -96,4 +96,4 @@ class CopyJobQueue extends Maintenance { } $maintClass = 'CopyJobQueue'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/createAndPromote.php b/maintenance/createAndPromote.php index 5681d41a05..92d3a48e7b 100644 --- a/maintenance/createAndPromote.php +++ b/maintenance/createAndPromote.php @@ -114,4 +114,4 @@ class CreateAndPromote extends Maintenance { } $maintClass = "CreateAndPromote"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/deleteArchivedFiles.php b/maintenance/deleteArchivedFiles.php index 85ffc23b78..ca1062cf0f 100644 --- a/maintenance/deleteArchivedFiles.php +++ b/maintenance/deleteArchivedFiles.php @@ -55,4 +55,4 @@ class DeleteArchivedFiles extends Maintenance { } $maintClass = "DeleteArchivedFiles"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/deleteArchivedRevisions.php b/maintenance/deleteArchivedRevisions.php index 4b658bbb80..18e0d350bb 100644 --- a/maintenance/deleteArchivedRevisions.php +++ b/maintenance/deleteArchivedRevisions.php @@ -59,4 +59,4 @@ class DeleteArchivedRevisions extends Maintenance { } $maintClass = "DeleteArchivedRevisions"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php index 936a52b857..de57e30f36 100644 --- a/maintenance/deleteBatch.php +++ b/maintenance/deleteBatch.php @@ -121,4 +121,4 @@ class DeleteBatch extends Maintenance { } $maintClass = "DeleteBatch"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php index 7f6764b5d2..366e4fbc37 100644 --- a/maintenance/deleteDefaultMessages.php +++ b/maintenance/deleteDefaultMessages.php @@ -86,4 +86,4 @@ class DeleteDefaultMessages extends Maintenance { } $maintClass = "DeleteDefaultMessages"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/deleteEqualMessages.php b/maintenance/deleteEqualMessages.php index 878da42e06..9f5e30263d 100644 --- a/maintenance/deleteEqualMessages.php +++ b/maintenance/deleteEqualMessages.php @@ -151,4 +151,4 @@ class DeleteEqualMessages extends Maintenance { } $maintClass = "DeleteEqualMessages"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/deleteImageMemcached.php b/maintenance/deleteImageMemcached.php index 4ac64ca822..5d967a0c7f 100644 --- a/maintenance/deleteImageMemcached.php +++ b/maintenance/deleteImageMemcached.php @@ -80,4 +80,4 @@ class DeleteImageCache extends Maintenance { } $maintClass = "DeleteImageCache"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/deleteOldRevisions.php b/maintenance/deleteOldRevisions.php index 114aefd7ec..ab8a382665 100644 --- a/maintenance/deleteOldRevisions.php +++ b/maintenance/deleteOldRevisions.php @@ -100,4 +100,4 @@ class DeleteOldRevisions extends Maintenance { } $maintClass = "DeleteOldRevisions"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php index 1eb7262e7b..73b57b345a 100644 --- a/maintenance/deleteOrphanedRevisions.php +++ b/maintenance/deleteOrphanedRevisions.php @@ -92,4 +92,4 @@ class DeleteOrphanedRevisions extends Maintenance { } $maintClass = "DeleteOrphanedRevisions"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/deleteRevision.php b/maintenance/deleteRevision.php index ad6470d9d2..2641cd8922 100644 --- a/maintenance/deleteRevision.php +++ b/maintenance/deleteRevision.php @@ -85,4 +85,4 @@ class DeleteRevision extends Maintenance { } $maintClass = "DeleteRevision"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/deleteSelfExternals.php b/maintenance/deleteSelfExternals.php index 7d16f8ace3..f94b1abd5e 100644 --- a/maintenance/deleteSelfExternals.php +++ b/maintenance/deleteSelfExternals.php @@ -55,4 +55,4 @@ class DeleteSelfExternals extends Maintenance { } $maintClass = "DeleteSelfExternals"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/dumpIterator.php b/maintenance/dumpIterator.php index 3937751cc6..3a511456bc 100644 --- a/maintenance/dumpIterator.php +++ b/maintenance/dumpIterator.php @@ -177,4 +177,4 @@ class SearchDump extends DumpIterator { } $maintClass = "SearchDump"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/dumpLinks.php b/maintenance/dumpLinks.php index 7760bebb7e..14e27890ae 100644 --- a/maintenance/dumpLinks.php +++ b/maintenance/dumpLinks.php @@ -76,4 +76,4 @@ class DumpLinks extends Maintenance { } $maintClass = "DumpLinks"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/dumpSisterSites.php b/maintenance/dumpSisterSites.php index 1ddb9ad8ff..6609a70780 100644 --- a/maintenance/dumpSisterSites.php +++ b/maintenance/dumpSisterSites.php @@ -59,4 +59,4 @@ class DumpSisterSites extends Maintenance { } $maintClass = "DumpSisterSites"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/dumpUploads.php b/maintenance/dumpUploads.php index 0d0dfcf378..5a0890f453 100644 --- a/maintenance/dumpUploads.php +++ b/maintenance/dumpUploads.php @@ -125,4 +125,4 @@ By default, outputs relative paths against the parent directory of \$wgUploadDir } $maintClass = "UploadDumper"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/edit.php b/maintenance/edit.php index 93fc3e79fb..fe5005de54 100644 --- a/maintenance/edit.php +++ b/maintenance/edit.php @@ -92,4 +92,4 @@ class EditCLI extends Maintenance { } $maintClass = "EditCLI"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php index 8c46d69682..02e29fb447 100644 --- a/maintenance/fetchText.php +++ b/maintenance/fetchText.php @@ -88,4 +88,4 @@ class FetchText extends Maintenance { } $maintClass = "FetchText"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/fileOpPerfTest.php b/maintenance/fileOpPerfTest.php index 4be9f212d0..8adc965cea 100644 --- a/maintenance/fileOpPerfTest.php +++ b/maintenance/fileOpPerfTest.php @@ -149,4 +149,4 @@ class TestFileOpPerformance extends Maintenance { } $maintClass = "TestFileOpPerformance"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php index 778da5a180..12268f9165 100644 --- a/maintenance/findHooks.php +++ b/maintenance/findHooks.php @@ -248,4 +248,4 @@ class FindHooks extends Maintenance { } $maintClass = 'FindHooks'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/fixDoubleRedirects.php b/maintenance/fixDoubleRedirects.php index 19b977773e..8c09f8b562 100644 --- a/maintenance/fixDoubleRedirects.php +++ b/maintenance/fixDoubleRedirects.php @@ -134,4 +134,4 @@ class FixDoubleRedirects extends Maintenance { } $maintClass = "FixDoubleRedirects"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/fixExtLinksProtocolRelative.php b/maintenance/fixExtLinksProtocolRelative.php index 2403ec68b4..0ca658983a 100644 --- a/maintenance/fixExtLinksProtocolRelative.php +++ b/maintenance/fixExtLinksProtocolRelative.php @@ -85,4 +85,4 @@ class FixExtLinksProtocolRelative extends LoggedUpdateMaintenance { } $maintClass = "FixExtLinksProtocolRelative"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php index 2e8622baf4..e7dbefde3d 100644 --- a/maintenance/fixSlaveDesync.php +++ b/maintenance/fixSlaveDesync.php @@ -213,4 +213,4 @@ class FixSlaveDesync extends Maintenance { } $maintClass = "FixSlaveDesync"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/fixTimestamps.php b/maintenance/fixTimestamps.php index 84d08d3930..763e0150b4 100644 --- a/maintenance/fixTimestamps.php +++ b/maintenance/fixTimestamps.php @@ -125,4 +125,4 @@ class FixTimestamps extends Maintenance { } $maintClass = "FixTimestamps"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/fixUserRegistration.php b/maintenance/fixUserRegistration.php index 91d42a5d99..524bf20374 100644 --- a/maintenance/fixUserRegistration.php +++ b/maintenance/fixUserRegistration.php @@ -58,4 +58,4 @@ class FixUserRegistration extends Maintenance { } $maintClass = "FixUserRegistration"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/formatInstallDoc.php b/maintenance/formatInstallDoc.php index 39731b1d42..fe547e7b62 100644 --- a/maintenance/formatInstallDoc.php +++ b/maintenance/formatInstallDoc.php @@ -75,4 +75,4 @@ class MaintenanceFormatInstallDoc extends Maintenance { } $maintClass = 'MaintenanceFormatInstallDoc'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php index b356d18692..75907add62 100644 --- a/maintenance/generateSitemap.php +++ b/maintenance/generateSitemap.php @@ -521,4 +521,4 @@ class GenerateSitemap extends Maintenance { } $maintClass = "GenerateSitemap"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/getConfiguration.php b/maintenance/getConfiguration.php index 53ea597356..72e3f0605c 100644 --- a/maintenance/getConfiguration.php +++ b/maintenance/getConfiguration.php @@ -86,4 +86,4 @@ class GetConfiguration extends Maintenance { } $maintClass = "GetConfiguration"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/getLagTimes.php b/maintenance/getLagTimes.php index 68be9f172a..a677e202b2 100644 --- a/maintenance/getLagTimes.php +++ b/maintenance/getLagTimes.php @@ -59,4 +59,4 @@ class GetLagTimes extends Maintenance { } $maintClass = "GetLagTimes"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/getSlaveServer.php b/maintenance/getSlaveServer.php index ec9ed20a0f..5d3d9dd5d5 100644 --- a/maintenance/getSlaveServer.php +++ b/maintenance/getSlaveServer.php @@ -51,4 +51,4 @@ class GetSlaveServer extends Maintenance { } $maintClass = "GetSlaveServer"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/getText.php b/maintenance/getText.php index f6adfe2be1..c68f9bfa09 100644 --- a/maintenance/getText.php +++ b/maintenance/getText.php @@ -62,4 +62,4 @@ class GetTextMaint extends Maintenance { } $maintClass = "GetTextMaint"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/hiphop/run-server b/maintenance/hiphop/run-server index cae878891d..bd6281b12a 100755 --- a/maintenance/hiphop/run-server +++ b/maintenance/hiphop/run-server @@ -25,4 +25,4 @@ class RunHipHopServer extends Maintenance { } } $maintClass = 'RunHipHopServer'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/importDump.php b/maintenance/importDump.php index beadb90a9d..9d15d90eeb 100644 --- a/maintenance/importDump.php +++ b/maintenance/importDump.php @@ -288,4 +288,4 @@ TEXT; } $maintClass = 'BackupReader'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/importSiteScripts.php b/maintenance/importSiteScripts.php index fabc6dc6bb..c498280468 100644 --- a/maintenance/importSiteScripts.php +++ b/maintenance/importSiteScripts.php @@ -105,4 +105,4 @@ class ImportSiteScripts extends Maintenance { } $maintClass = 'ImportSiteScripts'; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/initEditCount.php b/maintenance/initEditCount.php index 3135b4c74b..5985d013cb 100644 --- a/maintenance/initEditCount.php +++ b/maintenance/initEditCount.php @@ -107,4 +107,4 @@ in the load balancer, usually indicating a replication environment.' ); } $maintClass = "InitEditCount"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/initSiteStats.php b/maintenance/initSiteStats.php index 84556b2df1..deddb1d920 100644 --- a/maintenance/initSiteStats.php +++ b/maintenance/initSiteStats.php @@ -85,4 +85,4 @@ class InitSiteStats extends Maintenance { } $maintClass = "InitSiteStats"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/install.php b/maintenance/install.php index 0b1ab5a9e8..031668dffd 100644 --- a/maintenance/install.php +++ b/maintenance/install.php @@ -130,4 +130,4 @@ class CommandLineInstaller extends Maintenance { $maintClass = "CommandLineInstaller"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/jsparse.php b/maintenance/jsparse.php index caffce9708..2bcc8c0bbb 100644 --- a/maintenance/jsparse.php +++ b/maintenance/jsparse.php @@ -74,4 +74,4 @@ class JSParseHelper extends Maintenance { } $maintClass = "JSParseHelper"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/lag.php b/maintenance/lag.php index 3df1169296..c195c4d628 100644 --- a/maintenance/lag.php +++ b/maintenance/lag.php @@ -68,4 +68,4 @@ class DatabaseLag extends Maintenance { } $maintClass = "DatabaseLag"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/language/alltrans.php b/maintenance/language/alltrans.php index 8caf8677f5..74a8033936 100644 --- a/maintenance/language/alltrans.php +++ b/maintenance/language/alltrans.php @@ -44,4 +44,4 @@ class AllTrans extends Maintenance { } $maintClass = "AllTrans"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/language/checkExtensions.php b/maintenance/language/checkExtensions.php index ebc62b6027..8d44e710dc 100644 --- a/maintenance/language/checkExtensions.php +++ b/maintenance/language/checkExtensions.php @@ -22,13 +22,13 @@ */ require_once( __DIR__ . '/../commandLine.inc' ); -require_once( 'languages.inc' ); -require_once( 'checkLanguage.inc' ); +require_once 'languages.inc'; +require_once 'checkLanguage.inc'; if ( !class_exists( 'MessageGroups' ) || !class_exists( 'PremadeMediawikiExtensionGroups' ) ) { echo <<=' ) ) { # PHPUnit 3.5.0 introduced a nice autoloader based on class name - require_once( 'PHPUnit/Autoload.php' ); + require_once 'PHPUnit/Autoload.php'; } else { # Keep the old pre PHPUnit 3.5.0 behavior for compatibility - require_once( 'PHPUnit/TextUI/Command.php' ); + require_once 'PHPUnit/TextUI/Command.php'; } -require_once( 'PHPUnit/Extensions/SeleniumTestCase.php' ); -include_once( 'PHPUnit/Util/Log/JUnit.php' ); +require_once 'PHPUnit/Extensions/SeleniumTestCase.php'; +include_once 'PHPUnit/Util/Log/JUnit.php'; require_once( __DIR__ . "/selenium/SeleniumServerManager.php" ); @@ -255,4 +255,4 @@ class SeleniumTester extends Maintenance { $maintClass = "SeleniumTester"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php index c418a87327..2548273f91 100644 --- a/tests/phpunit/includes/api/ApiUploadTest.php +++ b/tests/phpunit/includes/api/ApiUploadTest.php @@ -16,7 +16,7 @@ // TODO: port the other Upload tests, and other API tests to this framework -require_once( 'ApiTestCaseUpload.php' ); +require_once 'ApiTestCaseUpload.php'; /** * @group Database diff --git a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php index 30ec6c3558..403034b42e 100644 --- a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php @@ -24,7 +24,7 @@ * @file */ -require_once( 'ApiQueryTestBase.php' ); +require_once 'ApiQueryTestBase.php'; /** These tests validate basic functionality of the api query module * diff --git a/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php b/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php index c68065daed..4d5ddbae66 100644 --- a/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php +++ b/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php @@ -18,7 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once( 'ApiQueryContinueTestBase.php' ); +require_once 'ApiQueryContinueTestBase.php'; /** * @group API diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php index 33f46630a1..f494e9ca40 100644 --- a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php @@ -18,7 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -require_once( 'ApiQueryContinueTestBase.php' ); +require_once 'ApiQueryContinueTestBase.php'; /** * These tests validate the new continue functionality of the api query module by diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php index 7f32e5f2a9..0acbe9f2a0 100644 --- a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php +++ b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php @@ -24,7 +24,7 @@ * @file */ -require_once( 'ApiQueryTestBase.php' ); +require_once 'ApiQueryTestBase.php'; abstract class ApiQueryContinueTestBase extends ApiQueryTestBase { diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php index b425d868e8..0b66725e65 100755 --- a/tests/phpunit/phpunit.php +++ b/tests/phpunit/phpunit.php @@ -100,14 +100,14 @@ class PHPUnitMaintClass extends Maintenance { $maintClass = 'PHPUnitMaintClass'; require( RUN_MAINTENANCE_IF_MAIN ); -require_once( 'PHPUnit/Runner/Version.php' ); +require_once 'PHPUnit/Runner/Version.php'; if ( PHPUnit_Runner_Version::id() !== '@package_version@' && version_compare( PHPUnit_Runner_Version::id(), '3.6.7', '<' ) ) { die( 'PHPUnit 3.6.7 or later required, you have ' . PHPUnit_Runner_Version::id() . ".\n" ); } -require_once( 'PHPUnit/Autoload.php' ); +require_once 'PHPUnit/Autoload.php'; require_once( "$IP/tests/TestsAutoLoader.php" ); MediaWikiPHPUnitCommand::main(); diff --git a/tests/qunit/data/generateJqueryMsgData.php b/tests/qunit/data/generateJqueryMsgData.php index 604ede8114..183698059c 100644 --- a/tests/qunit/data/generateJqueryMsgData.php +++ b/tests/qunit/data/generateJqueryMsgData.php @@ -147,4 +147,4 @@ class GenerateJqueryMsgData extends Maintenance { } $maintClass = "GenerateJqueryMsgData"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/tests/selenium/Selenium.php b/tests/selenium/Selenium.php index 07f9867125..935d692d28 100644 --- a/tests/selenium/Selenium.php +++ b/tests/selenium/Selenium.php @@ -4,7 +4,7 @@ * This is implemented as a singleton. */ -require( 'Testing/Selenium.php' ); +require 'Testing/Selenium.php'; class Selenium { protected static $_instance = null; diff --git a/tests/selenium/SeleniumLoader.php b/tests/selenium/SeleniumLoader.php index 8d5e77139a..1a860f4b72 100644 --- a/tests/selenium/SeleniumLoader.php +++ b/tests/selenium/SeleniumLoader.php @@ -2,8 +2,8 @@ class SeleniumLoader { static function load() { - require_once( 'Testing/Selenium.php' ); - require_once( 'PHPUnit/Framework.php' ); - require_once( 'PHPUnit/Extensions/SeleniumTestCase.php' ); + require_once 'Testing/Selenium.php'; + require_once 'PHPUnit/Framework.php'; + require_once 'PHPUnit/Extensions/SeleniumTestCase.php'; } } diff --git a/tests/selenium/SeleniumTestCase.php b/tests/selenium/SeleniumTestCase.php index 5346b1be80..a2676caf2b 100644 --- a/tests/selenium/SeleniumTestCase.php +++ b/tests/selenium/SeleniumTestCase.php @@ -1,5 +1,5 @@