X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=325f894c5c913fb9e56ff8ddf54da8f798468bf5;hb=290fc4de64a8b4503c4b2a25a058b23aa1c390f4;hp=c673f6fe9fdcaed2cdf187c40e4203bac8e8ef13;hpb=181ba1d9b578d6d6f8ed3d65f811ce4f54294f56;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index c673f6fe9f..325f894c5c 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -313,19 +313,19 @@ abstract class Installer { * output format such as HTML or text before being sent to the user. * @param $msg */ - public abstract function showMessage( $msg /*, ... */ ); + abstract public function showMessage( $msg /*, ... */ ); /** * Same as showMessage(), but for displaying errors * @param $msg */ - public abstract function showError( $msg /*, ... */ ); + abstract public function showError( $msg /*, ... */ ); /** * Show a message to the installing user by using a Status object * @param $status Status */ - public abstract function showStatusMessage( Status $status ); + abstract public function showStatusMessage( Status $status ); /** * Constructor, always call this from child classes. @@ -488,7 +488,7 @@ abstract class Installer { if( !$_lsExists ) { return false; } - unset($_lsExists); + unset( $_lsExists ); require( "$IP/includes/DefaultSettings.php" ); require( "$IP/LocalSettings.php" ); @@ -927,7 +927,7 @@ abstract class Installer { * Helper function to be called from envCheckServer() * @return String */ - protected abstract function envGetDefaultServer(); + abstract protected function envGetDefaultServer(); /** * Environment check for setting $IP and $wgScriptPath. @@ -1073,18 +1073,18 @@ abstract class Installer { * @return string */ protected function unicodeChar( $c ) { - $c = hexdec($c); - if ($c <= 0x7F) { - return chr($c); - } elseif ($c <= 0x7FF) { - return chr(0xC0 | $c >> 6) . chr(0x80 | $c & 0x3F); - } elseif ($c <= 0xFFFF) { - return chr(0xE0 | $c >> 12) . chr(0x80 | $c >> 6 & 0x3F) - . chr(0x80 | $c & 0x3F); - } elseif ($c <= 0x10FFFF) { - return chr(0xF0 | $c >> 18) . chr(0x80 | $c >> 12 & 0x3F) - . chr(0x80 | $c >> 6 & 0x3F) - . chr(0x80 | $c & 0x3F); + $c = hexdec( $c ); + if ( $c <= 0x7F ) { + return chr( $c ); + } elseif ( $c <= 0x7FF ) { + return chr( 0xC0 | $c >> 6 ) . chr( 0x80 | $c & 0x3F ); + } elseif ( $c <= 0xFFFF ) { + return chr( 0xE0 | $c >> 12 ) . chr( 0x80 | $c >> 6 & 0x3F ) + . chr( 0x80 | $c & 0x3F ); + } elseif ( $c <= 0x10FFFF ) { + return chr( 0xF0 | $c >> 18 ) . chr( 0x80 | $c >> 12 & 0x3F ) + . chr( 0x80 | $c >> 6 & 0x3F ) + . chr( 0x80 | $c & 0x3F ); } else { return false; } @@ -1105,8 +1105,8 @@ abstract class Installer { * Note that we use the hex representation to create the code * points in order to avoid any Unicode-destroying during transit. */ - $not_normal_c = $this->unicodeChar("FA6C"); - $normal_c = $this->unicodeChar("242EE"); + $not_normal_c = $this->unicodeChar( "FA6C" ); + $normal_c = $this->unicodeChar( "242EE" ); $useNormalizer = 'php'; $needsUpdate = false;