jenkins-bot has submitted this change and it was merged.
Change subject: Update formatting
......................................................................
Update formatting
Change-Id: Ia730172478f7f73c02ff3ae30c36e73fb929974b
---
M maintenance/language/StatOutputs.php
M maintenance/language/checkDupeMessages.php
M maintenance/language/checkLanguage.inc
M maintenance/language/countMessages.php
M maintenance/language/generateCollationData.php
M maintenance/language/generateNormalizerData.php
M maintenance/language/languages.inc
M maintenance/language/rebuildLanguage.php
M maintenance/language/transstat.php
M maintenance/language/validate.php
M maintenance/language/writeMessagesArray.inc
11 files changed, 66 insertions(+), 25 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/language/StatOutputs.php
b/maintenance/language/StatOutputs.php
index e9d8c86..e102a3c 100644
--- a/maintenance/language/StatOutputs.php
+++ b/maintenance/language/StatOutputs.php
@@ -35,12 +35,16 @@
# Override the following methods
function heading() {
}
+
function footer() {
}
+
function blockstart() {
}
+
function blockend() {
}
+
function element( $in, $heading = false ) {
}
}
@@ -64,18 +68,23 @@
echo ".\n\n"; # dot to end sentence
echo '{| class="sortable wikitable" border="2"
style="background-color: #F9F9F9; border: 1px #AAAAAA solid; border-collapse:
collapse; clear:both; width:100%;"' . "\n";
}
+
function footer() {
echo "|}\n";
}
+
function blockstart() {
echo "|-\n";
}
+
function blockend() {
echo '';
}
+
function element( $in, $heading = false ) {
echo ( $heading ? '!' : '|' ) . "$in\n";
}
+
function formatPercent( $subset, $total, $revert = false, $accuracy = 2
) {
$v = @round( 255 * $subset / $total );
if ( $revert ) {
@@ -100,6 +109,7 @@
$color = $red . $green . $blue;
$percent = parent::formatPercent( $subset, $total, $revert,
$accuracy );
+
return 'style="background-color:#' . $color . ';"|' . $percent;
}
}
@@ -109,6 +119,7 @@
function element( $in, $heading = false ) {
echo $in . "\t";
}
+
function blockend() {
echo "\n";
}
@@ -119,6 +130,7 @@
function element( $in, $heading = false ) {
echo $in . ";";
}
+
function blockend() {
echo "\n";
}
diff --git a/maintenance/language/checkDupeMessages.php
b/maintenance/language/checkDupeMessages.php
index 381ddae..5d48244 100644
--- a/maintenance/language/checkDupeMessages.php
+++ b/maintenance/language/checkDupeMessages.php
@@ -67,8 +67,7 @@
$messagesFileC = $messagesDir . 'Messages' . $langCodeFC . '.php';
if ( file_exists( $messagesFile ) && file_exists( $messagesFileC ) ) {
$run = true;
- }
- else {
+ } else {
echo "Messages file(s) could not be found.\nMake sure both
files are exists.\n";
}
}
diff --git a/maintenance/language/checkLanguage.inc
b/maintenance/language/checkLanguage.inc
index f068a4a..62cc6cb 100644
--- a/maintenance/language/checkLanguage.inc
+++ b/maintenance/language/checkLanguage.inc
@@ -293,7 +293,7 @@
}
$results = $this->results;
- foreach( $results as $code => $checks ) {
+ foreach ( $results as $code => $checks ) {
foreach ( $checks as $check => $messages ) {
foreach ( $messages as $key => $details ) {
if ( $this->isCheckBlacklisted( $check,
$code, $key ) ) {
@@ -335,7 +335,7 @@
protected function isCheckBlacklisted( $check, $code, $message ) {
$blacklist = $this->getCheckBlacklist();
- foreach( $blacklist as $item ) {
+ foreach ( $blacklist as $item ) {
if ( isset( $item['check'] ) && $check !==
$item['check'] ) {
continue;
}
diff --git a/maintenance/language/countMessages.php
b/maintenance/language/countMessages.php
index 95a7154..1cb24ab 100644
--- a/maintenance/language/countMessages.php
+++ b/maintenance/language/countMessages.php
@@ -50,7 +50,7 @@
// print "$code: $numMessages\n";
$total += $numMessages;
if ( $numMessages > 0 ) {
- $nonZero ++;
+ $nonZero++;
}
}
$this->output( "\nTotal: $total\n" );
diff --git a/maintenance/language/generateCollationData.php
b/maintenance/language/generateCollationData.php
index fcf2c96..db6c315 100644
--- a/maintenance/language/generateCollationData.php
+++ b/maintenance/language/generateCollationData.php
@@ -158,7 +158,8 @@
// people like to use that as a fake no header symbol.
$category = substr( $data['gc'], 0, 1 );
if ( strpos( 'LNPS', $category ) === false
- && $data['cp'] !== '0020' ) {
+ && $data['cp'] !== '0020'
+ ) {
return;
}
$cp = hexdec( $data['cp'] );
@@ -178,8 +179,8 @@
// Calculate implicit weight per UTS #10 v6.0.0, sec 7.1.3
if ( $data['UIdeo'] === 'Y' ) {
if ( $data['block'] == 'CJK Unified Ideographs'
- || $data['block'] == 'CJK Compatibility
Ideographs' )
- {
+ || $data['block'] == 'CJK Compatibility
Ideographs'
+ ) {
$base = 0xFB40;
} else {
$base = 0xFB80;
@@ -248,8 +249,8 @@
}
$this->weights[$cp] = $primary;
if ( $tertiary === '.0008'
- || $tertiary === '.000E' )
- {
+ || $tertiary === '.000E'
+ ) {
$goodTertiaryChars[$cp] = true;
}
}
@@ -325,7 +326,7 @@
$char = codepointToUtf8( $cp );
$headerChars[] = $char;
if ( $primaryCollator->compare( $char, $prevChar ) <= 0
) {
- $numOutOfOrder ++;
+ $numOutOfOrder++;
/*
printf( "Out of order: U+%05X > U+%05X\n",
utf8ToCodepoint( $prevChar ),
@@ -390,6 +391,7 @@
}
while ( $this->xml->name !== 'ucd' && $this->xml->read() );
$this->xml->read();
+
return $this->xml;
}
@@ -403,6 +405,7 @@
while ( $this->xml->moveToNextAttribute() ) {
$attrs[$this->xml->name] = $this->xml->value;
}
+
return $attrs;
}
@@ -460,9 +463,9 @@
}
}
$xml->close();
+
return $this->blocks;
}
-
}
$maintClass = 'GenerateCollationData';
diff --git a/maintenance/language/generateNormalizerData.php
b/maintenance/language/generateNormalizerData.php
index 216445e..ea87e9c 100644
--- a/maintenance/language/generateNormalizerData.php
+++ b/maintenance/language/generateNormalizerData.php
@@ -104,15 +104,15 @@
$code = base_convert( $data['Code'], 16, 10 );
if ( ( $code >= 0xFB50 && $code <= 0xFDFF ) # Arabic
presentation forms A
- || ( $code >= 0xFE70 && $code <= 0xFEFF ) ) #
Arabic presentation forms B
- {
+ || ( $code >= 0xFE70 && $code <= 0xFEFF ) #
Arabic presentation forms B
+ ) {
if ( $data['Decomposition_Type_Mapping'] === ''
) {
// No decomposition
continue;
}
if ( !preg_match( '/^ *(<\w*>) +([0-9A-F ]*)$/',
- $data['Decomposition_Type_Mapping'], $m
) )
- {
+ $data['Decomposition_Type_Mapping'], $m
)
+ ) {
$this->error( "Can't parse
Decomposition_Type/Mapping on line $lineNum" );
$this->error( $line );
continue;
diff --git a/maintenance/language/languages.inc
b/maintenance/language/languages.inc
index 6070f4a..c97aed2 100644
--- a/maintenance/language/languages.inc
+++ b/maintenance/language/languages.inc
@@ -96,7 +96,8 @@
isset( $this->mNamespaceNames[$code] ) &&
isset( $this->mNamespaceAliases[$code] ) &&
isset( $this->mMagicWords[$code] ) &&
- isset( $this->mSpecialPageAliases[$code] ) ) {
+ isset( $this->mSpecialPageAliases[$code] )
+ ) {
return;
}
$this->mRawMessages[$code] = array();
@@ -209,6 +210,7 @@
*/
public function getMessages( $code ) {
$this->loadMessages( $code );
+
return $this->mMessages[$code];
}
@@ -224,6 +226,7 @@
*/
public function getGeneralMessages() {
$this->loadGeneralMessages();
+
return $this->mGeneralMessages;
}
@@ -236,6 +239,7 @@
*/
public function getFallback( $code ) {
$this->loadFile( $code );
+
return $this->mFallback[$code];
}
@@ -248,6 +252,7 @@
*/
public function getNamespaceNames( $code ) {
$this->loadFile( $code );
+
return $this->mNamespaceNames[$code];
}
@@ -260,6 +265,7 @@
*/
public function getNamespaceAliases( $code ) {
$this->loadFile( $code );
+
return $this->mNamespaceAliases[$code];
}
@@ -272,6 +278,7 @@
*/
public function getMagicWords( $code ) {
$this->loadFile( $code );
+
return $this->mMagicWords[$code];
}
@@ -284,6 +291,7 @@
*/
public function getSpecialPageAliases( $code ) {
$this->loadFile( $code );
+
return $this->mSpecialPageAliases[$code];
}
@@ -297,6 +305,7 @@
public function getUntranslatedMessages( $code ) {
$this->loadGeneralMessages();
$this->loadMessages( $code );
+
return array_diff_key( $this->mGeneralMessages['required'],
$this->mMessages[$code]['required'] );
}
@@ -316,6 +325,7 @@
$duplicateMessages[$key] = $value;
}
}
+
return $duplicateMessages;
}
@@ -329,6 +339,7 @@
public function getObsoleteMessages( $code ) {
$this->loadGeneralMessages();
$this->loadMessages( $code );
+
return $this->mMessages[$code]['obsolete'];
}
@@ -348,11 +359,13 @@
$missing = false;
foreach ( $variables as $var ) {
if ( preg_match( "/$var/sU",
$this->mGeneralMessages['translatable'][$key] ) &&
- !preg_match( "/$var/sU", $value ) ) {
+ !preg_match( "/$var/sU", $value )
+ ) {
$missing = true;
}
if ( !preg_match( "/$var/sU",
$this->mGeneralMessages['translatable'][$key] ) &&
- preg_match( "/$var/sU", $value ) ) {
+ preg_match( "/$var/sU", $value )
+ ) {
$missing = true;
}
}
@@ -360,6 +373,7 @@
$mismatchMessages[$key] = $value;
}
}
+
return $mismatchMessages;
}
@@ -379,6 +393,7 @@
$messagesWithoutPlural[$key] = $value;
}
}
+
return $messagesWithoutPlural;
}
@@ -398,6 +413,7 @@
$emptyMessages[$key] = $value;
}
}
+
return $emptyMessages;
}
@@ -417,6 +433,7 @@
$messagesWithWhitespace[$key] = $value;
}
}
+
return $messagesWithWhitespace;
}
@@ -445,6 +462,7 @@
$nonXHTMLMessages[$key] = $value;
}
}
+
return $nonXHTMLMessages;
}
@@ -482,6 +500,7 @@
$wrongCharsMessages[$key] = $value;
}
}
+
return $wrongCharsMessages;
}
@@ -506,11 +525,11 @@
}
}
-
if ( isset( $messages[$key] ) ) {
$messages[$key] = implode( $messages[$key], ",
" );
}
}
+
return $messages;
}
@@ -547,8 +566,8 @@
if ( $a !== $b || $c !== $d ) {
$messages[$key] = "$a, $b, $c, $d";
}
-
}
+
return $messages;
}
@@ -566,6 +585,7 @@
if ( isset( $namespacesDiff[NS_MAIN] ) ) {
unset( $namespacesDiff[NS_MAIN] );
}
+
return $namespacesDiff;
}
@@ -614,6 +634,7 @@
$magicWords[$key] = $value[1];
}
}
+
return $magicWords;
}
@@ -633,6 +654,7 @@
$magicWords[$key] = $value[1];
}
}
+
return $magicWords;
}
@@ -662,6 +684,7 @@
}
}
}
+
return $magicWords;
}
@@ -685,6 +708,7 @@
$magicWords[$key] = $local[0];
}
}
+
return $magicWords;
}
@@ -704,6 +728,7 @@
$specialPageAliases[$key] = $value[0];
}
}
+
return $specialPageAliases;
}
@@ -723,6 +748,7 @@
$specialPageAliases[$key] = $value[0];
}
}
+
return $specialPageAliases;
}
}
diff --git a/maintenance/language/rebuildLanguage.php
b/maintenance/language/rebuildLanguage.php
index 66948ae..4cc33d9 100644
--- a/maintenance/language/rebuildLanguage.php
+++ b/maintenance/language/rebuildLanguage.php
@@ -71,6 +71,7 @@
unset( $newMsgArray[$key] );
}
}
+
return $newMsgArray;
}
diff --git a/maintenance/language/transstat.php
b/maintenance/language/transstat.php
index 61b84a0..fc8d093 100644
--- a/maintenance/language/transstat.php
+++ b/maintenance/language/transstat.php
@@ -32,7 +32,6 @@
require_once 'languages.inc';
require_once __DIR__ . '/StatOutputs.php';
-
if ( isset( $options['help'] ) ) {
showUsage();
}
@@ -56,8 +55,6 @@
TEXT;
exit( 1 );
}
-
-
# Select an output engine
switch ( $options['output'] ) {
@@ -97,7 +94,8 @@
foreach ( $wgLanguages->getLanguages() as $code ) {
# Don't check English, RTL English or dummy language codes
if ( $code == 'en' || $code == 'enRTL' || ( is_array(
$wgDummyLanguageCodes ) &&
- isset( $wgDummyLanguageCodes[$code] ) ) ) {
+ isset( $wgDummyLanguageCodes[$code] ) )
+ ) {
continue;
}
diff --git a/maintenance/language/validate.php
b/maintenance/language/validate.php
index 63d9b84..f1b4079 100644
--- a/maintenance/language/validate.php
+++ b/maintenance/language/validate.php
@@ -60,5 +60,6 @@
require $filename;
$vars = get_defined_vars();
unset( $vars['filename'] );
+
return $vars;
}
diff --git a/maintenance/language/writeMessagesArray.inc
b/maintenance/language/writeMessagesArray.inc
index fc0da3f..bb8933c 100644
--- a/maintenance/language/writeMessagesArray.inc
+++ b/maintenance/language/writeMessagesArray.inc
@@ -162,6 +162,7 @@
}
$messagesText .= ");
";
+
return array( $messagesText, $sortedMessages );
}
--
To view, visit https://gerrit.wikimedia.org/r/94742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia730172478f7f73c02ff3ae30c36e73fb929974b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
