Applied fixes from StyleCI (#59)

overtrue · Aug 17, 2016 · 7af85b0 · 7af85b0
1 parent a3b8ac6
commit 7af85b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Pinyin.php b/src/Pinyin.php
@@ -220,11 +220,12 @@ protected function romanize($string, $isName = false)
      *
      * @return string
      */
-    protected function convertSurname($string, $dictLoader) {
+    protected function convertSurname($string, $dictLoader)
+    {
         $dictLoader->mapSurname(function ($dictionary) use (&$string) {
             foreach ($dictionary as $surname => $pinyin) {
                 if (strpos($string, $surname) === 0) {
-                    $string = $pinyin . mb_substr($string, mb_strlen($surname, 'UTF-8'), mb_strlen($string, 'UTF-8') - 1, 'UTF-8');
+                    $string = $pinyin.mb_substr($string, mb_strlen($surname, 'UTF-8'), mb_strlen($string, 'UTF-8') - 1, 'UTF-8');
                     break;
                 }
             }

diff --git a/tests/PinyinTest.php b/tests/PinyinTest.php
@@ -87,10 +87,10 @@ public function testName()
         $this->assertSame(array('yu', 'chi', 'pu'), $pinyin->name('尉迟朴'));
         $this->assertSame(array('wei', 'mou', 'mou'), $pinyin->name('尉某某'));
         $this->assertSame(array('yu', 'chi', 'mou', 'mou'), $pinyin->name('尉迟某某'));
-        $this->assertSame(array('zhai', 'di', 'di',), $pinyin->name('翟翟翟'));
+        $this->assertSame(array('zhai', 'di', 'di'), $pinyin->name('翟翟翟'));
 
         // 以下两词在任何位置都不变
-        $this->assertSame(array('mou', 'mou', 'yu', 'chi',), $pinyin->name('某某尉迟'));
+        $this->assertSame(array('mou', 'mou', 'yu', 'chi'), $pinyin->name('某某尉迟'));
         $this->assertSame(array('shan', 'chan', 'yu', 'dan'), $pinyin->name('单单于单'));
     }
 
@@ -258,11 +258,10 @@ public function map(Closure $callback)
     public function mapSurname(Closure $callback)
     {
         $dictionary = array(
-                '单' => "shan",
+                '单' => 'shan',
                 '朴' => 'piao',
                 '尉迟' => 'yu chi',
             );
         $callback($dictionary);
     }
-
 }