-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[Intl] Fix test #15672
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Intl] Fix test #15672
Conversation
nicolas-grekas
commented
Sep 2, 2015
Q | A |
---|---|
Bug fix? | no |
New feature? | no |
BC breaks? | no |
Deprecations? | no |
Tests pass? | yes |
Fixed tickets | - |
License | MIT |
Doc PR | - |
👍 |
1 similar comment
👍 |
@@ -398,8 +398,8 @@ public function testFormatWithDateTimeZone() | |||
$this->markTestSkipped('Only in PHP 5.5+ IntlDateFormatter allows to use DateTimeZone objects.'); | |||
} | |||
|
|||
if (defined('HHVM_VERSION_ID')) { | |||
$this->markTestSkipped('This test cannot work on HHVM. See https://github.com/facebook/hhvm/issues/5875 for the issue.'); | |||
if (defined('HHVM_VERSION_ID') || PHP_VERSION_ID <= 50509) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the PHP_VERSION_ID check is actually 3 lines above. Just update it with the right version (I thought it was 5.5.0+)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd prefer keeping it this way to easy future merge in master
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(and also because the reason message is not the same)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, currently, we have 2 different skipping messages: 1 for PHP saying it needs PHP 5.5.10+ (assuming it gets fixes), and the other one for HHVM linking to the HHVM issue.
It makes more sense to use keep the PHP check in a single place rather than 2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah indeed. For PHP 5.4, we talk about IntlDateFormatter features, not about DateTimeZone limitations. So I agree about keeping like that
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I slitted the test in two, one with the GMT offset, an other with GMT
87a9740
to
52ef0bc
Compare
52ef0bc
to
7969503
Compare
Thank you @nicolas-grekas. |
This PR was merged into the 2.3 branch. Discussion ---------- [Intl] Fix test | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 7969503 [Intl] Fix test