bug #10077 Fix select attributes according to recent Symfony form changes (Zales0123)

pamil · web-flow · commit 03759fa45d76 · 2019-01-08T15:40:11.000+01:00
This PR was merged into the 1.2 branch. Discussion ---------- | Q | A | --------------- | ----- | Branch? | 1.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | related to symfony/symfony#29307 | License | MIT Due to the latest Symfony 4.1.10/3.4.21 release and changes introduced in linked PR, a bug in select attribute type araised 🌤 Apparently, possible to select values in attribute configuration was saved with `TextType` form type, even though `SelectAttributeValueTranslationsType` should be used. It was somehow parsed before, but know it's not possible and this PR fixes this absurdity 🖖 Commits ------- 51f7ec2481d67270ed66b9879fc57702e4fafb76 Fix select attributes according to recent Symfony form changes b80fa003a4a279c9204465b6189027db50c2285e Fix test in ResourceBundle (taken from #10062)
diff --git a/Form/Type/AttributeType/Configuration/SelectAttributeChoicesCollectionType.php b/Form/Type/AttributeType/Configuration/SelectAttributeChoicesCollectionType.php
@@ -36,7 +36,7 @@ public function __construct(TranslationLocaleProviderInterface $localeProvider)
      */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) {
             $data = $event->getData();
             $form = $event->getForm();
 
@@ -57,8 +57,11 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     $fixedData[$newKey] = $this->resolveValues($values);
 
                     if ($form->offsetExists($key)) {
-                        $form->offsetUnset($key);
-                        $form->offsetSet(null, $newKey);
+                        $type = get_class($form->get($key)->getConfig()->getType()->getInnerType());
+                        $options = $form->get($key)->getConfig()->getOptions();
+
+                        $form->remove($key);
+                        $form->add($newKey, $type, $options);
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(TranslationLocaleProviderInterface $localeProvider)`
`36`	`36`	`*/`
`37`	`37`	`public function buildForm(FormBuilderInterface $builder, array $options): void`
`38`	`38`	`{`
`39`		`- $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {`
	`39`	`+ $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) {`
`40`	`40`	`$data = $event->getData();`
`41`	`41`	`$form = $event->getForm();`
`42`	`42`
`@@ -57,8 +57,11 @@ public function buildForm(FormBuilderInterface $builder, array $options): void`
`57`	`57`	`$fixedData[$newKey] = $this->resolveValues($values);`
`58`	`58`
`59`	`59`	`if ($form->offsetExists($key)) {`
`60`		`- $form->offsetUnset($key);`
`61`		`- $form->offsetSet(null, $newKey);`
	`60`	`+ $type = get_class($form->get($key)->getConfig()->getType()->getInnerType());`
	`61`	`+ $options = $form->get($key)->getConfig()->getOptions();`
	`62`	`+`
	`63`	`+ $form->remove($key);`
	`64`	`+ $form->add($newKey, $type, $options);`
`62`	`65`	`}`
`63`	`66`	`}`
`64`	`67`