[Form] Add range type - finished

Kryniol · Kryniol · commit fd26a7ef5e52 · 2015-04-09T19:55:35.000+02:00
[Form] Add range type #11979 - registered RangeType in CoreExtension [Form] Add range type #11979 - added tests for rendering the form field and validating options [Form] Add range type #11979 - added copyright lines in RangeTypeTest class [Form] Add range type #11979 - minor formatting fixes, added author block
diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
@@ -56,6 +56,7 @@ protected function loadTypes()
             new Type\EmailType(),
             new Type\HiddenType(),
             new Type\IntegerType(),
+            new Type\RangeType(),
             new Type\LanguageType(),
             new Type\LocaleType(),
             new Type\MoneyType(),
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php b/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php
@@ -11,33 +11,56 @@
 
 namespace Symfony\Component\Form\Extension\Core\Type;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * A range form element.
  *
  * @author Carlos Revillo <crevillo@gmail.com>
+ * @author Pawel Krynicki <pawel.krynicki@hotmail.com>
  */
 class RangeType extends AbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $resolver->setDefaults(array(
-            'min' => null,
-            'max' => null,
-        ));
+        $view->vars['attr']['min'] = $options['min'];
+        $view->vars['attr']['max'] = $options['max'];
+
+        if (isset($options['step'])) {
+            $view->vars['attr']['step'] = $options['step'];
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setRequired(array('min', 'max'));
+
+        $resolver->setDefined('step');
+
+        $resolver->setAllowedTypes('min', 'numeric');
+        $resolver->setAllowedTypes('max', 'numeric');
+        $resolver->setAllowedTypes('step', 'numeric');
+
+        $resolver->setAllowedValues('step', function ($value) {
+            return $value > 0;
+        });
     }
 
     /**
      * {@inheritdoc}
      */
     public function getParent()
     {
-        return 'integer';
+        return 'number';
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
@@ -1388,6 +1388,27 @@ public function testInteger()
         );
     }
 
+    public function testRange()
+    {
+        $form = $this->factory->createNamed('name', 'range', 123.45, array(
+            'min' => 1.25,
+            'max' => 234.56,
+            'step' => 0.25,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+'/input
+    [@type="range"]
+    [@name="name"]
+    [@min="1.25"]
+    [@max="234.56"]
+    [@step="0.25"]
+    [@class="my&class form-control"]
+    [@value="123.45"]
+'
+        );
+    }
+
     public function testLanguage()
     {
         $form = $this->factory->createNamed('name', 'language', 'de');
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RangeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RangeTypeTest.php
@@ -0,0 +1,44 @@
+<?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;
+
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
+
+/**
+ * @author Pawel Krynicki <pawel.krynicki@hotmail.com>
+ */
+class RangeTypeTest extends TestCase
+{
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testThrowExceptionIfStepOptionNotPositive()
+    {
+        $this->factory->create('range', null, array('min' => 0, 'max' => 100, 'step' => -5));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\MissingOptionsException
+     */
+    public function testThrowExceptionIfMaxOptionsMissing()
+    {
+        $this->factory->create('range', null, array('min' => 0));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\MissingOptionsException
+     */
+    public function testThrowExceptionIfMinOptionsMissing()
+    {
+        $this->factory->create('range', null, array('max' => 0));
+    }
+}
