From 15f4f6f360f5d245801b706d92410f2195b43305 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 18 Feb 2011 23:21:48 +0000 Subject: [PATCH] Explicitally define some variables Function documentation --- includes/db/Database.php | 2 +- languages/LanguageConverter.php | 2 +- languages/classes/LanguageKk.php | 3 +++ languages/classes/LanguageSr.php | 9 +++++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index 8317664665..11b9db771e 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -3128,7 +3128,7 @@ class ResultWrapper implements Iterator { /** * Create a new result object from a result resource and a Database object * - * @param Database $database + * @param DatabaseBase $database * @param resource $result */ function __construct( $database, $result ) { diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index 5c2289a77a..9c923b910f 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -52,7 +52,7 @@ class LanguageConverter { /** * Constructor * - * @param $langobj The Language Object + * @param $langobj Language The Language Object * @param $maincode String: the main language code of this language * @param $variants Array: the supported variants of this language * @param $variantfallbacks Array: the fallback language of each variant diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php index e3caacc87c..47e1309c2c 100644 --- a/languages/classes/LanguageKk.php +++ b/languages/classes/LanguageKk.php @@ -18,6 +18,8 @@ define( 'H_HAMZA', 'Ù´' ); # U+0674 ARABIC LETTER HIGH HAMZA */ class KkConverter extends LanguageConverter { + protected $mCyrl2Latn, $mLatn2Cyrl, $mCyLa2Arab; + function __construct( $langobj, $maincode, $variants = array(), $variantfallbacks = array(), @@ -200,6 +202,7 @@ class KkConverter extends LanguageConverter { return parent::parseManualRule( $rule, $flags ); } + $carray = array(); // otherwise ignore all formatting foreach ( $this->mVariants as $v ) { $carray[$v] = $rule; diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php index 35c90102b6..edcae288f0 100644 --- a/languages/classes/LanguageSr.php +++ b/languages/classes/LanguageSr.php @@ -68,6 +68,7 @@ class SrConverter extends LanguageConverter { return parent::parseManualRule( $rule, $flags ); } + $carray = array(); // otherwise ignore all formatting foreach ( $this->mVariants as $v ) { $carray[$v] = $rule; @@ -176,10 +177,14 @@ class LanguageSr extends LanguageSr_ec { } function convertPlural( $count, $forms ) { - if ( !count( $forms ) ) { return ''; } + if ( !count( $forms ) ) { + return ''; + } // if no number with word, then use $form[0] for singular and $form[1] for plural or zero - if ( count( $forms ) === 2 ) return $count == 1 ? $forms[0] : $forms[1]; + if ( count( $forms ) === 2 ) { + return $count == 1 ? $forms[0] : $forms[1]; + } // FIXME: CLDR defines 4 plural forms. Form with decimals missing. // See http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ru -- 2.20.1