[Form] Fix #11694 - Enforce RepeatedType options value type check

kix · kix · commit b312a004f3fd · 2014-08-18T23:01:17.000+06:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php b/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
@@ -55,6 +55,12 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'second_name'    => 'second',
             'error_bubbling' => false,
         ));
+
+        $resolver->setAllowedTypes(array(
+            'options'        => 'array',
+            'first_options'  => 'array',
+            'second_options' => 'array',
+        ));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
@@ -72,6 +72,39 @@ public function testSetRequired()
         $this->assertFalse($form['second']->isRequired());
     }
 
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testSetInvalidOptions()
+    {
+        $this->factory->create('repeated', null, array(
+            'type'    => 'text',
+            'options' => 'bad value',
+        ));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testSetInvalidFirstOptions()
+    {
+        $this->factory->create('repeated', null, array(
+            'type'          => 'text',
+            'first_options' => 'bad value',
+        ));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testSetInvalidSecondOptions()
+    {
+        $this->factory->create('repeated', null, array(
+            'type'           => 'text',
+            'second_options' => 'bad value',
+        ));
+    }
+
     public function testSetErrorBubblingToTrue()
     {
         $form = $this->factory->create('repeated', null, array(
