From: Siebrand Mazeland Date: Mon, 25 Nov 2013 13:42:34 +0000 (+0100) Subject: Remove unused local variables, update formatting and documentation X-Git-Tag: 1.31.0-rc.0~17871^2 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=abd42470192b967c563b32945bb000065841fb39;p=lhc%2Fweb%2Fwiklou.git Remove unused local variables, update formatting and documentation Change-Id: Ib17f5f05d6cc48ac448df0ea8515d570713df9b5 --- diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index e6b0fd3323..765838bd1f 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -1152,11 +1152,11 @@ abstract class Installer { 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 ); + . 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 ); + . chr( 0x80 | $c >> 6 & 0x3F ) + . chr( 0x80 | $c & 0x3F ); } else { return false; } @@ -1744,7 +1744,7 @@ abstract class Installer { $GLOBALS['wgMaxShellMemory'] = 0; // Don't bother embedding images into generated CSS, which is not cached - $GLOBALS['wgResourceLoaderLESSFunctions']['embeddable'] = function( $frame, $less ) { + $GLOBALS['wgResourceLoaderLESSFunctions']['embeddable'] = function ( $frame, $less ) { return $less->toBool( false ); }; } diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php index 5f76972c05..2d433244ae 100644 --- a/includes/installer/MysqlInstaller.php +++ b/includes/installer/MysqlInstaller.php @@ -268,9 +268,7 @@ class MysqlInstaller extends DatabaseInstaller { if ( !$status->isOK() ) { return false; } - /** - * @var $conn DatabaseBase - */ + /** @var $conn DatabaseBase */ $conn = $status->value; // Get current account name @@ -436,13 +434,14 @@ class MysqlInstaller extends DatabaseInstaller { if ( !$create ) { // Test the web account try { - $db = DatabaseBase::factory( 'mysql', array( + DatabaseBase::factory( 'mysql', array( 'host' => $this->getVar( 'wgDBserver' ), 'user' => $this->getVar( 'wgDBuser' ), 'password' => $this->getVar( 'wgDBpassword' ), 'dbname' => false, 'flags' => 0, - 'tablePrefix' => $this->getVar( 'wgDBprefix' ) ) ); + 'tablePrefix' => $this->getVar( 'wgDBprefix' ) + ) ); } catch ( DBConnectionError $e ) { return Status::newFatal( 'config-connection-error', $e->getMessage() ); } @@ -479,6 +478,7 @@ class MysqlInstaller extends DatabaseInstaller { if ( !$status->isOK() ) { return $status; } + /** @var DatabaseBase $conn */ $conn = $status->value; $dbName = $this->getVar( 'wgDBname' ); if ( !$conn->selectDB( $dbName ) ) { @@ -516,13 +516,14 @@ class MysqlInstaller extends DatabaseInstaller { if ( $this->getVar( '_CreateDBAccount' ) ) { // Before we blindly try to create a user that already has access, try { // first attempt to connect to the database - $db = DatabaseBase::factory( 'mysql', array( + DatabaseBase::factory( 'mysql', array( 'host' => $server, 'user' => $dbUser, 'password' => $password, 'dbname' => false, 'flags' => 0, - 'tablePrefix' => $this->getVar( 'wgDBprefix' ) ) ); + 'tablePrefix' => $this->getVar( 'wgDBprefix' ) + ) ); $grantableNames[] = $this->buildFullUserName( $dbUser, $server ); $tryToCreate = false; } catch ( DBConnectionError $e ) { diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index 0f4faec701..29b7a472ab 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -34,8 +34,8 @@ class MysqlUpdater extends DatabaseUpdater { array( 'disableContentHandlerUseDB' ), // 1.2 - array( 'addField', 'ipblocks', 'ipb_id', 'patch-ipblocks.sql' ), - array( 'addField', 'ipblocks', 'ipb_expiry', 'patch-ipb_expiry.sql' ), + array( 'addField', 'ipblocks', 'ipb_id', 'patch-ipblocks.sql' ), + array( 'addField', 'ipblocks', 'ipb_expiry', 'patch-ipb_expiry.sql' ), array( 'doInterwikiUpdate' ), array( 'doIndexUpdate' ), array( 'addTable', 'hitcounter', 'patch-hitcounter.sql' ), @@ -217,13 +217,13 @@ class MysqlUpdater extends DatabaseUpdater { // 1.21 array( 'addField', 'revision', 'rev_content_format', 'patch-revision-rev_content_format.sql' ), array( 'addField', 'revision', 'rev_content_model', 'patch-revision-rev_content_model.sql' ), - array( 'addField', 'archive', 'ar_content_format', 'patch-archive-ar_content_format.sql' ), - array( 'addField', 'archive', 'ar_content_model', 'patch-archive-ar_content_model.sql' ), - array( 'addField', 'page', 'page_content_model', 'patch-page-page_content_model.sql' ), + array( 'addField', 'archive', 'ar_content_format', 'patch-archive-ar_content_format.sql' ), + array( 'addField', 'archive', 'ar_content_model', 'patch-archive-ar_content_model.sql' ), + array( 'addField', 'page', 'page_content_model', 'patch-page-page_content_model.sql' ), array( 'enableContentHandlerUseDB' ), - array( 'dropField', 'site_stats', 'ss_admins', 'patch-drop-ss_admins.sql' ), - array( 'dropField', 'recentchanges', 'rc_moved_to_title', 'patch-rc_moved.sql' ), - array( 'addTable', 'sites', 'patch-sites.sql' ), + array( 'dropField', 'site_stats', 'ss_admins', 'patch-drop-ss_admins.sql' ), + array( 'dropField', 'recentchanges', 'rc_moved_to_title', 'patch-rc_moved.sql' ), + array( 'addTable', 'sites', 'patch-sites.sql' ), array( 'addField', 'filearchive', 'fa_sha1', 'patch-fa_sha1.sql' ), array( 'addField', 'job', 'job_token', 'patch-job_token.sql' ), array( 'addField', 'job', 'job_attempts', 'patch-job_attempts.sql' ), @@ -260,6 +260,7 @@ class MysqlUpdater extends DatabaseUpdater { return true; } + /** @var MySQLField $fieldInfo */ $fieldInfo = $this->db->fieldInfo( $table, $field ); if ( $fieldInfo->isBinary() ) { $this->output( "...$table table has correct $field encoding.\n" ); diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php index 77575100c7..113dce6f7c 100644 --- a/includes/installer/OracleInstaller.php +++ b/includes/installer/OracleInstaller.php @@ -247,6 +247,7 @@ class OracleInstaller extends DatabaseInstaller { return $status; } } + $this->db = $status->value; $this->setupSchemaVars(); diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index 6fa22bc924..954c298594 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -34,7 +34,7 @@ class SqliteUpdater extends DatabaseUpdater { array( 'disableContentHandlerUseDB' ), // 1.14 - array( 'addField', 'site_stats', 'ss_active_users', 'patch-ss_active_users.sql' ), + array( 'addField', 'site_stats', 'ss_active_users', 'patch-ss_active_users.sql' ), array( 'doActiveUsersInit' ), array( 'addField', 'ipblocks', 'ipb_allow_usertalk', 'patch-ipb_allow_usertalk.sql' ), array( 'sqliteInitialIndexes' ), @@ -96,12 +96,12 @@ class SqliteUpdater extends DatabaseUpdater { // 1.21 array( 'addField', 'revision', 'rev_content_format', 'patch-revision-rev_content_format.sql' ), array( 'addField', 'revision', 'rev_content_model', 'patch-revision-rev_content_model.sql' ), - array( 'addField', 'archive', 'ar_content_format', 'patch-archive-ar_content_format.sql' ), - array( 'addField', 'archive', 'ar_content_model', 'patch-archive-ar_content_model.sql' ), - array( 'addField', 'page', 'page_content_model', 'patch-page-page_content_model.sql' ), + array( 'addField', 'archive', 'ar_content_format', 'patch-archive-ar_content_format.sql' ), + array( 'addField', 'archive', 'ar_content_model', 'patch-archive-ar_content_model.sql' ), + array( 'addField', 'page', 'page_content_model', 'patch-page-page_content_model.sql' ), array( 'enableContentHandlerUseDB' ), - array( 'dropField', 'site_stats', 'ss_admins', 'patch-drop-ss_admins.sql' ), + array( 'dropField', 'site_stats', 'ss_admins', 'patch-drop-ss_admins.sql' ), array( 'dropField', 'recentchanges', 'rc_moved_to_title', 'patch-rc_moved.sql' ), array( 'addTable', 'sites', 'patch-sites.sql' ), array( 'addField', 'filearchive', 'fa_sha1', 'patch-fa_sha1.sql' ), diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php index b37e6b37af..79fdc99319 100644 --- a/includes/installer/WebInstaller.php +++ b/includes/installer/WebInstaller.php @@ -326,6 +326,7 @@ class WebInstaller extends Installer { /** * Start the PHP session. This may be called before execute() to start the PHP session. * + * @throws Exception * @return bool */ public function startSession() { diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php index fd91bcbcc7..00a4ff8d95 100644 --- a/includes/installer/WebInstallerOutput.php +++ b/includes/installer/WebInstallerOutput.php @@ -124,9 +124,9 @@ class WebInstallerOutput { $prepend = ''; $css = ''; - $cssFileNames = array(); $resourceLoader = new ResourceLoader(); foreach ( $moduleNames as $moduleName ) { + /** @var ResourceLoaderFileModule $module */ $module = $resourceLoader->getModule( $moduleName ); $cssFileNames = $module->getAllStyleFiles(); @@ -138,7 +138,8 @@ class WebInstallerOutput { } if ( !is_readable( $cssFileName ) ) { - $prepend .= ResourceLoader::makeComment( "Unable to read $cssFileName. Please check file permissions." ); + $prepend .= ResourceLoader::makeComment( "Unable to read $cssFileName. " . + "Please check file permissions." ); continue; } @@ -170,7 +171,6 @@ class WebInstallerOutput { } else { $prepend .= ResourceLoader::makeComment( "Unable to read $cssFileName." ); } - } catch ( Exception $e ) { $prepend .= ResourceLoader::formatException( $e ); }