Browse Source

Add separate getter/setter for default transliterator id.

ADmad 10 years ago
parent
commit
0c54863392
2 changed files with 24 additions and 13 deletions
  1. 13 7
      src/Utility/Text.php
  2. 11 6
      tests/TestCase/Utility/TextTest.php

+ 13 - 7
src/Utility/Text.php

@@ -861,17 +861,23 @@ class Text
     }
 
     /**
-     * Get/set default transliterator identifer string.
+     * Get default transliterator identifer string.
      *
-     * @param string|null $transliteratorId Transliterator identifer.
-     * @return string|void
+     * @return string Transliterator identifer.
      */
-    public static function defaultTransliteratorId($transliteratorId = null)
+    public static function getTransliteratorId()
     {
-        if ($transliteratorId === null) {
-            return static::$_defaultTransliteratorId;
-        }
+        return static::$_defaultTransliteratorId;
+    }
 
+    /**
+     * Set default transliterator identifer string.
+     *
+     * @param string $transliteratorId Transliterator identifer.
+     * @return void
+     */
+    public static function setTransliteratorId($transliteratorId)
+    {
         static::$_defaultTransliteratorId = $transliteratorId;
     }
 

+ 11 - 6
tests/TestCase/Utility/TextTest.php

@@ -1589,16 +1589,21 @@ podeís adquirirla.</span></p>
         ];
     }
 
-    public function testDefaultTransliteratorId()
+    /**
+     * Test getting/setting default transliterator id.
+     *
+     * @return void
+     */
+    public function testGetSetTransliteratorId()
     {
-        $expected = 'Any-Latin; Latin-ASCII; [\u0080-\u7fff] remove';
-        $this->assertEquals($expected, Text::defaultTransliteratorId());
+        $defaultTransliteratorId = 'Any-Latin; Latin-ASCII; [\u0080-\u7fff] remove';
+        $this->assertEquals($defaultTransliteratorId, Text::getTransliteratorId());
 
         $expected = 'Latin-ASCII; [\u0080-\u7fff] remove';
-        Text::defaultTransliteratorId($expected);
-        $this->assertEquals($expected, Text::defaultTransliteratorId());
+        Text::setTransliteratorId($expected);
+        $this->assertEquals($expected, Text::getTransliteratorId());
 
-        Text::defaultTransliteratorId('Any-Latin; Latin-ASCII; [\u0080-\u7fff] remove');
+        Text::setTransliteratorId($defaultTransliteratorId);
     }
 
     /**