Add UTF-8 slug without explicit language code (#26329)

laravel · Oct 31, 2018 · 96e4743 · 96e4743
1 parent 0060d98
commit 96e4743
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -412,12 +412,12 @@ public static function singular($value)
      *
      * @param  string  $title
      * @param  string  $separator
-     * @param  string  $language
+     * @param  string|null  $language
      * @return string
      */
     public static function slug($title, $separator = '-', $language = 'en')
     {
-        $title = static::ascii($title, $language);
+        $title = $language ? static::ascii($title, $language) : $title;
 
         // Convert all dashes/underscores into separator
         $flip = $separator === '-' ? '_' : '-';

diff --git a/tests/Support/SupportStrTest.php b/tests/Support/SupportStrTest.php
@@ -142,6 +142,7 @@ public function testSlug()
         $this->assertEquals('hello-world', Str::slug('hello_world'));
         $this->assertEquals('hello_world', Str::slug('hello_world', '_'));
         $this->assertEquals('user-at-host', Str::slug('user@host'));
+        $this->assertEquals('سلام-دنیا', Str::slug('سلام دنیا', '-', null));
     }
 
     public function testFinish()