[MediaWiki-commits] [Gerrit] LanguageFallbackChain: Avoid creating Language objects in so... - change (mediawiki...Wikibase)

[Liangent (Code Review)]

Liangent has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/72353


Change subject: LanguageFallbackChain: Avoid creating Language objects in some 
cases
......................................................................

LanguageFallbackChain: Avoid creating Language objects in some cases

Change-Id: I7c8c27026310adeeb8530de508e3fddb02fae557
---
M lib/includes/LanguageFallbackChain.php
M lib/tests/phpunit/LanguageFallbackChainTest.php
2 files changed, 10 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/53/72353/1

diff --git a/lib/includes/LanguageFallbackChain.php 
b/lib/includes/LanguageFallbackChain.php
index ee91987..795dbf2 100644
--- a/lib/includes/LanguageFallbackChain.php
+++ b/lib/includes/LanguageFallbackChain.php
@@ -66,8 +66,8 @@
        public function extractPreferredValue( $data ) {
 
                foreach ( $this->chain as $languageWithConversion ) {
-                       $fetchCode = 
$languageWithConversion->getFetchLanguage()->getCode();
-                       $languageCode = 
$languageWithConversion->getLanguage()->getCode();
+                       $fetchCode = 
$languageWithConversion->getFetchLanguageCode();
+                       $languageCode = 
$languageWithConversion->getLanguageCode();
 
                        if ( isset( $data[$fetchCode] ) ) {
                                return array(
diff --git a/lib/tests/phpunit/LanguageFallbackChainTest.php 
b/lib/tests/phpunit/LanguageFallbackChainTest.php
index 455c981..8a81978 100644
--- a/lib/tests/phpunit/LanguageFallbackChainTest.php
+++ b/lib/tests/phpunit/LanguageFallbackChainTest.php
@@ -26,7 +26,7 @@
         */
        public function testExtractPreferredValue( $lang, $mode, $data, 
$expected ) {
                $factory = new LanguageFallbackChainFactory();
-               $chain = $factory->newFromLanguage( \Language::factory( $lang 
), $mode );
+               $chain = $factory->newFromLanguageCode( $lang, $mode );
 
                $resolved = $chain->extractPreferredValue( $data );
 
@@ -38,6 +38,8 @@
                        'en' => 'foo',
                        'nl' => 'bar',
                        'zh-cn' => '测试',
+                       'lzh' => '試',
+                       'zh-classical' => '驗',
                );
 
                return array(
@@ -46,6 +48,11 @@
                                'language' => 'en',
                                'source' => 'en',
                        ) ),
+                       array( 'zh-classical', 
LanguageFallbackChainFactory::FALLBACK_ALL, $data, array(
+                               'value' => '試',
+                               'language' => 'lzh',
+                               'source' => 'lzh',
+                       ) ),
                        array( 'nl', 
LanguageFallbackChainFactory::FALLBACK_ALL, $data, array(
                                'value' => 'bar',
                                'language' => 'nl',

-- 
To view, visit https://gerrit.wikimedia.org/r/72353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c8c27026310adeeb8530de508e3fddb02fae557
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Liangent <liang...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits