From 1340ef07df6c36b4fdfc9e421009e6d2ccbd12ed Mon Sep 17 00:00:00 2001 From: crevillo Date: Sat, 29 Nov 2014 12:37:36 +0100 Subject: [PATCH 1/2] Implemented: [Form] Add "range" type #11979 --- .../views/Form/form_div_layout.html.twig | 5 ++ .../FrameworkBundle/Resources/config/form.xml | 3 ++ .../Form/Extension/Core/Type/RangeType.php | 50 +++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 src/Symfony/Component/Form/Extension/Core/Type/RangeType.php diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig index de54d49c30456..dddfaca47bce5 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig @@ -142,6 +142,11 @@ {{ block('form_widget_simple') }} {%- endblock integer_widget -%} +{%- block range_widget -%} + {% set type = type|default('range') %} + {{- block('form_widget_simple') -}} +{%- endblock range_widget -%} + {%- block money_widget -%} {{ money_pattern|replace({ '{{ widget }}': block('form_widget_simple') })|raw }} {%- endblock money_widget -%} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml index 5090309101631..c15f6c3239ed2 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml @@ -146,6 +146,9 @@ + + + diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php b/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php new file mode 100644 index 0000000000000..8ff2af12e62e7 --- /dev/null +++ b/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php @@ -0,0 +1,50 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Form\Extension\Core\Type; + +use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\AbstractType; + +/** + * A range form element. + * + * @author Carlos Revillo + */ +class RangeType extends AbstractType +{ + /** + * {@inheritdoc} + */ + public function setDefaultOptions(OptionsResolverInterface $resolver) + { + $resolver->setDefaults(array( + 'min' => null, + 'max' => null, + )); + } + + /** + * {@inheritdoc} + */ + public function getParent() + { + return 'integer'; + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return 'range'; + } +} From dd08aeb280ab412be60bee9d82c36dc7e9ae7660 Mon Sep 17 00:00:00 2001 From: Kryniol Date: Thu, 9 Apr 2015 16:52:02 +0200 Subject: [PATCH 2/2] [Form] Add range type - finished [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 --- .../Form/Extension/Core/CoreExtension.php | 1 + .../Form/Extension/Core/Type/RangeType.php | 37 +++++++++++++--- .../Tests/AbstractBootstrap3LayoutTest.php | 21 +++++++++ .../Extension/Core/Type/RangeTypeTest.php | 44 +++++++++++++++++++ 4 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 src/Symfony/Component/Form/Tests/Extension/Core/Type/RangeTypeTest.php diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php index 231994258e8d6..f974afb5c6d37 100644 --- 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 index 8ff2af12e62e7..2f08c84600753 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php @@ -11,25 +11,48 @@ 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 + * @author Pawel Krynicki */ 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; + }); } /** @@ -37,7 +60,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ 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 index 41c52748704d9..a8a7e91fc1799 100644 --- 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 new file mode 100644 index 0000000000000..8af15be773e61 --- /dev/null +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RangeTypeTest.php @@ -0,0 +1,44 @@ + + * + * 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 + */ +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)); + } +} pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy