Fix TaggableTrait utf8_slug test failure

darron1217 · darron1217 · commit 94e4570968d8 · 2018-01-16T11:00:48.000+09:00
diff --git a/Modules/Core/helpers.php b/Modules/Core/helpers.php
@@ -54,24 +54,3 @@ function asgard_editor($fieldName, $labelName, $content)
         return view('core::components.textarea-wrapper', compact('fieldName', 'labelName', 'content'));
     }
 }
-
-if (! function_exists('utf8_slug')) {
-    function utf8_slug($title, $separator = '-')
-    {
-        // Convert all dashes/underscores into separator
-        $flip = $separator == '-' ? '_' : '-';
-
-        $title = preg_replace('!['.preg_quote($flip).']+!u', $separator, $title);
-
-        // Replace @ with the word 'at'
-        $title = str_replace('@', $separator.'at'.$separator, $title);
-
-        // Remove all characters that are not the separator, letters, numbers, or whitespace.
-        $title = preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', mb_strtolower($title));
-
-        // Replace all separator characters and whitespace by a single separator
-        $title = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title);
-
-        return trim($title, $separator);
-    }
-}
diff --git a/Modules/Tag/Traits/TaggableTrait.php b/Modules/Tag/Traits/TaggableTrait.php
@@ -204,8 +204,22 @@ protected function getEntityClassName()
     /**
      * {@inheritdoc}
      */
-    protected function generateTagSlug($name)
+    protected function generateTagSlug($name, $separator = '-')
     {
-        return utf8_slug($name);
+        // Convert all dashes/underscores into separator
+        $flip = $separator == '-' ? '_' : '-';
+
+        $name = preg_replace('!['.preg_quote($flip).']+!u', $separator, $name);
+
+        // Replace @ with the word 'at'
+        $name = str_replace('@', $separator.'at'.$separator, $name);
+
+        // Remove all characters that are not the separator, letters, numbers, or whitespace.
+        $name = preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', mb_strtolower($name));
+
+        // Replace all separator characters and whitespace by a single separator
+        $name = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $name);
+
+        return trim($name, $separator);
     }
 }
