Skip to content

Commit b4eeb6b

Browse files
committed
removed HHVM support
1 parent 87193b5 commit b4eeb6b

File tree

3 files changed

+8
-27
lines changed

3 files changed

+8
-27
lines changed

Tests/Data/Bundle/Reader/IntlBundleReaderTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ public function testReadFollowsAlias()
5151

5252
public function testReadDoesNotFollowFallback()
5353
{
54-
if (defined('HHVM_VERSION')) {
55-
$this->markTestSkipped('ResourceBundle does not support disabling fallback properly on HHVM.');
56-
}
57-
5854
// "ro_MD" -> "ro"
5955
$data = $this->reader->read(__DIR__.'/Fixtures/res', 'ro_MD');
6056

@@ -67,10 +63,6 @@ public function testReadDoesNotFollowFallback()
6763

6864
public function testReadDoesNotFollowFallbackAlias()
6965
{
70-
if (defined('HHVM_VERSION')) {
71-
$this->markTestSkipped('ResourceBundle does not support disabling fallback properly on HHVM.');
72-
}
73-
7466
// "mo" = "ro_MD" -> "ro"
7567
$data = $this->reader->read(__DIR__.'/Fixtures/res', 'mo');
7668

Tests/DateFormatter/AbstractIntlDateFormatterTest.php

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ public function testFormatTimezone($pattern, $timezone, $expected)
326326

327327
public function formatTimezoneProvider()
328328
{
329-
$cases = array(
329+
return array(
330330
array('z', 'GMT', 'GMT'),
331331
array('zz', 'GMT', 'GMT'),
332332
array('zzz', 'GMT', 'GMT'),
@@ -365,20 +365,13 @@ public function formatTimezoneProvider()
365365
array('zzzzz', 'Etc/Zulu', 'Coordinated Universal Time'),
366366
array('zzzzz', 'Etc/UCT', 'Coordinated Universal Time'),
367367
array('zzzzz', 'Etc/Greenwich', 'Greenwich Mean Time'),
368-
);
369-
370-
if (!defined('HHVM_VERSION')) {
371-
// these timezones are not considered valid in HHVM
372-
$cases = array_merge($cases, array(
373-
array('z', 'GMT+03:00', 'GMT+3'),
374-
array('zz', 'GMT+03:00', 'GMT+3'),
375-
array('zzz', 'GMT+03:00', 'GMT+3'),
376-
array('zzzz', 'GMT+03:00', 'GMT+03:00'),
377-
array('zzzzz', 'GMT+03:00', 'GMT+03:00'),
378-
));
379-
}
380368

381-
return $cases;
369+
array('z', 'GMT+03:00', 'GMT+3'),
370+
array('zz', 'GMT+03:00', 'GMT+3'),
371+
array('zzz', 'GMT+03:00', 'GMT+3'),
372+
array('zzzz', 'GMT+03:00', 'GMT+03:00'),
373+
array('zzzzz', 'GMT+03:00', 'GMT+03:00'),
374+
);
382375
}
383376

384377
public function testFormatWithGmtTimezone()
@@ -428,10 +421,6 @@ public function testFormatWithDateTimeZoneGmt()
428421

429422
public function testFormatWithDateTimeZoneGmtOffset()
430423
{
431-
if (defined('HHVM_VERSION_ID')) {
432-
$this->markTestSkipped('See https://github.com/facebook/hhvm/issues/5875');
433-
}
434-
435424
$formatter = $this->getDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, new \DateTimeZone('GMT+03:00'), IntlDateFormatter::GREGORIAN, 'zzzz');
436425

437426
$this->assertEquals('GMT+03:00', $formatter->format(0));

Util/IntlTestHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static function requireIntl(TestCase $testCase, $minimumIcuVersion = null
4242
// * the intl extension is loaded with version Intl::getIcuStubVersion()
4343
// * the intl extension is not loaded
4444

45-
if (($minimumIcuVersion || defined('HHVM_VERSION_ID')) && IcuVersion::compare(Intl::getIcuVersion(), $minimumIcuVersion, '<', 1)) {
45+
if ($minimumIcuVersion && IcuVersion::compare(Intl::getIcuVersion(), $minimumIcuVersion, '<', 1)) {
4646
$testCase->markTestSkipped('ICU version '.$minimumIcuVersion.' is required.');
4747
}
4848

0 commit comments

Comments
 (0)