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

Fix version_compare() calls for PHP 5.5.

Browse Source 
Until PHP 5.5 hits beta, the version number for Git builds is still 5.5.0-dev,
which is less than 5.5.0alpha1 according to version_compare(). This means that
the branches for 5.5 aren't being executed on 5.5 snapshots at present.
This commit is contained in:
Adam Harvey 2013-01-10 12:41:59 +08:00
parent 34def9f94f
commit 4991607f00
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Form/Extension/Core/Type/DateType.php
View File

@ -263,7 +263,7 @@ class DateType extends AbstractType
$pattern = $formatter->getPattern();
$timezone = $formatter->getTimezoneId();
if (version_compare(\PHP_VERSION, '5.5.0alpha1', '>=')) {
if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) {
$formatter->setTimeZone(\DateTimeZone::UTC);
} else {
$formatter->setTimeZoneId(\DateTimeZone::UTC);
@ -281,7 +281,7 @@ class DateType extends AbstractType
$formatter->setPattern($pattern);
}
if (version_compare(\PHP_VERSION, '5.5.0alpha1', '>=')) {
if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) {
$formatter->setTimeZone($timezone);
} else {
$formatter->setTimeZoneId($timezone);

6
src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php
View File

@ -188,7 +188,7 @@ class StubIntlDateFormatter
$argumentError = 'datefmt_format: takes either an array or an integer timestamp value ';
} elseif (version_compare(\PHP_VERSION, '5.3.4', '>=') && !is_int($timestamp) && !$timestamp instanceof \DateTime) {
$argumentError = 'datefmt_format: takes either an array or an integer timestamp value or a DateTime object';
if (version_compare(\PHP_VERSION, '5.5.0alpha1', '>=') && !is_int($timestamp)) {
if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=') && !is_int($timestamp)) {
$argumentError = sprintf('datefmt_format: string \'%s\' is not numeric, which would be required for it to be a valid date', $timestamp);
}
}
@ -349,7 +349,7 @@ class StubIntlDateFormatter
}
// In PHP 5.5 default timezone depends on `date_default_timezone_get()` method
if (version_compare(\PHP_VERSION, '5.5.0alpha1', '>=')) {
if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) {
return date_default_timezone_get();
}
@ -511,7 +511,7 @@ class StubIntlDateFormatter
{
if (null === $timeZoneId) {
// In PHP 5.5 if $timeZoneId is null it fallbacks to `date_default_timezone_get()` method
if (version_compare(\PHP_VERSION, '5.5.0alpha1', '>=')) {
if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) {
$timeZoneId = date_default_timezone_get();
} else {
// TODO: changes were made to ext/intl in PHP 5.4.4 release that need to be investigated since it will

36
src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php
View File

@ -43,7 +43,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
$formatter = new StubIntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT);
// In PHP 5.5 default timezone depends on `date_default_timezone_get()` method
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$this->assertEquals(date_default_timezone_get(), $formatter->getTimeZoneId());
} else {
$this->assertNull($formatter->getTimeZoneId());
@ -56,7 +56,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
$formatter = new \IntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT);
// In PHP 5.5 default timezone depends on `date_default_timezone_get()` method
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$this->assertEquals(date_default_timezone_get(), $formatter->getTimeZoneId());
} else {
$this->assertNull($formatter->getTimeZoneId());
@ -367,7 +367,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
public function formatErrorProvider()
{
// With PHP 5.5 IntlDateFormatter accepts empty values ('0')
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
return array(
array('y-M-d', 'foobar', 'datefmt_format: string \'foobar\' is not numeric, which would be required for it to be a valid date: U_ILLEGAL_ARGUMENT_ERROR')
);
@ -435,7 +435,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
);
// As of PHP 5.5, intl ext no longer fallbacks invalid time zones to UTC
if (!$this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if (!$this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
// When time zone not exists, uses UTC by default
$data[] = array(0, 'Foo/Bar', '1970-01-01 00:00:00');
$data[] = array(0, 'UTC+04:30', '1970-01-01 00:00:00');
@ -452,7 +452,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
{
$formatter = $this->createStubFormatter('zzzz');
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$formatter->setTimeZone('Pacific/Fiji');
} else {
$formatter->setTimeZoneId('Pacific/Fiji');
@ -466,7 +466,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
$this->skipIfIntlExtensionIsNotLoaded();
$formatter = $this->createIntlFormatter('zzzz');
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$formatter->setTimeZone('Pacific/Fiji');
} else {
$formatter->setTimeZoneId('Pacific/Fiji');
@ -480,7 +480,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
{
$formatter = $this->createStubFormatter('zzzz');
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$formatter->setTimeZone('GMT+03:00');
} else {
$formatter->setTimeZoneId('GMT+03:00');
@ -494,7 +494,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
$this->skipIfIntlExtensionIsNotLoaded();
$formatter = $this->createIntlFormatter('zzzz');
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$formatter->setTimeZone('GMT+03:00');
} else {
$formatter->setTimeZoneId('GMT+03:00');
@ -530,7 +530,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
public function testFormatWithDefaultTimezoneStubShouldUseTheTzEnvironmentVariableWhenAvailable()
{
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$this->markTestSkipped('StubIntlDateFormatter in PHP 5.5 no longer depends on TZ environment.');
}
@ -553,7 +553,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
public function testFormatWithDefaultTimezoneStubShouldUseDefaultDateTimeZoneVariable()
{
if (!$this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if (!$this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$this->markTestSkipped('Only in PHP 5.5 StubIntlDateFormatter depends on default timezone (`date_default_timezone_get()`).');
}
@ -583,7 +583,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
*/
public function testFormatWithDefaultTimezoneIntlShouldUseTheTzEnvironmentVariableWhenAvailable()
{
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$this->markTestSkipped('IntlDateFormatter in PHP 5.5 no longer depends on TZ environment.');
}
@ -612,7 +612,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
*/
public function testFormatWithDefaultTimezoneIntlShouldUseDefaultDateTimeZoneVariable()
{
if (!$this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if (!$this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$this->markTestSkipped('Only in PHP 5.5 IntlDateFormatter depends on default timezone (`date_default_timezone_get()`).');
}
@ -1131,7 +1131,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
{
$formatter = $this->createStubFormatter();
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$formatter->setTimeZone($timeZoneId);
} else {
$formatter->setTimeZoneId($timeZoneId);
@ -1148,7 +1148,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
$this->skipIfIntlExtensionIsNotLoaded();
$formatter = $this->createIntlFormatter();
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$formatter->setTimeZone($timeZoneId);
} else {
$formatter->setTimeZoneId($timeZoneId);
@ -1167,7 +1167,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
);
// When time zone not exists, uses UTC by default
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$data[] = array('GMT-0300', 'UTC');
$data[] = array('Foo/Bar', 'UTC');
$data[] = array('GMT+00:AA', 'UTC');
@ -1189,7 +1189,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
{
$formatter = $this->createStubFormatter();
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$formatter->setTimeZone('GMT+00:30');
} else {
$formatter->setTimeZoneId('GMT+00:30');
@ -1201,7 +1201,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
$this->skipIfIntlExtensionIsNotLoaded();
$formatter = $this->createIntlFormatter();
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$formatter->setTimeZone('GMT+00:30');
} else {
$formatter->setTimeZoneId('GMT+00:30');
@ -1228,7 +1228,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
protected function createDateTime($timestamp = null)
{
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0alpha1')) {
if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
$timeZone = date_default_timezone_get();
} else {
$timeZone = getenv('TZ') ?: 'UTC';