Re-added EasySlugger to fix tests

dmeltzer · Apr 22, 2020 · 5dc64ea · 5dc64ea
1 parent 1c5486e
commit 5dc64ea
Show file tree

Hide file tree

Showing 3 changed files with 261 additions and 266 deletions.
diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
@@ -326,7 +326,7 @@ public function isFieldDecryptable($string)
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.4]
-     * @return boolean
+     * @return string
      */
     public function convertUnicodeDbSlug($original = null)
     {
@@ -336,7 +336,7 @@ public function convertUnicodeDbSlug($original = null)
         if (!function_exists('transliterator_transliterate')) {
             $long_slug = '_snipeit_' . str_slug(\Patchwork\Utf8::utf8_encode(trim($name)), '_');
         } else {
-            $long_slug =  '_snipeit_' . str_slug($name, '_');
+            $long_slug =  '_snipeit_' . Utf8Slugger::slugify($name, '_');
         }
 
         return substr($long_slug, 0, 50) . '_' . $id;

diff --git a/composer.json b/composer.json
@@ -32,6 +32,7 @@
     "fideloper/proxy": "^4.3",
     "guzzlehttp/guzzle": "^6.5",
     "intervention/image": "^2.5",
+    "javiereguiluz/easyslugger": "^1.0",
     "laravel/framework": "^6.0",
     "laravel/helpers": "^1.2",
     "laravel/passport": "^8.4",
@@ -58,6 +59,8 @@
   },
   "require-dev": {
     "codeception/codeception": "^4.1",
+    "codeception/module-asserts": "^1.2",
+    "codeception/module-laravel5": "^1.1",
     "fzaninotto/faker": "^1.9",
     "phpunit/php-token-stream": "^3.1",
     "phpunit/phpunit": "^8.5",