From 8ae773b4864c7fdd2902c657e8598d9350ca4e6f Mon Sep 17 00:00:00 2001 From: Joseph Bielawski Date: Thu, 20 Dec 2012 22:10:24 +0100 Subject: [PATCH] [Form] Fix failing `MonthChoiceList` in PHP 5.5 --- .../Extension/Core/ChoiceList/MonthChoiceList.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php index 0d2e10e840df..477cb6e4e1d6 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php @@ -39,7 +39,11 @@ protected function load() $pattern = $this->formatter->getPattern(); $timezone = $this->formatter->getTimezoneId(); - $this->formatter->setTimezoneId('UTC'); + if (version_compare(phpversion(), '5.5.0alpha1', '<')) { + $this->formatter->setTimezoneId('UTC'); + } else { + $this->formatter->setTimezone('UTC'); + } if (preg_match('/M+/', $pattern, $matches)) { $this->formatter->setPattern($matches[0]); @@ -53,6 +57,10 @@ protected function load() $this->formatter->setPattern($pattern); } - $this->formatter->setTimezoneId($timezone); + if (version_compare(phpversion(), '5.5.0alpha1', '<')) { + $this->formatter->setTimezoneId($timezone); + } else { + $this->formatter->setTimezone($timezone); + } } }