diff --git a/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php index bd2f6acd0..95dcbc888 100644 --- a/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php +++ b/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php @@ -13,20 +13,21 @@ class PersonEventListener { public function onPrePersist(LifecycleEventArgs $event): void { - $em = $event->getObjectManager(); + // $em = $event->getObjectManager(); if($event->getObject() instanceof Person){ $person = $event->getObject(); - $firstnameCaps = ucwords(strtolower($person->getFirstName()), " \t\r\n\f\v'-"); + $firstnameCaps = mb_convert_case(mb_strtolower($person->getFirstName()), MB_CASE_TITLE, 'UTF-8'); + $firstnameCaps = ucwords(strtolower($firstnameCaps), " \t\r\n\f\v'-"); $person->setFirstName($firstnameCaps); - $lastnameCaps = strtoupper($person->getLastName()); + $lastnameCaps = mb_strtoupper($person->getLastName(), 'UTF-8'); $person->setLastName($lastnameCaps); - $em->persist($person); - $em->flush(); + // $em->persist($person); + // $em->flush(); } elseif ($event->getObject() instanceof PersonAltName){ @@ -34,8 +35,8 @@ class PersonEventListener $altnameCaps = ucwords(strtolower($altname->getLabel()), " \t\r\n\f\v'-"); $altname->setLabel($altnameCaps); - $em->persist($altname); - $em->flush(); + // $em->persist($altname); + // $em->flush(); } else { diff --git a/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php b/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php index b4d3fb92c..b8ab4c0fd 100644 --- a/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php @@ -52,9 +52,9 @@ class PersonCreateEventTest extends TestCase public function generateNames(): iterator { - yield ['julie', 'Julie', 'lenaerts', 'LENAERTS']; + yield ['émelie-marie', 'Émelie-Marie', 'lenaerts', 'LENAERTS']; yield ['jean-marie', 'Jean-Marie', 'lenaerts', 'LENAERTS']; - yield ['vinCENT', 'Vincent', 'van gogh', 'VAN GOGH']; + yield ['vinCENT', 'Vincent', 'fastré', 'FASTRÉ']; yield ['Vincent', 'Vincent', 'van Gogh', 'VAN GOGH']; yield ['André marie', 'André Marie', 'Bah', 'BAH']; }