From 8bbf6cb2ebb25dbeb15026b954027b16eef29874 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thiemo=20M=C3=A4ttig?= Date: Mon, 17 Apr 2017 22:31:22 +0200 Subject: [PATCH] Use more specific string[] type hint for language variants This patch only touches PHPDoc documentation, nothing else. Change-Id: Ia79d06425a3b8629c171cd68ae435c64dac86f46 --- languages/FakeConverter.php | 3 +++ languages/Language.php | 2 +- languages/LanguageConverter.php | 10 ++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/languages/FakeConverter.php b/languages/FakeConverter.php index 78019a7882..6f2117c626 100644 --- a/languages/FakeConverter.php +++ b/languages/FakeConverter.php @@ -64,6 +64,9 @@ class FakeConverter { return $this->mLang->getFormattedNsText( $ns ); } + /** + * @return string[] + */ function getVariants() { return [ $this->mLang->getCode() ]; } diff --git a/languages/Language.php b/languages/Language.php index 067231557b..14e6f5c63b 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -4127,7 +4127,7 @@ class Language { * Get the list of variants supported by this language * see sample implementation in LanguageZh.php * - * @return array An array of language codes + * @return string[] An array of language codes */ public function getVariants() { return $this->mConverter->getVariants(); diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index 6286a2b062..4c3e5be207 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -48,6 +48,10 @@ class LanguageConverter { ]; public $mMainLanguageCode; + + /** + * @var string[] + */ public $mVariants; public $mVariantFallbacks; public $mVariantNames; @@ -75,11 +79,9 @@ class LanguageConverter { const CACHE_VERSION_KEY = 'VERSION 7'; /** - * Constructor - * * @param Language $langobj * @param string $maincode The main language code of this language - * @param array $variants The supported variants of this language + * @param string[] $variants The supported variants of this language * @param array $variantfallbacks The fallback language of each variant * @param array $flags Defining the custom strings that maps to the flags * @param array $manualLevel Limit for supported variants @@ -122,7 +124,7 @@ class LanguageConverter { * Get all valid variants. * Call this instead of using $this->mVariants directly. * - * @return array Contains all valid variants + * @return string[] Contains all valid variants */ public function getVariants() { return $this->mVariants; -- 2.20.1