Merge "Add tests for LanguageConverter classes that didn't have them"

[lhc/web/wiklou.git] / languages / classes / LanguageGan.php

diff --git a/languages/classes/LanguageGan.php b/languages/classes/LanguageGan.php
index d81574d..7582f56 100644 (file)
--- a/languages/classes/LanguageGan.php
+++ b/languages/classes/LanguageGan.php
@@ -21,34 +21,30 @@
  * @ingroup Language
  */
 
-require_once __DIR__ . '/../LanguageConverter.php';
-require_once __DIR__ . '/LanguageZh.php';
-
 /**
  * @ingroup Language
  */
 class GanConverter extends LanguageConverter {
-
        /**
-        * @param $langobj Language
-        * @param $maincode string
-        * @param $variants array
-        * @param $variantfallbacks array
-        * @param $flags array
-        * @param $manualLevel array
+        * @param Language $langobj
+        * @param string $maincode
+        * @param array $variants
+        * @param array $variantfallbacks
+        * @param array $flags
+        * @param array $manualLevel
         */
        function __construct( $langobj, $maincode,
-                                                               $variants = array(),
-                                                               $variantfallbacks = array(),
-                                                               $flags = array(),
-                                                               $manualLevel = array() ) {
+               $variants = array(),
+               $variantfallbacks = array(),
+               $flags = array(),
+               $manualLevel = array() ) {
                $this->mDescCodeSep = '：';
                $this->mDescVarSep = '；';
                parent::__construct( $langobj, $maincode,
-                                                                       $variants,
-                                                                       $variantfallbacks,
-                                                                       $flags,
-                                                                       $manualLevel );
+                       $variants,
+                       $variantfallbacks,
+                       $flags,
+                       $manualLevel );
                $names = array(
                        'gan' => '原文',
                        'gan-hans' => '简体',
@@ -58,17 +54,16 @@ class GanConverter extends LanguageConverter {
        }
 
        function loadDefaultTables() {
-               require __DIR__ . '/../../includes/ZhConversion.php';
                $this->mTables = array(
-                       'gan-hans' => new ReplacementArray( $zh2Hans ),
-                       'gan-hant' => new ReplacementArray( $zh2Hant ),
+                       'gan-hans' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2Hans ),
+                       'gan-hant' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2Hant ),
                        'gan' => new ReplacementArray
                );
        }
 
        /**
-        * @param $key string
-        * @return String
+        * @param string $key
+        * @return string
         */
        function convertCategoryKey( $key ) {
                return $this->autoConvert( $key, 'gan' );
@@ -82,9 +77,7 @@ class GanConverter extends LanguageConverter {
  * @ingroup Language
  */
 class LanguageGan extends LanguageZh {
-
        function __construct() {
-               global $wgHooks;
                parent::__construct();
 
                $variants = array( 'gan', 'gan-hans', 'gan-hant' );
@@ -98,19 +91,17 @@ class LanguageGan extends LanguageZh {
                );
 
                $this->mConverter = new GanConverter( $this, 'gan',
-                                                               $variants, $variantfallbacks,
-                                                               array(),
-                                                               $ml );
-
-               $wgHooks['PageContentSaveComplete'][] = $this->mConverter;
+                       $variants, $variantfallbacks,
+                       array(),
+                       $ml );
        }
 
        /**
         * word segmentation
         *
-        * @param $string string
-        * @param $autoVariant string
-        * @return String
+        * @param string $string
+        * @param string $autoVariant
+        * @return string
         */
        function normalizeForSearch( $string, $autoVariant = 'gan-hans' ) {
                // LanguageZh::normalizeForSearch