From 5cb532d2deda430312a3ee2749031267bb63281f Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Sun, 14 Oct 2018 14:03:53 +0200 Subject: [PATCH] [Form] Deprecate TimezoneType regions option --- UPGRADE-4.2.md | 2 ++ UPGRADE-5.0.md | 2 ++ src/Symfony/Component/Form/CHANGELOG.md | 1 + .../Component/Form/Extension/Core/Type/TimezoneType.php | 3 ++- src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php | 2 +- .../Form/Tests/Extension/Core/Type/TimezoneTypeTest.php | 4 ++++ 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md index 4b1c481569dc3..9a78f891a929c 100644 --- a/UPGRADE-4.2.md +++ b/UPGRADE-4.2.md @@ -104,6 +104,8 @@ Form {% endfor %} ``` + * The `regions` option of the `TimezoneType` is deprecated. + HttpFoundation -------------- diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md index 59863eb8cc084..ade8f69f7c030 100644 --- a/UPGRADE-5.0.md +++ b/UPGRADE-5.0.md @@ -121,6 +121,8 @@ Form {% endfor %} ``` + * The `regions` option was removed from the `TimezoneType`. + FrameworkBundle --------------- diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md index d5e8cc7004b70..f1cbf0ba4f875 100644 --- a/src/Symfony/Component/Form/CHANGELOG.md +++ b/src/Symfony/Component/Form/CHANGELOG.md @@ -40,6 +40,7 @@ CHANGELOG * added a cause when a CSRF error has occurred * deprecated the `scale` option of the `IntegerType` * removed restriction on allowed HTTP methods + * deprecated the `regions` option of the `TimezoneType` 4.1.0 ----- diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php index fb548fd932dd1..b1a8a035516d2 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php @@ -37,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( 'choice_loader' => function (Options $options) { - $regions = $options['regions']; + $regions = $options->offsetGet('regions', false); return new CallbackChoiceLoader(function () use ($regions) { return self::getTimezones($regions); @@ -51,6 +51,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver->setAllowedValues('input', array('string', 'datetimezone')); $resolver->setAllowedTypes('regions', 'int'); + $resolver->setDeprecated('regions', 'The option "%name%" is deprecated since Symfony 4.2.'); } /** diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php index 0d5d85675b41e..cc549a4bec8c5 100644 --- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php +++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php @@ -45,7 +45,7 @@ public function testDebugDeprecatedDefaults() Built-in form types (Symfony\Component\Form\Extension\Core\Type) ---------------------------------------------------------------- - IntegerType + IntegerType, TimezoneType Service form types ------------------ diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php index 51578bd6ad298..de52a0284d61f 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php @@ -53,6 +53,10 @@ public function testDateTimeZoneInput() $this->assertEquals(array(new \DateTimeZone('Europe/Amsterdam'), new \DateTimeZone('Europe/Paris')), $form->getData()); } + /** + * @group legacy + * @expectedDeprecation The option "regions" is deprecated since Symfony 4.2. + */ public function testFilterByRegions() { $choices = $this->factory->create(static::TESTED_TYPE, null, array('regions' => \DateTimeZone::EUROPE)) 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