jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348558 )
Change subject: Use more specific string[] type hint for language variants
......................................................................
Use more specific string[] type hint for language variants
This patch only touches PHPDoc documentation, nothing else.
Change-Id: Ia79d06425a3b8629c171cd68ae435c64dac86f46
---
M languages/FakeConverter.php
M languages/Language.php
M languages/LanguageConverter.php
3 files changed, 10 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/languages/FakeConverter.php b/languages/FakeConverter.php
index 78019a7..6f2117c 100644
--- a/languages/FakeConverter.php
+++ b/languages/FakeConverter.php
@@ -64,6 +64,9 @@
return $this->mLang->getFormattedNsText( $ns );
}
+ /**
+ * @return string[]
+ */
function getVariants() {
return [ $this->mLang->getCode() ];
}
diff --git a/languages/Language.php b/languages/Language.php
index 0672315..14e6f5c 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -4127,7 +4127,7 @@
* 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 6286a2b..4c3e5be 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -48,6 +48,10 @@
];
public $mMainLanguageCode;
+
+ /**
+ * @var string[]
+ */
public $mVariants;
public $mVariantFallbacks;
public $mVariantNames;
@@ -75,11 +79,9 @@
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 @@
* 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;
--
To view, visit https://gerrit.wikimedia.org/r/348558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia79d06425a3b8629c171cd68ae435c64dac86f46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Liangent <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
