Fix form validation when locale is required (knp behaviors) (#369)

a2lix · Jan 26, 2022 · ca3bf7b · ca3bf7b
1 parent 5da291b
commit ca3bf7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Form/EventListener/TranslationsFormsListener.php b/src/Form/EventListener/TranslationsFormsListener.php
@@ -43,11 +43,14 @@ public function preSetData(FormEvent $event): void
 
     public function submit(FormEvent $event): void
     {
+        $form = $event->getForm();
+        $formOptions = $form->getConfig()->getOptions();
+
         $data = $event->getData();
 
         foreach ($data as $locale => $translation) {
             // Remove useless Translation object
-            if ((method_exists($translation, 'isEmpty') && $translation->isEmpty()) // Knp
+            if ((method_exists($translation, 'isEmpty') && $translation->isEmpty() && !\in_array($locale, $formOptions['required_locales'], true)) // Knp
                 || empty($translation) // Default
             ) {
                 $data->removeElement($translation);

diff --git a/src/Form/EventListener/TranslationsListener.php b/src/Form/EventListener/TranslationsListener.php
@@ -68,11 +68,14 @@ public function preSetData(FormEvent $event): void
 
     public function submit(FormEvent $event): void
     {
+        $form = $event->getForm();
+        $formOptions = $form->getConfig()->getOptions();
+
         $data = $event->getData();
 
         foreach ($data as $locale => $translation) {
             // Remove useless Translation object
-            if ((method_exists($translation, 'isEmpty') && $translation->isEmpty()) // Knp
+            if ((method_exists($translation, 'isEmpty') && $translation->isEmpty() && !\in_array($locale, $formOptions['required_locales'], true)) // Knp
                 || empty($translation) // Default
             ) {
                 $data->removeElement($translation);