From 9b7c39dd35daa742fd6986a4c413f6d590d774d2 Mon Sep 17 00:00:00 2001 From: apetitpa Date: Tue, 9 May 2017 15:39:49 +0200 Subject: [PATCH 01/11] add tel and color types --- .../FrameworkBundle/Resources/config/form.xml | 6 ++++ .../Form/Extension/Core/CoreExtension.php | 2 ++ .../Form/Extension/Core/Type/ColorType.php | 33 +++++++++++++++++++ .../Form/Extension/Core/Type/TelType.php | 33 +++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 src/Symfony/Component/Form/Extension/Core/Type/ColorType.php create mode 100644 src/Symfony/Component/Form/Extension/Core/Type/TelType.php diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml index 211bccb688b49..9efabf22317ab 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml @@ -158,6 +158,12 @@ The "%service_id%" service is deprecated since Symfony 3.1 and will be removed in 4.0. + + The "%service_id%" service is deprecated since Symfony 3.1 and will be removed in 4.0. + + + The "%service_id%" service is deprecated since Symfony 3.1 and will be removed in 4.0. + diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php index 156d5568801a8..857792ad9f066 100644 --- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php +++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php @@ -77,6 +77,8 @@ protected function loadTypes() new Type\SubmitType(), new Type\ResetType(), new Type\CurrencyType(), + new Type\TelType(), + new Type\ColorType(), ); } } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php new file mode 100644 index 0000000000000..5bfe484f9b82a --- /dev/null +++ b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php @@ -0,0 +1,33 @@ + + * + * 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\Form\AbstractType; + +class ColorType extends AbstractType +{ + /** + * {@inheritdoc} + */ + public function getParent() + { + return __NAMESPACE__.'\TextType'; + } + + /** + * {@inheritdoc} + */ + public function getBlockPrefix() + { + return 'color'; + } +} diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php new file mode 100644 index 0000000000000..2533c7e47f976 --- /dev/null +++ b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php @@ -0,0 +1,33 @@ + + * + * 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\Form\AbstractType; + +class TelType extends AbstractType +{ + /** + * {@inheritdoc} + */ + public function getParent() + { + return __NAMESPACE__.'\TextType'; + } + + /** + * {@inheritdoc} + */ + public function getBlockPrefix() + { + return 'tel'; + } +} From 6a08ffb654452c064e5cb7e00f570ee5ed60649d Mon Sep 17 00:00:00 2001 From: apetitpa Date: Tue, 9 May 2017 15:46:09 +0200 Subject: [PATCH 02/11] remove duplication and add full name --- CONTRIBUTORS.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 3b6af8ad6de72..d10853d05cc87 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -186,9 +186,8 @@ Symfony is the result of the work of many people who made the code better - sun (sun) - Larry Garfield (crell) - Martin Schuhfuß (usefulthink) - - apetitpa + - Arnaud Petitpas (apetitpa) - Matthieu Bontemps (mbontemps) - - apetitpa - Pierre Minnieur (pminnieur) - fivestar - Dominique Bongiraud From 60917c36d787562b4687007fed322ed2eace4749 Mon Sep 17 00:00:00 2001 From: apetitpa Date: Tue, 9 May 2017 16:00:01 +0200 Subject: [PATCH 03/11] add tests for new types --- .../Form/Tests/AbstractLayoutTest.php | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php index db6c64d54e3a4..98d2d48cbe360 100644 --- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php @@ -2463,4 +2463,32 @@ public function testAttributesNotTranslatedWhenTranslationDomainIsFalse() $this->assertMatchesXpath($html, '/form//input[@title="Foo"]'); $this->assertMatchesXpath($html, '/form//input[@placeholder="Bar"]'); } + + public function testTel() + { + $tel = '0102030405'; + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel); + + $this->assertWidgetMatchesXpath($form->createView(), array(), + '/input + [@type="tel"] + [@name="name"] + [@value="0102030405"] +' + ); + } + + public function testColor() + { + $color = '#0000ff'; + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ColorType', $color); + + $this->assertWidgetMatchesXpath($form->createView(), array(), + '/input + [@type="color"] + [@name="name"] + [@value="#0000ff"] +' + ); + } } From bb0f3162155f30973db5e6c652ed46c8b10442d1 Mon Sep 17 00:00:00 2001 From: apetitpa Date: Tue, 9 May 2017 16:03:16 +0200 Subject: [PATCH 04/11] add boostrap 3 layout tests for new types --- .../Tests/AbstractBootstrap3LayoutTest.php | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php index 09138b1da7dcd..6415d7f4a9096 100644 --- a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php @@ -2468,4 +2468,34 @@ public function testButtonAttributeNameRepeatedIfTrue() // foo="foo" $this->assertSame('', $html); } + + public function testTel() + { + $tel = '0102030405'; + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel); + + $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')), + '/input + [@type="tel"] + [@name="name"] + [@class="my&class form-control"] + [@value="0102030405"] +' + ); + } + + public function testColor() + { + $color = '#0000ff'; + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ColorType', $color); + + $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')), + '/input + [@type="color"] + [@name="name"] + [@class="my&class form-control"] + [@value="#0000ff"] +' + ); + } } From 9980a843fc1c32ecd2769643ab58545b9a29978b Mon Sep 17 00:00:00 2001 From: apetitpa Date: Tue, 9 May 2017 16:29:03 +0200 Subject: [PATCH 05/11] revert contributors to master branch --- CONTRIBUTORS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d10853d05cc87..3b6af8ad6de72 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -186,8 +186,9 @@ Symfony is the result of the work of many people who made the code better - sun (sun) - Larry Garfield (crell) - Martin Schuhfuß (usefulthink) - - Arnaud Petitpas (apetitpa) + - apetitpa - Matthieu Bontemps (mbontemps) + - apetitpa - Pierre Minnieur (pminnieur) - fivestar - Dominique Bongiraud From 4c431e6e8da5332369c66a8063f572e01a9f0818 Mon Sep 17 00:00:00 2001 From: apetitpa Date: Tue, 9 May 2017 16:43:53 +0200 Subject: [PATCH 06/11] revert form.xml to master branch --- .../Bundle/FrameworkBundle/Resources/config/form.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml index 9efabf22317ab..211bccb688b49 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml @@ -158,12 +158,6 @@ The "%service_id%" service is deprecated since Symfony 3.1 and will be removed in 4.0. - - The "%service_id%" service is deprecated since Symfony 3.1 and will be removed in 4.0. - - - The "%service_id%" service is deprecated since Symfony 3.1 and will be removed in 4.0. - From b6d71775f4cc542d591bdcebaa55fdd3fafe632f Mon Sep 17 00:00:00 2001 From: apetitpa Date: Tue, 9 May 2017 17:04:12 +0200 Subject: [PATCH 07/11] update templates with new types and rename TelType to TelephoneType --- .../Resources/views/Form/form_div_layout.html.twig | 10 ++++++++++ .../Resources/views/Form/color_widget.html.php | 1 + .../Resources/views/Form/telephone_widget.html.php | 1 + .../Component/Form/Extension/Core/CoreExtension.php | 2 +- .../Core/Type/{TelType.php => TelephoneType.php} | 2 +- .../Form/Tests/AbstractBootstrap3LayoutTest.php | 2 +- .../Component/Form/Tests/AbstractLayoutTest.php | 2 +- 7 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/telephone_widget.html.php rename src/Symfony/Component/Form/Extension/Core/Type/{TelType.php => TelephoneType.php} (93%) 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 2a0dd466bbc81..181bd4cdd7d0b 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 @@ -239,6 +239,16 @@ {{ block('button_widget') }} {%- endblock reset_widget -%} +{%- block telephone_widget -%} + {%- set type = type|default('tel') -%} + {{ block('form_widget_simple') }} +{%- endblock telephone_widget -%} + +{%- block color_widget -%} + {%- set type = type|default('color') -%} + {{ block('form_widget_simple') }} +{%- endblock color_widget -%} + {# Labels #} {%- block form_label -%} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php new file mode 100644 index 0000000000000..af32be69c6a51 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php @@ -0,0 +1 @@ +block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'color')) ?> diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/telephone_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/telephone_widget.html.php new file mode 100644 index 0000000000000..cede67ba5ff8b --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/telephone_widget.html.php @@ -0,0 +1 @@ +block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'tel')) ?> diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php index 857792ad9f066..77e3249990952 100644 --- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php +++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php @@ -77,7 +77,7 @@ protected function loadTypes() new Type\SubmitType(), new Type\ResetType(), new Type\CurrencyType(), - new Type\TelType(), + new Type\TelephoneType(), new Type\ColorType(), ); } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php b/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php similarity index 93% rename from src/Symfony/Component/Form/Extension/Core/Type/TelType.php rename to src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php index 2533c7e47f976..8b41a3901e2a5 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php @@ -13,7 +13,7 @@ use Symfony\Component\Form\AbstractType; -class TelType extends AbstractType +class TelephoneType extends AbstractType { /** * {@inheritdoc} diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php index 6415d7f4a9096..1a3ea3bb6fbf3 100644 --- a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php @@ -2472,7 +2472,7 @@ public function testButtonAttributeNameRepeatedIfTrue() public function testTel() { $tel = '0102030405'; - $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel); + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelephoneType', $tel); $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')), '/input diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php index 98d2d48cbe360..8582d3b75a0ea 100644 --- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php @@ -2467,7 +2467,7 @@ public function testAttributesNotTranslatedWhenTranslationDomainIsFalse() public function testTel() { $tel = '0102030405'; - $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel); + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelephoneType', $tel); $this->assertWidgetMatchesXpath($form->createView(), array(), '/input From 081e64eb6609e0aba1ce7d85cd78b829b85173eb Mon Sep 17 00:00:00 2001 From: apetitpa Date: Tue, 9 May 2017 17:10:23 +0200 Subject: [PATCH 08/11] fix block prefix --- .../Component/Form/Extension/Core/Type/TelephoneType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php index 8b41a3901e2a5..1628d382a4854 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php @@ -28,6 +28,6 @@ public function getParent() */ public function getBlockPrefix() { - return 'tel'; + return 'telephone'; } } From 3c14d320876401b0b76efd1572f3b2a0812d7cd1 Mon Sep 17 00:00:00 2001 From: apetitpa Date: Tue, 9 May 2017 18:04:40 +0200 Subject: [PATCH 09/11] update minimum version required --- src/Symfony/Component/Form/composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 77fc3e565ffa7..4106c65890aa2 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -39,9 +39,9 @@ "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", "symfony/dependency-injection": "<3.3", "symfony/doctrine-bridge": "<2.7", - "symfony/framework-bundle": "<2.7", + "symfony/framework-bundle": "<3.4", "symfony/http-kernel": "<3.3.5", - "symfony/twig-bridge": "<2.7" + "symfony/twig-bridge": "<3.4" }, "suggest": { "symfony/validator": "For form validation.", From 3c5f3ebe5ac6f1ca6b9783d714b271129a92fde2 Mon Sep 17 00:00:00 2001 From: apetitpa Date: Wed, 10 May 2017 09:23:01 +0200 Subject: [PATCH 10/11] use class reference --- src/Symfony/Component/Form/Extension/Core/Type/ColorType.php | 2 +- .../Component/Form/Extension/Core/Type/TelephoneType.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php index 5bfe484f9b82a..9c2734ead6f40 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php @@ -20,7 +20,7 @@ class ColorType extends AbstractType */ public function getParent() { - return __NAMESPACE__.'\TextType'; + return TextType::class; } /** diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php index 1628d382a4854..9c49b43024e81 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php @@ -20,7 +20,7 @@ class TelephoneType extends AbstractType */ public function getParent() { - return __NAMESPACE__.'\TextType'; + return TextType::class; } /** From e26e0cacdf03916546e656ec3a789f3a1ab275e6 Mon Sep 17 00:00:00 2001 From: apetitpa Date: Mon, 2 Oct 2017 00:31:12 +0200 Subject: [PATCH 11/11] rename and fix tests --- .../Resources/views/Form/form_div_layout.html.twig | 4 ++-- .../Resources/views/Form/color_widget.html.php | 2 +- ...telephone_widget.html.php => tel_widget.html.php} | 2 +- .../Component/Form/Extension/Core/CoreExtension.php | 2 +- .../Core/Type/{TelephoneType.php => TelType.php} | 4 ++-- .../Form/Tests/AbstractBootstrap3LayoutTest.php | 2 +- .../Component/Form/Tests/AbstractLayoutTest.php | 2 +- .../Form/Tests/Fixtures/Descriptor/defaults_1.json | 2 ++ .../Form/Tests/Fixtures/Descriptor/defaults_1.txt | 12 ++++++------ 9 files changed, 17 insertions(+), 15 deletions(-) rename src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/{telephone_widget.html.php => tel_widget.html.php} (57%) rename src/Symfony/Component/Form/Extension/Core/Type/{TelephoneType.php => TelType.php} (88%) 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 181bd4cdd7d0b..52525c061ccba 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 @@ -239,10 +239,10 @@ {{ block('button_widget') }} {%- endblock reset_widget -%} -{%- block telephone_widget -%} +{%- block tel_widget -%} {%- set type = type|default('tel') -%} {{ block('form_widget_simple') }} -{%- endblock telephone_widget -%} +{%- endblock tel_widget -%} {%- block color_widget -%} {%- set type = type|default('color') -%} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php index af32be69c6a51..10a8cdf14930e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php @@ -1 +1 @@ -block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'color')) ?> +block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'color')); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/telephone_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php similarity index 57% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/telephone_widget.html.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php index cede67ba5ff8b..7779538127026 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/telephone_widget.html.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php @@ -1 +1 @@ -block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'tel')) ?> +block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'tel')); diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php index 77e3249990952..857792ad9f066 100644 --- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php +++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php @@ -77,7 +77,7 @@ protected function loadTypes() new Type\SubmitType(), new Type\ResetType(), new Type\CurrencyType(), - new Type\TelephoneType(), + new Type\TelType(), new Type\ColorType(), ); } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php similarity index 88% rename from src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php rename to src/Symfony/Component/Form/Extension/Core/Type/TelType.php index 9c49b43024e81..de74a3ed3721d 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TelephoneType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php @@ -13,7 +13,7 @@ use Symfony\Component\Form\AbstractType; -class TelephoneType extends AbstractType +class TelType extends AbstractType { /** * {@inheritdoc} @@ -28,6 +28,6 @@ public function getParent() */ public function getBlockPrefix() { - return 'telephone'; + return 'tel'; } } diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php index 1a3ea3bb6fbf3..6415d7f4a9096 100644 --- a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php @@ -2472,7 +2472,7 @@ public function testButtonAttributeNameRepeatedIfTrue() public function testTel() { $tel = '0102030405'; - $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelephoneType', $tel); + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel); $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')), '/input diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php index 8582d3b75a0ea..98d2d48cbe360 100644 --- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php @@ -2467,7 +2467,7 @@ public function testAttributesNotTranslatedWhenTranslationDomainIsFalse() public function testTel() { $tel = '0102030405'; - $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelephoneType', $tel); + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel); $this->assertWidgetMatchesXpath($form->createView(), array(), '/input diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json index 565c17601ed1e..99858a2f997e8 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.json @@ -5,6 +5,7 @@ "Symfony\\Component\\Form\\Extension\\Core\\Type\\CheckboxType", "Symfony\\Component\\Form\\Extension\\Core\\Type\\ChoiceType", "Symfony\\Component\\Form\\Extension\\Core\\Type\\CollectionType", + "Symfony\\Component\\Form\\Extension\\Core\\Type\\ColorType", "Symfony\\Component\\Form\\Extension\\Core\\Type\\CountryType", "Symfony\\Component\\Form\\Extension\\Core\\Type\\CurrencyType", "Symfony\\Component\\Form\\Extension\\Core\\Type\\DateIntervalType", @@ -27,6 +28,7 @@ "Symfony\\Component\\Form\\Extension\\Core\\Type\\ResetType", "Symfony\\Component\\Form\\Extension\\Core\\Type\\SearchType", "Symfony\\Component\\Form\\Extension\\Core\\Type\\SubmitType", + "Symfony\\Component\\Form\\Extension\\Core\\Type\\TelType", "Symfony\\Component\\Form\\Extension\\Core\\Type\\TextType", "Symfony\\Component\\Form\\Extension\\Core\\Type\\TextareaType", "Symfony\\Component\\Form\\Extension\\Core\\Type\\TimeType", diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt index dd08d5f7a64c3..52a579ac43e62 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/defaults_1.txt @@ -3,12 +3,12 @@ ---------------------------------------------------------------- BirthdayType, ButtonType, CheckboxType, ChoiceType, CollectionType - CountryType, CurrencyType, DateIntervalType, DateTimeType, DateType - EmailType, FileType, FormType, HiddenType, IntegerType - LanguageType, LocaleType, MoneyType, NumberType, PasswordType - PercentType, RadioType, RangeType, RepeatedType, ResetType - SearchType, SubmitType, TextType, TextareaType, TimeType - TimezoneType, UrlType + ColorType, CountryType, CurrencyType, DateIntervalType, DateTimeType + DateType, EmailType, FileType, FormType, HiddenType + IntegerType, LanguageType, LocaleType, MoneyType, NumberType + PasswordType, PercentType, RadioType, RangeType, RepeatedType + ResetType, SearchType, SubmitType, TelType, TextType + TextareaType, TimeType, TimezoneType, UrlType Service form types ------------------