| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -271,9 +271,8 @@ |
| 272 | 272 | |
| 273 | 273 | /** |
| 274 | 274 | * Clean up from execute() |
| 275 | | - * @private. |
| 276 | 275 | */ |
| 277 | | - function finish() { |
| | 276 | + private function finish() { |
| 278 | 277 | $this->output->output(); |
| 279 | 278 | $this->session['happyPages'] = $this->happyPages; |
| 280 | 279 | $this->session['skippedPages'] = $this->skippedPages; |
| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -11,9 +11,8 @@ |
| 12 | 12 | * MediaWiki configuration globals that will eventually be passed through |
| 13 | 13 | * to LocalSettings.php. The names only are given here, the defaults |
| 14 | 14 | * typically come from DefaultSettings.php. |
| 15 | | - * @protected |
| 16 | 15 | */ |
| 17 | | - var $defaultVarNames = array( |
| | 16 | + protected $defaultVarNames = array( |
| 18 | 17 | 'wgSitename', |
| 19 | 18 | 'wgPasswordSender', |
| 20 | 19 | 'wgLanguageCode', |
| — | — | @@ -44,9 +43,8 @@ |
| 45 | 44 | * Variables that are stored alongside globals, and are used for any |
| 46 | 45 | * configuration of the installation process aside from the MediaWiki |
| 47 | 46 | * configuration. Map of names to defaults. |
| 48 | | - * @protected |
| 49 | 47 | */ |
| 50 | | - var $internalDefaults = array( |
| | 48 | + protected $internalDefaults = array( |
| 51 | 49 | '_UserLang' => 'en', |
| 52 | 50 | '_Environment' => false, |
| 53 | 51 | '_CompiledDBs' => array(), |
| — | — | @@ -78,9 +76,8 @@ |
| 79 | 77 | * |
| 80 | 78 | * To add a new type, create a <type>Installer class and a Database<type> |
| 81 | 79 | * class, and add a config-type-<type> message to MessagesEn.php. |
| 82 | | - * @private |
| 83 | 80 | */ |
| 84 | | - var $dbTypes = array( |
| | 81 | + private $dbTypes = array( |
| 85 | 82 | 'mysql', |
| 86 | 83 | 'postgres', |
| 87 | 84 | 'sqlite', |
| — | — | @@ -94,17 +91,15 @@ |
| 95 | 92 | |
| 96 | 93 | /** |
| 97 | 94 | * Cached DB installer instances, access using getDBInstaller() |
| 98 | | - * @private |
| 99 | 95 | */ |
| 100 | | - var $dbInstallers = array(); |
| | 96 | + private $dbInstallers = array(); |
| 101 | 97 | |
| 102 | 98 | /** |
| 103 | 99 | * A list of environment check methods called by doEnvironmentChecks(). |
| 104 | 100 | * These may output warnings using showMessage(), and/or abort the |
| 105 | 101 | * installation process by returning false. |
| 106 | | - * @protected |
| 107 | 102 | */ |
| 108 | | - var $envChecks = array( |
| | 103 | + protected $envChecks = array( |
| 109 | 104 | 'envLatestVersion', |
| 110 | 105 | 'envCheckDB', |
| 111 | 106 | 'envCheckRegisterGlobals', |
| — | — | @@ -126,7 +121,10 @@ |
| 127 | 122 | 'envCheckUploadsDirectory', |
| 128 | 123 | ); |
| 129 | 124 | |
| 130 | | - var $installSteps = array( |
| | 125 | + /** |
| | 126 | + * Steps for installation. |
| | 127 | + */ |
| | 128 | + protected $installSteps = array( |
| 131 | 129 | 'database', |
| 132 | 130 | 'tables', |
| 133 | 131 | 'interwiki', |
| — | — | @@ -137,9 +135,8 @@ |
| 138 | 136 | |
| 139 | 137 | /** |
| 140 | 138 | * Known object cache types and the functions used to test for their existence |
| 141 | | - * @protected |
| 142 | 139 | */ |
| 143 | | - var $objectCaches = array( |
| | 140 | + protected $objectCaches = array( |
| 144 | 141 | 'xcache' => 'xcache_get', |
| 145 | 142 | 'apc' => 'apc_fetch', |
| 146 | 143 | 'eaccel' => 'eaccelerator_get', |
| — | — | @@ -207,9 +204,8 @@ |
| 208 | 205 | ); |
| 209 | 206 | /** |
| 210 | 207 | * Cached Title and ParserOptions used by parse() |
| 211 | | - * @private |
| 212 | 208 | */ |
| 213 | | - var $parserTitle, $parserOptions; |
| | 209 | + private $parserTitle, $parserOptions; |
| 214 | 210 | |
| 215 | 211 | /** |
| 216 | 212 | * Constructor, always call this from child classes |