[2.7][Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323 #22996
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
d234130 to
214fa1b
Compare
| @@ -163,6 +163,10 @@ protected function getIntlDateFormatter($ignoreTimezone = false) | |||
| $dateFormat = $this->dateFormat; | |||
| $timeFormat = $this->timeFormat; | |||
| $timezone = $ignoreTimezone ? 'UTC' : $this->outputTimezone; | |||
| if (!defined('HHVM_VERSION') && PHP_VERSION_ID >= 50500) { | |||
There was a problem hiding this comment.
It looks like this could enhance portability:
if (class_exists('IntlTimeZone', false)) {
$timezone = \IntlTimeZone::createTimeZone($timezone)
}
| @@ -77,7 +77,8 @@ public function buildForm(FormBuilderInterface $builder, array $options) | |||
| \Locale::getDefault(), | |||
| $dateFormat, | |||
| $timeFormat, | |||
| null, | |||
| // see https://bugs.php.net/bug.php?id=66323 | |||
| defined('HHVM_VERSION') || PHP_VERSION_ID < 50500 ? null : new \DateTimeZone(date_default_timezone_get()), | |||
There was a problem hiding this comment.
class_exists('IntlTimeZone', false) ? \IntlTimeZone::createDefault() : null
214fa1b to
f42c73f
Compare
|
PR updated, comments addressed |
|
Thank you @romainneutron. |
nicolas-grekas
added a commit
that referenced
this pull request
Jun 1, 2017
…e to bypass PHP bug #66323 (romainneutron) This PR was merged into the 2.7 branch. Discussion ---------- [2.7][Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323 | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no <!-- don't forget updating src/**/CHANGELOG.md files --> | BC breaks? | no | Deprecations? | no <!-- don't forget updating UPGRADE-*.md files --> | Tests pass? | yes | Fixed tickets | N/A <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | N/A The issue is documented here. The current symfony code works when `intl.use_exception` is off. however, it's on on PHP 7+ and the issue is reproducible. See https://3v4l.org/PllP1 and https://3v4l.org/3XnKI Commits ------- f42c73f [Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323
This was referenced Jun 5, 2017
Merged
Merged
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The issue is documented here.
The current symfony code works when
intl.use_exceptionis off. however, it's on on PHP 7+ and the issue is reproducible. See https://3v4l.org/PllP1 and https://3v4l.org/3XnKI