| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -361,7 +361,7 @@ |
| 362 | 362 | /** |
| 363 | 363 | * Check if we're installing the latest version. |
| 364 | 364 | */ |
| 365 | | - public function envCheckMediaWikiVersion() { |
| | 365 | + protected function envCheckMediaWikiVersion() { |
| 366 | 366 | global $wgVersion; |
| 367 | 367 | |
| 368 | 368 | if( !$this->getVar( '_ExternalHTTP' ) ) { |
| — | — | @@ -393,7 +393,7 @@ |
| 394 | 394 | /** |
| 395 | 395 | * Environment check for DB types. |
| 396 | 396 | */ |
| 397 | | - public function envCheckDB() { |
| | 397 | + protected function envCheckDB() { |
| 398 | 398 | global $wgLang; |
| 399 | 399 | |
| 400 | 400 | $compiledDBs = array(); |
| — | — | @@ -437,7 +437,7 @@ |
| 438 | 438 | /** |
| 439 | 439 | * Environment check for register_globals. |
| 440 | 440 | */ |
| 441 | | - public function envCheckRegisterGlobals() { |
| | 441 | + protected function envCheckRegisterGlobals() { |
| 442 | 442 | if( wfIniGetBool( "magic_quotes_runtime" ) ) { |
| 443 | 443 | $this->showMessage( 'config-register-globals' ); |
| 444 | 444 | } |
| — | — | @@ -446,7 +446,7 @@ |
| 447 | 447 | /** |
| 448 | 448 | * Some versions of libxml+PHP break < and > encoding horribly |
| 449 | 449 | */ |
| 450 | | - public function envCheckBrokenXML() { |
| | 450 | + protected function envCheckBrokenXML() { |
| 451 | 451 | $test = new PhpXmlBugTester(); |
| 452 | 452 | if ( !$test->ok ) { |
| 453 | 453 | $this->showMessage( 'config-brokenlibxml' ); |
| — | — | @@ -458,7 +458,7 @@ |
| 459 | 459 | * Test PHP (probably 5.3.1, but it could regress again) to make sure that |
| 460 | 460 | * reference parameters to __call() are not converted to null |
| 461 | 461 | */ |
| 462 | | - public function envCheckPHP531() { |
| | 462 | + protected function envCheckPHP531() { |
| 463 | 463 | $test = new PhpRefCallBugTester; |
| 464 | 464 | $test->execute(); |
| 465 | 465 | if ( !$test->ok ) { |
| — | — | @@ -470,7 +470,7 @@ |
| 471 | 471 | /** |
| 472 | 472 | * Environment check for magic_quotes_runtime. |
| 473 | 473 | */ |
| 474 | | - public function envCheckMagicQuotes() { |
| | 474 | + protected function envCheckMagicQuotes() { |
| 475 | 475 | if( wfIniGetBool( "magic_quotes_runtime" ) ) { |
| 476 | 476 | $this->showMessage( 'config-magic-quotes-runtime' ); |
| 477 | 477 | return false; |
| — | — | @@ -480,7 +480,7 @@ |
| 481 | 481 | /** |
| 482 | 482 | * Environment check for magic_quotes_sybase. |
| 483 | 483 | */ |
| 484 | | - public function envCheckMagicSybase() { |
| | 484 | + protected function envCheckMagicSybase() { |
| 485 | 485 | if ( wfIniGetBool( 'magic_quotes_sybase' ) ) { |
| 486 | 486 | $this->showMessage( 'config-magic-quotes-sybase' ); |
| 487 | 487 | return false; |
| — | — | @@ -490,7 +490,7 @@ |
| 491 | 491 | /** |
| 492 | 492 | * Environment check for mbstring.func_overload. |
| 493 | 493 | */ |
| 494 | | - public function envCheckMbstring() { |
| | 494 | + protected function envCheckMbstring() { |
| 495 | 495 | if ( wfIniGetBool( 'mbstring.func_overload' ) ) { |
| 496 | 496 | $this->showMessage( 'config-mbstring' ); |
| 497 | 497 | return false; |
| — | — | @@ -500,7 +500,7 @@ |
| 501 | 501 | /** |
| 502 | 502 | * Environment check for zend.ze1_compatibility_mode. |
| 503 | 503 | */ |
| 504 | | - public function envCheckZE1() { |
| | 504 | + protected function envCheckZE1() { |
| 505 | 505 | if ( wfIniGetBool( 'zend.ze1_compatibility_mode' ) ) { |
| 506 | 506 | $this->showMessage( 'config-ze1' ); |
| 507 | 507 | return false; |
| — | — | @@ -510,7 +510,7 @@ |
| 511 | 511 | /** |
| 512 | 512 | * Environment check for safe_mode. |
| 513 | 513 | */ |
| 514 | | - public function envCheckSafeMode() { |
| | 514 | + protected function envCheckSafeMode() { |
| 515 | 515 | if ( wfIniGetBool( 'safe_mode' ) ) { |
| 516 | 516 | $this->setVar( '_SafeMode', true ); |
| 517 | 517 | $this->showMessage( 'config-safe-mode' ); |
| — | — | @@ -520,7 +520,7 @@ |
| 521 | 521 | /** |
| 522 | 522 | * Environment check for the XML module. |
| 523 | 523 | */ |
| 524 | | - public function envCheckXML() { |
| | 524 | + protected function envCheckXML() { |
| 525 | 525 | if ( !function_exists( "utf8_encode" ) ) { |
| 526 | 526 | $this->showMessage( 'config-xml-bad' ); |
| 527 | 527 | return false; |
| — | — | @@ -531,7 +531,7 @@ |
| 532 | 532 | /** |
| 533 | 533 | * Environment check for the PCRE module. |
| 534 | 534 | */ |
| 535 | | - public function envCheckPCRE() { |
| | 535 | + protected function envCheckPCRE() { |
| 536 | 536 | if ( !function_exists( 'preg_match' ) ) { |
| 537 | 537 | $this->showMessage( 'config-pcre' ); |
| 538 | 538 | return false; |
| — | — | @@ -548,7 +548,7 @@ |
| 549 | 549 | /** |
| 550 | 550 | * Environment check for available memory. |
| 551 | 551 | */ |
| 552 | | - public function envCheckMemory() { |
| | 552 | + protected function envCheckMemory() { |
| 553 | 553 | $limit = ini_get( 'memory_limit' ); |
| 554 | 554 | |
| 555 | 555 | if ( !$limit || $limit == -1 ) { |
| — | — | @@ -579,7 +579,7 @@ |
| 580 | 580 | /** |
| 581 | 581 | * Environment check for compiled object cache types. |
| 582 | 582 | */ |
| 583 | | - public function envCheckCache() { |
| | 583 | + protected function envCheckCache() { |
| 584 | 584 | $caches = array(); |
| 585 | 585 | |
| 586 | 586 | foreach ( $this->objectCaches as $name => $function ) { |
| — | — | @@ -599,7 +599,7 @@ |
| 600 | 600 | /** |
| 601 | 601 | * Search for GNU diff3. |
| 602 | 602 | */ |
| 603 | | - public function envCheckDiff3() { |
| | 603 | + protected function envCheckDiff3() { |
| 604 | 604 | $names = array( "gdiff3", "diff3", "diff3.exe" ); |
| 605 | 605 | $versionInfo = array( '$1 --version 2>&1', 'GNU diffutils' ); |
| 606 | 606 | |
| — | — | @@ -617,7 +617,7 @@ |
| 618 | 618 | /** |
| 619 | 619 | * Environment check for ImageMagick and GD. |
| 620 | 620 | */ |
| 621 | | - public function envCheckGraphics() { |
| | 621 | + protected function envCheckGraphics() { |
| 622 | 622 | $names = array( wfIsWindows() ? 'convert.exe' : 'convert' ); |
| 623 | 623 | $convert = $this->locateExecutableInDefaultPaths( $names, array( '$1 -version', 'ImageMagick' ) ); |
| 624 | 624 | |
| — | — | @@ -636,7 +636,7 @@ |
| 637 | 637 | /** |
| 638 | 638 | * Environment check for setting $IP and $wgScriptPath. |
| 639 | 639 | */ |
| 640 | | - public function envCheckPath() { |
| | 640 | + protected function envCheckPath() { |
| 641 | 641 | global $IP; |
| 642 | 642 | $IP = dirname( dirname( dirname( __FILE__ ) ) ); |
| 643 | 643 | |
| — | — | @@ -666,7 +666,7 @@ |
| 667 | 667 | /** |
| 668 | 668 | * Environment check for setting the preferred PHP file extension. |
| 669 | 669 | */ |
| 670 | | - public function envCheckExtension() { |
| | 670 | + protected function envCheckExtension() { |
| 671 | 671 | // FIXME: detect this properly |
| 672 | 672 | if ( defined( 'MW_INSTALL_PHP5_EXT' ) ) { |
| 673 | 673 | $ext = 'php5'; |
| — | — | @@ -681,7 +681,7 @@ |
| 682 | 682 | /** |
| 683 | 683 | * TODO: document |
| 684 | 684 | */ |
| 685 | | - public function envCheckShellLocale() { |
| | 685 | + protected function envCheckShellLocale() { |
| 686 | 686 | $os = php_uname( 's' ); |
| 687 | 687 | $supported = array( 'Linux', 'SunOS', 'HP-UX', 'Darwin' ); # Tested these |
| 688 | 688 | |
| — | — | @@ -758,7 +758,7 @@ |
| 759 | 759 | /** |
| 760 | 760 | * TODO: document |
| 761 | 761 | */ |
| 762 | | - public function envCheckUploadsDirectory() { |
| | 762 | + protected function envCheckUploadsDirectory() { |
| 763 | 763 | global $IP, $wgServer; |
| 764 | 764 | |
| 765 | 765 | $dir = $IP . '/images/'; |
| — | — | @@ -799,7 +799,7 @@ |
| 800 | 800 | /** |
| 801 | 801 | * Check the libicu version |
| 802 | 802 | */ |
| 803 | | - public function envCheckLibicu() { |
| | 803 | + protected function envCheckLibicu() { |
| 804 | 804 | $utf8 = function_exists( 'utf8_normalize' ); |
| 805 | 805 | $intl = function_exists( 'normalizer_normalize' ); |
| 806 | 806 | |