[String] Transliterate & to and

Warxcell · fabpot · commit 76ff984ab524 · 2020-02-13T16:03:58.000+01:00
diff --git a/src/Symfony/Component/String/Slugger/AsciiSlugger.php b/src/Symfony/Component/String/Slugger/AsciiSlugger.php
@@ -98,6 +98,7 @@ public function slug(string $string, string $separator = '-', string $locale = n
         return (new UnicodeString($string))
             ->ascii($transliterator)
             ->replace('@', $separator.'at'.$separator)
+            ->replace('&', $separator.'and'.$separator)
             ->replaceMatches('/[^A-Za-z0-9]++/', $separator)
             ->trim($separator)
         ;
diff --git a/src/Symfony/Component/String/Tests/SluggerTest.php b/src/Symfony/Component/String/Tests/SluggerTest.php
@@ -31,6 +31,8 @@ public static function provideSlug(): array
     {
         return [
             ['Стойността трябва да бъде лъжа', 'bg', 'Stoinostta-tryabva-da-bude-luzha'],
+            ['You & I', 'en', 'You-and-I'],
+            ['symfony@symfony.com', 'en', 'symfony-at-symfony-com'],
             ['Dieser Wert sollte größer oder gleich', 'de', 'Dieser-Wert-sollte-groesser-oder-gleich'],
             ['Dieser Wert sollte größer oder gleich', 'de_AT', 'Dieser-Wert-sollte-groesser-oder-gleich'],
             ['Αυτή η τιμή πρέπει να είναι ψευδής', 'el', 'Avti-i-timi-prepi-na-inai-psevdhis'],

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ public function slug(string $string, string $separator = '-', string $locale = n`
`98`	`98`	`return (new UnicodeString($string))`
`99`	`99`	`->ascii($transliterator)`
`100`	`100`	`->replace('@', $separator.'at'.$separator)`
	`101`	`+ ->replace('&', $separator.'and'.$separator)`
`101`	`102`	`->replaceMatches('/[^A-Za-z0-9]++/', $separator)`
`102`	`103`	`->trim($separator)`
`103`	`104`	`;`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ public static function provideSlug(): array`
`31`	`31`	`{`
`32`	`32`	`return [`
`33`	`33`	`['Стойността трябва да бъде лъжа', 'bg', 'Stoinostta-tryabva-da-bude-luzha'],`
	`34`	`+ ['You & I', 'en', 'You-and-I'],`
	`35`	`+ ['symfony@symfony.com', 'en', 'symfony-at-symfony-com'],`
`34`	`36`	`['Dieser Wert sollte größer oder gleich', 'de', 'Dieser-Wert-sollte-groesser-oder-gleich'],`
`35`	`37`	`['Dieser Wert sollte größer oder gleich', 'de_AT', 'Dieser-Wert-sollte-groesser-oder-gleich'],`
`36`	`38`	`['Αυτή η τιμή πρέπει να είναι ψευδής', 'el', 'Avti-i-timi-prepi-na-inai-psevdhis'],`