revert slug change

Author: taylorotwell

src/Illuminate/Support/Str.php

@@ -551,9 +551,23 @@ public static function singular($value)
      */
     public static function slug($title, $separator = '-', $language = 'en')
     {
-        $language = $language ?? '';
+        $title = $language ? static::ascii($title, $language) : $title;
 
-        return ASCII::to_slugify((string) $title, $separator, $language, [], true);
+        // 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', '', static::lower($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);
     }
 
     /**

tests/Support/SupportStrTest.php

@@ -200,7 +200,7 @@ public function testSlug()
         $this->assertSame('hello-world', Str::slug('hello_world'));
         $this->assertSame('hello_world', Str::slug('hello_world', '_'));
         $this->assertSame('user-at-host', Str::slug('user@host'));
-        $this->assertSame('slam-dnya', Str::slug('سلام دنیا', '-', null));
+        // $this->assertSame('slam-dnya', Str::slug('سلام دنیا', '-', null));
     }
 
     public function testStrStart()

tests/Support/SupportStringableTest.php

@@ -229,7 +229,7 @@ public function testSlug()
         $this->assertSame('hello-world', (string) $this->stringable('hello_world')->slug());
         $this->assertSame('hello_world', (string) $this->stringable('hello_world')->slug('_'));
         $this->assertSame('user-at-host', (string) $this->stringable('user@host')->slug());
-        $this->assertSame('slam-dnya', (string) $this->stringable('سلام دنیا')->slug('-', null));
+        // $this->assertSame('slam-dnya', (string) $this->stringable('سلام دنیا')->slug('-', null));
     }
 
     public function testStart()