diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21 index 303e0b0fe914..445e226953b3 100644 --- a/RELEASE-NOTES-1.21 +++ b/RELEASE-NOTES-1.21 @@ -291,6 +291,13 @@ changes to languages because of Bugzilla reports. Vector extension (and possibly disable its features using config settings if you don't want them). * Experimental IBM DB2 support was removed due to lack of interest and maintainership +* BREAKING CHANGE: Filenames of maintenance scripts were standardized into lowerCamelCase + format, and made more explicit: clear_stats.php -> clearCacheStats.php; + clear_interwiki_cache.php -> clearInterwikiCache.php; initStats.php -> initSiteStats.php; + proxy_check.php -> proxyCheck.php; stats.php -> showCacheStats.php; + showStats.php -> showSiteStats.php. Class names were renamed accordingly: + clear_stats -> ClearCacheStats; InitStats -> InitSiteStats; CacheStats -> ShowCacheStats + ShowStats -> ShowSiteStats. == Compatibility == diff --git a/docs/maintenance.txt b/docs/maintenance.txt index 988ff28093d7..27619c8622f7 100644 --- a/docs/maintenance.txt +++ b/docs/maintenance.txt @@ -15,7 +15,7 @@ subdirectories, all of which have unique purposes. level /maintenance directory. Example: - php clear_stats.php + php clearCacheStats.php The following parameters are available to all maintenance scripts --help : Print a help message diff --git a/docs/memcached.txt b/docs/memcached.txt index 971a611a0dc2..f54a4e7ad07d 100644 --- a/docs/memcached.txt +++ b/docs/memcached.txt @@ -237,9 +237,9 @@ Statistics: controlled by: $wgStatsMethod key: $wgDBname:stats:$key ex: wikibd:stats:request_with_session - stores: counter for statistics (see maintenance/stats.php script) + stores: counter for statistics (see maintenance/showCacheStats.php script) expiry: none (?) - cleared by: maintenance/clear_stats.php script + cleared by: maintenance/clearCacheStats.php script User: key: $wgDBname:user:id:$sId diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 7b80715b9dfb..eb727a5deea7 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4406,7 +4406,7 @@ /** Port we want to scan for a proxy */ $wgProxyPorts = array( 80, 81, 1080, 3128, 6588, 8000, 8080, 8888, 65506 ); /** Script used to scan */ -$wgProxyScriptPath = "$IP/maintenance/proxy_check.php"; +$wgProxyScriptPath = "$IP/maintenance/proxyCheck.php"; /** */ $wgProxyMemcExpiry = 86400; /** This should always be customised in LocalSettings.php */ diff --git a/includes/specials/SpecialBlockme.php b/includes/specials/SpecialBlockme.php index 3840b2ffed7f..13e2351f1762 100644 --- a/includes/specials/SpecialBlockme.php +++ b/includes/specials/SpecialBlockme.php @@ -22,7 +22,7 @@ */ /** - * A special page called by proxy_check.php to block open proxies + * A special page called by proxyCheck.php to block open proxies * * @ingroup SpecialPage */ diff --git a/maintenance/README b/maintenance/README index 9f95f5de4924..5cb6f5f5ab5a 100644 --- a/maintenance/README +++ b/maintenance/README @@ -93,7 +93,7 @@ installations. runJobs.php Immediately complete all jobs in the job queue - stats.php + showCacheStats.php Show all statistics stored in the cache undelete.php @@ -106,4 +106,4 @@ installations. Update pages restriction to the new schema userOptions.php - Change user options \ No newline at end of file + Change user options diff --git a/maintenance/clear_stats.php b/maintenance/clearCacheStats.php similarity index 96% rename from maintenance/clear_stats.php rename to maintenance/clearCacheStats.php index 4581d5327691..7a0d664aa549 100644 --- a/maintenance/clear_stats.php +++ b/maintenance/clearCacheStats.php @@ -28,7 +28,7 @@ * * @ingroup Maintenance */ -class clear_stats extends Maintenance { +class ClearCacheStats extends Maintenance { public function __construct() { parent::__construct(); @@ -56,5 +56,5 @@ public function execute() { } } -$maintClass = "clear_stats"; +$maintClass = "ClearCacheStats"; require_once( RUN_MAINTENANCE_IF_MAIN ); diff --git a/maintenance/clear_interwiki_cache.php b/maintenance/clearInterwikiCache.php similarity index 100% rename from maintenance/clear_interwiki_cache.php rename to maintenance/clearInterwikiCache.php diff --git a/maintenance/initStats.php b/maintenance/initSiteStats.php similarity index 97% rename from maintenance/initStats.php rename to maintenance/initSiteStats.php index 5d8b8866a931..19906592d77d 100644 --- a/maintenance/initStats.php +++ b/maintenance/initSiteStats.php @@ -30,7 +30,7 @@ * * @ingroup Maintenance */ -class InitStats extends Maintenance { +class InitSiteStats extends Maintenance { public function __construct() { parent::__construct(); $this->mDescription = "Re-initialise the site statistics tables"; @@ -84,5 +84,5 @@ public function execute() { } } -$maintClass = "InitStats"; +$maintClass = "InitSiteStats"; require_once( RUN_MAINTENANCE_IF_MAIN ); diff --git a/maintenance/proxy_check.php b/maintenance/proxyCheck.php similarity index 100% rename from maintenance/proxy_check.php rename to maintenance/proxyCheck.php diff --git a/maintenance/stats.php b/maintenance/showCacheStats.php similarity index 98% rename from maintenance/stats.php rename to maintenance/showCacheStats.php index be448f9946b7..8f2386800e7f 100644 --- a/maintenance/stats.php +++ b/maintenance/showCacheStats.php @@ -28,7 +28,7 @@ * * @ingroup Maintenance */ -class CacheStats extends Maintenance { +class ShowCacheStats extends Maintenance { public function __construct() { $this->mDescription = "Show statistics from the cache"; @@ -102,5 +102,5 @@ public function execute() { } } -$maintClass = "CacheStats"; +$maintClass = "ShowCacheStats"; require_once( RUN_MAINTENANCE_IF_MAIN ); diff --git a/maintenance/showStats.php b/maintenance/showSiteStats.php similarity index 95% rename from maintenance/showStats.php rename to maintenance/showSiteStats.php index 303640612360..e7359b2f631f 100644 --- a/maintenance/showStats.php +++ b/maintenance/showSiteStats.php @@ -22,7 +22,7 @@ * @file * @ingroup Maintenance * @author Antoine Musso - * Based on initStats.php by: + * Based on initSiteStats.php by: * @author Brion Vibber * @author Rob Church * @@ -36,7 +36,7 @@ * * @ingroup Maintenance */ -class ShowStats extends Maintenance { +class ShowSiteStats extends Maintenance { public function __construct() { parent::__construct(); $this->mDescription = "Show the cached statistics"; @@ -69,5 +69,5 @@ public function execute() { } } -$maintClass = "ShowStats"; +$maintClass = "ShowSiteStats"; require_once( RUN_MAINTENANCE_IF_MAIN );