diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature #16727 [Form] remove deprecated getTimezones() method (xabbuh)

Browse Source 
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Form] remove deprecated getTimezones() method

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

4a2aea0 [Form] remove deprecated getTimezones() method
This commit is contained in:
Fabien Potencier 2015-11-28 16:38:52 +01:00
commit 4e1effeb23
1 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
View File

@ -23,20 +23,13 @@ class TimezoneType extends AbstractType
*/
private static $timezones;
/**
* Stores the available timezone choices.
*
* @var array
*/
private static $flippedTimezones;
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
'choices' => self::getFlippedTimezones(),
'choices' => self::getTimezones(),
'choice_translation_domain' => false,
));
}
@ -66,48 +59,8 @@ class TimezoneType extends AbstractType
* overhead.
*
* @return array The timezone choices
*
* @deprecated Deprecated since version 2.8
*/
public static function getTimezones()
{
@trigger_error('The TimezoneType::getTimezones() method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
if (null === static::$timezones) {
static::$timezones = array();
foreach (\DateTimeZone::listIdentifiers() as $timezone) {
$parts = explode('/', $timezone);
if (count($parts) > 2) {
$region = $parts[0];
$name = $parts[1].' - '.$parts[2];
} elseif (count($parts) > 1) {
$region = $parts[0];
$name = $parts[1];
} else {
$region = 'Other';
$name = $parts[0];
}
static::$timezones[$region][$timezone] = str_replace('_', ' ', $name);
}
}
return static::$timezones;
}
/**
* Returns the timezone choices.
*
* The choices are generated from the ICU function
* \DateTimeZone::listIdentifiers(). They are cached during a single request,
* so multiple timezone fields on the same page don't lead to unnecessary
* overhead.
*
* @return array The timezone choices
*/
private static function getFlippedTimezones()
private static function getTimezones()
{
if (null === self::$timezones) {
self::$timezones = array();