Merge pull request Sylius#6300 from pamil/resource/improve-collection…

…-extension [Resource] Improve CollectionExtension
pamil · Oct 5, 2016 · 4b32282 · 4b32282
2 parents 4f7fcd4 + 675114f
commit 4b32282
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 64 deletions.
diff --git a/Form/Extension/CollectionExtension.php b/Form/Extension/CollectionExtension.php
@@ -26,25 +26,15 @@ class CollectionExtension extends AbstractTypeExtension
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        if (array_key_exists('button_add_label', $options)) {
-            $view->vars['button_add_label'] = $options['button_add_label'];
-        }
-
-        if (array_key_exists('button_delete_label', $options)) {
-            $view->vars['button_delete_label'] = $options['button_delete_label'];
-        }
+        $view->vars['button_add_label'] = $options['button_add_label'];
+        $view->vars['button_delete_label'] = $options['button_delete_label'];
     }
 
     /**
      * {@inheritdoc}
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefined([
-            'button_add_label',
-            'button_delete_label',
-        ]);
-
         $resolver->setDefaults([
             'button_add_label' => 'sylius.form.collection.add',
             'button_delete_label' => 'sylius.form.collection.delete',

diff --git a/spec/Form/Extension/CollectionExtensionSpec.php b/spec/Form/Extension/CollectionExtensionSpec.php