Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97207
Change subject: Use lowercase null
......................................................................
Use lowercase null
Also break some long line in the same files
Change-Id: I57569b7082a0decc8128ecadd8ec5d1a5c327673
---
M includes/rcfeed/JSONRCFeedFormatter.php
M languages/classes/LanguageKk_cyrl.php
M languages/classes/LanguageTyv.php
M maintenance/locking/LockServerDaemon.php
4 files changed, 113 insertions(+), 69 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/97207/1
diff --git a/includes/rcfeed/JSONRCFeedFormatter.php
b/includes/rcfeed/JSONRCFeedFormatter.php
index f4cb992..7f5672f 100644
--- a/includes/rcfeed/JSONRCFeedFormatter.php
+++ b/includes/rcfeed/JSONRCFeedFormatter.php
@@ -39,13 +39,15 @@
switch ( $type ) {
case RC_EDIT:
- $packet['length'] = array( 'old' =>
$attrib['rc_old_len'], 'new' => $attrib['rc_new_len'] );
- $packet['revision'] = array( 'old' =>
$attrib['rc_last_oldid'], 'new' => $attrib['rc_this_oldid'] );
+ $packet['length'] = array( 'old' =>
$attrib['rc_old_len'],
+ 'new' => $attrib['rc_new_len'] );
+ $packet['revision'] = array( 'old' =>
$attrib['rc_last_oldid'],
+ 'new' => $attrib['rc_this_oldid'] );
break;
case RC_NEW:
- $packet['length'] = array( 'old' => NULL, 'new'
=> $attrib['rc_new_len'] );
- $packet['revision'] = array( 'old' => NULL,
'new' => $attrib['rc_this_oldid'] );
+ $packet['length'] = array( 'old' => null, 'new'
=> $attrib['rc_new_len'] );
+ $packet['revision'] = array( 'old' => null,
'new' => $attrib['rc_this_oldid'] );
break;
case RC_LOG:
@@ -63,7 +65,8 @@
) {
// From
ApiQueryLogEvents::addLogParams
$logParams = array();
- // Keys like "4::paramname"
can't be used for output so we change them to "paramname"
+ // Keys like "4::paramname"
can't be used for output
+ // so we change them to
"paramname"
foreach ( $params as $key =>
$value ) {
if ( strpos( $key, ':'
) === false ) {
$logParams[$key] = $value;
diff --git a/languages/classes/LanguageKk_cyrl.php
b/languages/classes/LanguageKk_cyrl.php
index 5a7bbf3..5b63d81 100644
--- a/languages/classes/LanguageKk_cyrl.php
+++ b/languages/classes/LanguageKk_cyrl.php
@@ -54,7 +54,8 @@
// Preceding letters
$Nasals = array( "м", "н", "ң" );
$Sonants = array( "и", "й", "л", "р", "у", "ю" );
- $Consonants = array( "п", "ф", "к", "қ", "т", "ш", "с", "х",
"ц", "ч", "щ", "б", "в", "г", "д" );
+ $Consonants = array( "п", "ф", "к", "қ", "т", "ш", "с", "х",
"ц", "ч", "щ",
+ "б", "в", "г", "д" );
$Sibilants = array( "ж", "з" );
$Sonorants = array( "и", "й", "л", "р", "у", "ю", "м", "н",
"ң", "ж", "з" );
@@ -77,13 +78,15 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "тың";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Nasals ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Nasals ) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "нің";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "ның";
}
- } elseif ( in_array( $wordEnding, $Sonants ) ||
in_array( $wordEnding, $Sibilants ) ) {
+ } elseif ( in_array( $wordEnding, $Sonants )
+ || in_array( $wordEnding, $Sibilants )
) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "дің";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -99,7 +102,8 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "қа";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Sonorants ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Sonorants )
) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "ге";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -153,7 +157,8 @@
break;
case "dc31":
case "possessive accusative": # täweldık + tabıs
- if ( in_array( $wordEnding, $firstPerson ) ||
in_array( $wordEnding, $secondPerson ) ) {
+ if ( in_array( $wordEnding, $firstPerson )
+ || in_array( $wordEnding, $secondPerson
) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "ді";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -171,7 +176,8 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "та";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Sonorants ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Sonorants )
) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "де";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -181,7 +187,8 @@
break;
case "dc41":
case "possessive locative": # täweldık + jatıs
- if ( in_array( $wordEnding, $firstPerson ) ||
in_array( $wordEnding, $secondPerson ) ) {
+ if ( in_array( $wordEnding, $firstPerson )
+ || in_array( $wordEnding, $secondPerson
) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "де";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -203,7 +210,8 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "тан";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Sonants ) || in_array( $wordEnding, $Sibilants ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Sonants ) ||
in_array( $wordEnding, $Sibilants ) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "ден";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -219,7 +227,8 @@
break;
case "dc51":
case "possessive ablative": # täweldık + şığıs
- if ( in_array( $wordEnding, $firstPerson ) ||
in_array( $wordEnding, $thirdPerson ) ) {
+ if ( in_array( $wordEnding, $firstPerson )
+ || in_array( $wordEnding, $thirdPerson
) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "нен";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -236,21 +245,23 @@
case "dc6":
case "comitative": # kömektes
if ( in_array( $wordEnding, $Consonants ) ) {
- $word = $word . "пен";
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Nasals ) || in_array( $wordEnding, $Sonants ) ) {
- $word = $word . "мен";
+ $word = $word . "пен";
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Nasals ) ||
in_array( $wordEnding, $Sonants ) ) {
+ $word = $word . "мен";
} elseif ( in_array( $wordEnding, $Sibilants )
) {
- $word = $word . "бен";
+ $word = $word . "бен";
}
break;
case "dc61":
case "possessive comitative": # täweldık + kömektes
if ( in_array( $wordEnding, $Consonants ) ) {
- $word = $word . "пенен";
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Nasals ) || in_array( $wordEnding, $Sonants ) ) {
- $word = $word . "менен";
+ $word = $word . "пенен";
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Nasals ) ||
in_array( $wordEnding, $Sonants ) ) {
+ $word = $word . "менен";
} elseif ( in_array( $wordEnding, $Sibilants )
) {
- $word = $word . "бенен";
+ $word = $word . "бенен";
}
break;
default: # dc0 #nominative #ataw
@@ -279,7 +290,8 @@
// Preceding letters
$Nasals = array( "m", "n", "ñ" );
$Sonants = array( "ï", "y", "ý", "l", "r", "w" );
- $Consonants = array( "p", "f", "k", "q", "t", "ş", "s", "x",
"c", "ç", "b", "v", "g", "d" );
+ $Consonants = array( "p", "f", "k", "q", "t", "ş", "s", "x",
"c", "ç",
+ "b", "v", "g", "d" );
$Sibilants = array( "j", "z" );
$Sonorants = array( "ï", "y", "ý", "l", "r", "w", "m", "n",
"ñ", "j", "z" );
@@ -302,13 +314,15 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "tıñ";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Nasals ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Nasals ) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "niñ";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "nıñ";
}
- } elseif ( in_array( $wordEnding, $Sonants ) ||
in_array( $wordEnding, $Sibilants ) ) {
+ } elseif ( in_array( $wordEnding, $Sonants )
+ || in_array( $wordEnding, $Sibilants )
) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "diñ";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -324,7 +338,8 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "qa";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Sonorants ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Sonorants )
) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "ge";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -378,14 +393,15 @@
break;
case "dc31":
case "possessive accusative": # täweldık + tabıs
- if ( in_array( $wordEnding, $firstPerson ) ||
in_array( $wordEnding, $secondPerson ) ) {
+ if ( in_array( $wordEnding, $firstPerson )
+ || in_array( $wordEnding, $secondPerson
) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "di";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "dı";
}
} elseif ( in_array( $wordEnding, $thirdPerson
) ) {
- $word = $word . "n";
+ $word = $word . "n";
}
break;
case "dc4":
@@ -396,7 +412,8 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "ta";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Sonorants ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Sonorants )
) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "de";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -406,7 +423,8 @@
break;
case "dc41":
case "possessive locative": # täweldık + jatıs
- if ( in_array( $wordEnding, $firstPerson ) ||
in_array( $wordEnding, $secondPerson ) ) {
+ if ( in_array( $wordEnding, $firstPerson )
+ || in_array( $wordEnding, $secondPerson
) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "de";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -428,7 +446,8 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "tan";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Sonants ) || in_array( $wordEnding, $Sibilants ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Sonants ) ||
in_array( $wordEnding, $Sibilants ) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "den";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -444,7 +463,8 @@
break;
case "dc51":
case "possessive ablative": # täweldık + şığıs
- if ( in_array( $wordEnding, $firstPerson ) ||
in_array( $wordEnding, $thirdPerson ) ) {
+ if ( in_array( $wordEnding, $firstPerson )
+ || in_array( $wordEnding, $thirdPerson
) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "nen";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -461,21 +481,23 @@
case "dc6":
case "comitative": # kömektes
if ( in_array( $wordEnding, $Consonants ) ) {
- $word = $word . "pen";
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Nasals ) || in_array( $wordEnding, $Sonants ) ) {
- $word = $word . "men";
+ $word = $word . "pen";
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Nasals ) ||
in_array( $wordEnding, $Sonants ) ) {
+ $word = $word . "men";
} elseif ( in_array( $wordEnding, $Sibilants )
) {
- $word = $word . "ben";
+ $word = $word . "ben";
}
break;
case "dc61":
case "possessive comitative": # täweldık + kömektes
if ( in_array( $wordEnding, $Consonants ) ) {
- $word = $word . "penen";
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Nasals ) || in_array( $wordEnding, $Sonants ) ) {
- $word = $word . "menen";
+ $word = $word . "penen";
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Nasals ) ||
in_array( $wordEnding, $Sonants ) ) {
+ $word = $word . "menen";
} elseif ( in_array( $wordEnding, $Sibilants )
) {
- $word = $word . "benen";
+ $word = $word . "benen";
}
break;
default: # dc0 #nominative #ataw
@@ -504,7 +526,8 @@
// Preceding letters
$Nasals = array( "م", "ن", "ڭ" );
$Sonants = array( "ي", "ي", "ل", "ر", "ۋ" );
- $Consonants = array( "پ", "ف", "ك", "ق", "ت", "ش", "س", "ح",
"تس", "چ", "ب", "ۆ", "گ", "د" );
+ $Consonants = array( "پ", "ف", "ك", "ق", "ت", "ش", "س", "ح",
"تس", "چ",
+ "ب", "ۆ", "گ", "د" );
$Sibilants = array( "ج", "ز" );
$Sonorants = array( "ي", "ي", "ل", "ر", "ۋ", "م", "ن", "ڭ",
"ج", "ز" );
@@ -527,13 +550,15 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "تىڭ";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Nasals ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Nasals ) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "نٸڭ";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "نىڭ";
}
- } elseif ( in_array( $wordEnding, $Sonants ) ||
in_array( $wordEnding, $Sibilants ) ) {
+ } elseif ( in_array( $wordEnding, $Sonants )
+ || in_array( $wordEnding, $Sibilants )
) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "دٸڭ";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -549,7 +574,8 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "قا";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Sonorants ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Sonorants )
) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "گە";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -603,14 +629,15 @@
break;
case "dc31":
case "possessive accusative": # täweldık + tabıs
- if ( in_array( $wordEnding, $firstPerson ) ||
in_array( $wordEnding, $secondPerson ) ) {
+ if ( in_array( $wordEnding, $firstPerson )
+ || in_array( $wordEnding, $secondPerson
) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "دٸ";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "دى";
}
} elseif ( in_array( $wordEnding, $thirdPerson
) ) {
- $word = $word . "ن";
+ $word = $word . "ن";
}
break;
case "dc4":
@@ -621,7 +648,8 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "تا";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Sonorants ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Sonorants )
) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "دە";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -631,7 +659,8 @@
break;
case "dc41":
case "possessive locative": # täweldık + jatıs
- if ( in_array( $wordEnding, $firstPerson ) ||
in_array( $wordEnding, $secondPerson ) ) {
+ if ( in_array( $wordEnding, $firstPerson )
+ || in_array( $wordEnding, $secondPerson
) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "دە";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -653,7 +682,8 @@
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
$word = $word . "تان";
}
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Sonants ) || in_array( $wordEnding, $Sibilants ) ) {
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Sonants ) ||
in_array( $wordEnding, $Sibilants ) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "دەن";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -669,7 +699,8 @@
break;
case "dc51":
case "possessive ablative": # täweldık + şığıs
- if ( in_array( $wordEnding, $firstPerson ) ||
in_array( $wordEnding, $thirdPerson ) ) {
+ if ( in_array( $wordEnding, $firstPerson )
+ || in_array( $wordEnding, $thirdPerson
) ) {
if ( in_array( $wordLastVowel,
$frontVowels ) ) {
$word = $word . "نەن";
} elseif ( in_array( $wordLastVowel,
$backVowels ) ) {
@@ -686,21 +717,23 @@
case "dc6":
case "comitative": # kömektes
if ( in_array( $wordEnding, $Consonants ) ) {
- $word = $word . "پەن";
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Nasals ) || in_array( $wordEnding, $Sonants ) ) {
- $word = $word . "مەن";
+ $word = $word . "پەن";
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Nasals ) ||
in_array( $wordEnding, $Sonants ) ) {
+ $word = $word . "مەن";
} elseif ( in_array( $wordEnding, $Sibilants )
) {
- $word = $word . "بەن";
+ $word = $word . "بەن";
}
break;
case "dc61":
case "possessive comitative": # täweldık + kömektes
if ( in_array( $wordEnding, $Consonants ) ) {
- $word = $word . "پەنەن";
- } elseif ( in_array( $wordEnding, $allVowels )
|| in_array( $wordEnding, $Nasals ) || in_array( $wordEnding, $Sonants ) ) {
- $word = $word . "مەنەن";
+ $word = $word . "پەنەن";
+ } elseif ( in_array( $wordEnding, $allVowels )
+ || in_array( $wordEnding, $Nasals ) ||
in_array( $wordEnding, $Sonants ) ) {
+ $word = $word . "مەنەن";
} elseif ( in_array( $wordEnding, $Sibilants )
) {
- $word = $word . "بەنەن";
+ $word = $word . "بەنەن";
}
break;
default: # dc0 #nominative #ataw
@@ -727,7 +760,7 @@
$lastLetter[0] = $ar[count( $ar ) - 1];
// Find the last vowel in the word
- $lastLetter[1] = NULL;
+ $lastLetter[1] = null;
foreach ( $wordReversed as $xvalue ) {
foreach ( $allVowels as $yvalue ) {
if ( strcmp( $xvalue, $yvalue ) == 0 ) {
@@ -737,7 +770,7 @@
continue;
}
}
- if ( $lastLetter[1] !== NULL ) {
+ if ( $lastLetter[1] !== null ) {
break;
} else {
continue;
@@ -756,7 +789,8 @@
*/
function commafy( $_ ) {
if ( !preg_match( '/^\d{1,4}$/', $_ ) ) {
- return strrev( (string)preg_replace(
'/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) );
+ return strrev( (string)preg_replace(
'/(\d{3})(?=\d)(?!\d*\.)/', '$1,',
+ strrev( $_ ) ) );
} else {
return $_;
}
diff --git a/languages/classes/LanguageTyv.php
b/languages/classes/LanguageTyv.php
index fc1e8a8..59514a3 100644
--- a/languages/classes/LanguageTyv.php
+++ b/languages/classes/LanguageTyv.php
@@ -44,7 +44,8 @@
}
// Set up some constants...
- $allVowels = array( "е", "и", "э", "ө", "ү", "а", "ё", "о",
"у", "ы", "ю", "я", "a", "e", "i", "o", "ö", "u", "ü", "y" );
+ $allVowels = array( "е", "и", "э", "ө", "ү", "а", "ё", "о",
"у", "ы", "ю", "я",
+ "a", "e", "i", "o", "ö", "u", "ü", "y" );
$frontVowels = array( "е", "и", "э", "ө", "ү", "e", "i", "ö",
"ü" );
$backVowels = array( "а", "ё", "о", "у", "ы", "ю", "я", "a",
"o", "u", "y" );
$unroundFrontVowels = array( "е", "и", "э", "e", "i" );
@@ -53,8 +54,10 @@
$roundBackVowels = array( "ё", "о", "у", "ю", "o", "u" );
//$voicedPhonemes = array( "д", "б", "з", "ж", "г", "d", "b",
"z", "g" );
$unvoicedPhonemes = array( "т", "п", "с", "ш", "к", "ч", "х",
"t", "p", "s", "k", "x" );
- $directiveUnvoicedStems = array( "т", "п", "с", "ш", "к", "ч",
"х", "л", "м", "н", "ң", "t", "p", "s", "k", "x", "l", "m", "n", "ŋ" );
- $directiveVoicedStems = array( "д", "б", "з", "ж", "г", "р",
"й", "d", "b", "z", "g", "r", "j" );
+ $directiveUnvoicedStems = array( "т", "п", "с", "ш", "к", "ч",
"х", "л", "м", "н", "ң",
+ "t", "p", "s", "k", "x", "l", "m", "n", "ŋ" );
+ $directiveVoicedStems = array( "д", "б", "з", "ж", "г", "р",
"й",
+ "d", "b", "z", "g", "r", "j" );
//$allSonants = array("л", "м", "н", "ң", "р", "й");
//$allNasals = array("м", "н", "ң");
@@ -62,11 +65,15 @@
//Put the word in a form we can play with since we're using
UTF-8
preg_match_all( '/./us', $word, $ar );
- $wordEnding = $ar[0][count( $ar[0] ) - 1]; // Here's the last
letter in the word
- $wordReversed = array_reverse( $ar[0] ); // Here's an array
with the order of the letters in the word reversed so we can find a match
quicker *shrug*
+ // Here's the last letter in the word
+ $wordEnding = $ar[0][count( $ar[0] ) - 1];
+
+ // Here's an array with the order of the letters in the word
reversed
+ // so we can find a match quicker *shrug*
+ $wordReversed = array_reverse( $ar[0] );
// Find the last vowel in the word
- $wordLastVowel = NULL;
+ $wordLastVowel = null;
foreach ( $wordReversed as $xvalue ) {
foreach ( $allVowels as $yvalue ) {
if ( strcmp( $xvalue, $yvalue ) == 0 ) {
@@ -76,7 +83,7 @@
continue;
}
}
- if ( $wordLastVowel !== NULL ) {
+ if ( $wordLastVowel !== null ) {
break;
} else {
continue;
diff --git a/maintenance/locking/LockServerDaemon.php
b/maintenance/locking/LockServerDaemon.php
index 01fbac7..d98654e 100644
--- a/maintenance/locking/LockServerDaemon.php
+++ b/maintenance/locking/LockServerDaemon.php
@@ -149,7 +149,7 @@
$socketArray->addSocket( $this->sock ); // add listening socket
do {
list( $read, $write ) =
$socketArray->socketsForSelect();
- if ( socket_select( $read, $write, $except = NULL, NULL
) < 1 ) {
+ if ( socket_select( $read, $write, $except = null, null
) < 1 ) {
continue; // wait
}
// Check if there is a client trying to connect...
--
To view, visit https://gerrit.wikimedia.org/r/97207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57569b7082a0decc8128ecadd8ec5d1a5c327673
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
