diff --git a/src/Symfony/Component/String/Slugger/AsciiSlugger.php b/src/Symfony/Component/String/Slugger/AsciiSlugger.php index cb6f5b2b12..583cafdf98 100644 --- a/src/Symfony/Component/String/Slugger/AsciiSlugger.php +++ b/src/Symfony/Component/String/Slugger/AsciiSlugger.php @@ -98,6 +98,7 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface 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 index c1a0e61ae3..0ef3de1cf9 100644 --- a/src/Symfony/Component/String/Tests/SluggerTest.php +++ b/src/Symfony/Component/String/Tests/SluggerTest.php @@ -31,6 +31,8 @@ class SluggerTest extends TestCase { 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'],