Samwilson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395878 )
Change subject: Always return a string from Language::formatNum()
......................................................................
Always return a string from Language::formatNum()
It says it returns a string, and so it should.
Change-Id: Ic68c65c634c2557a1d07281623cd6c971b000323
---
M languages/Language.php
M tests/phpunit/languages/LanguageTest.php
2 files changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/78/395878/1
diff --git a/languages/Language.php b/languages/Language.php
index 81564ab..8d3984d 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3268,7 +3268,7 @@
}
}
- return $number;
+ return (string)$number;
}
/**
diff --git a/tests/phpunit/languages/LanguageTest.php
b/tests/phpunit/languages/LanguageTest.php
index cd52366..9abe45b 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -1630,6 +1630,32 @@
}
/**
+ * @dataProvider testFormatNumProvider
+ */
+ public function testFormatNum(
+ $translateNumerals, $langCode, $number, $nocommafy, $expected
+ ) {
+ $this->setMwGlobals( [ 'wgTranslateNumerals' =>
$translateNumerals ] );
+ $lang = Language::factory( $langCode );
+ $formattedNum = $lang->formatNum( $number, $nocommafy );
+ $this->assertType( 'string', $formattedNum );
+ $this->assertEquals( $expected, $formattedNum );
+ }
+
+ public function testFormatNumProvider() {
+ return [
+ [ true, 'en', 100, false, '100' ],
+ [ true, 'en', 101, true, '101' ],
+ [ false, 'en', 103, false, '103' ],
+ [ false, 'en', 104, true, '104' ],
+ [ true, 'en', '105', false, '105' ],
+ [ true, 'en', '106', true, '106' ],
+ [ false, 'en', '107', false, '107' ],
+ [ false, 'en', '108', true, '108' ],
+ ];
+ }
+
+ /**
* @dataProvider parseFormattedNumberProvider
*/
public function testParseFormattedNumber( $langCode, $number ) {
--
To view, visit https://gerrit.wikimedia.org/r/395878
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic68c65c634c2557a1d07281623cd6c971b000323
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Samwilson <s...@samwilson.id.au>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
