[Form] Fix #11694 - Enforce options value type check in some form types

symfony · Oct 16, 2014 · 0af6467 · 0af6467
1 parent 7dd842c
commit 0af6467
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 0 deletions.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php b/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php
@@ -24,6 +24,10 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setDefaults(array(
             'years' => range(date('Y') - 120, date('Y')),
         ));
+
+        $resolver->setAllowedTypes(array(
+            'years' => 'array',
+        ));
     }
 
     /**

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -237,6 +237,9 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
         $resolver->setAllowedTypes(array(
             'format' => array('int', 'string'),
+            'years'  => 'array',
+            'months' => 'array',
+            'days'   => 'array',
         ));
     }
 

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/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -221,6 +221,12 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 'choice',
             ),
         ));
+
+        $resolver->setAllowedTypes(array(
+            'hours'   => 'array',
+            'minutes' => 'array',
+            'seconds' => 'array',
+        ));
     }
 
     /**

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
@@ -34,6 +34,10 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setDefaults(array(
             'default_protocol' => 'http',
         ));
+
+        $resolver->setAllowedTypes(array(
+            'default_protocol' => array('null', 'string'),
+        ));
     }
 
     /**

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Extension\Core\Type;
+
+/**
+ * @author Stepan Anchugov <kixxx1@gmail.com>
+ */
+class BirthdayTypeTest extends BaseTypeTest
+{
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testSetInvalidYearsOption()
+    {
+        $this->factory->create('birthday', null, array(
+            'years' => 'bad value',
+        ));
+    }
+
+    protected function getTestedType()
+    {
+        return 'birthday';
+    }
+}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -340,6 +340,36 @@ public function testThrowExceptionIfFormatIsInvalid()
         ));
     }
 
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testThrowExceptionIfYearsIsInvalid()
+    {
+        $this->factory->create('date', null, array(
+            'years' => 'bad value',
+        ));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testThrowExceptionIfMonthsIsInvalid()
+    {
+        $this->factory->create('date', null, array(
+            'months' => 'bad value',
+        ));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testThrowExceptionIfDaysIsInvalid()
+    {
+        $this->factory->create('date', null, array(
+            'days' => 'bad value',
+        ));
+    }
+
     public function testSetDataWithDifferentTimezones()
     {
         $form = $this->factory->create('date', null, 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(

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -673,4 +673,34 @@ public function testInitializeWithSecondsAndWithoutMinutes()
             'with_seconds' => true,
         ));
     }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testThrowExceptionIfHoursIsInvalid()
+    {
+        $this->factory->create('time', null, array(
+            'hours' => 'bad value',
+        ));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testThrowExceptionIfMinutesIsInvalid()
+    {
+        $this->factory->create('time', null, array(
+            'minutes' => 'bad value',
+        ));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testThrowExceptionIfSecondsIsInvalid()
+    {
+        $this->factory->create('time', null, array(
+            'seconds' => 'bad value',
+        ));
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
@@ -70,4 +70,14 @@ public function testSubmitAddsNoDefaultProtocolIfSetToNull()
         $this->assertSame('www.domain.com', $form->getData());
         $this->assertSame('www.domain.com', $form->getViewData());
     }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testThrowExceptionIfDefaultProtocolIsInvalid()
+    {
+        $this->factory->create('url', null, array(
+            'default_protocol' => array(),
+        ));
+    }
 }