[ci] Run minimal versions on appveyor only
This commit is contained in:
parent
6dac13bc20
commit
e564805b32
|
@ -10,7 +10,6 @@ addons:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- php: hhvm
|
- php: hhvm
|
||||||
- php: 5.3.3
|
|
||||||
- php: 5.3
|
- php: 5.3
|
||||||
- php: 5.4
|
- php: 5.4
|
||||||
- php: 5.5
|
- php: 5.5
|
||||||
|
|
14
appveyor.yml
14
appveyor.yml
|
@ -21,15 +21,17 @@ init:
|
||||||
install:
|
install:
|
||||||
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
|
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
|
||||||
- cd c:\php
|
- cd c:\php
|
||||||
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.4.43-nts-Win32-VC9-x86.zip
|
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.3.3-nts-Win32-VC9-x86.zip
|
||||||
- IF %PHP%==1 7z x php-5.4.43-nts-Win32-VC9-x86.zip -y > 7z.log
|
- IF %PHP%==1 7z x php-5.3.3-nts-Win32-VC9-x86.zip -y > 7z.log
|
||||||
- IF %PHP%==1 appveyor DownloadFile http://nebm.ist.utl.pt/~glopes/misc/intl_win/ICU-51.2-dlls.zip
|
- IF %PHP%==1 appveyor DownloadFile http://nebm.ist.utl.pt/~glopes/misc/intl_win/ICU-51.2-dlls.zip
|
||||||
- IF %PHP%==1 7z x ICU-51.2-dlls.zip -y > 7z.log
|
- IF %PHP%==1 7z x ICU-51.2-dlls.zip -y > 7z.log
|
||||||
- IF %PHP%==1 cd ext
|
- IF %PHP%==1 cd ext
|
||||||
- IF %PHP%==1 appveyor DownloadFile http://nebm.ist.utl.pt/~glopes/misc/intl_win/php_intl-3.0.0-5.4-nts-vc9-x86.zip
|
- IF %PHP%==1 appveyor DownloadFile http://nebm.ist.utl.pt/~glopes/misc/intl_win/php_intl-3.0.0-5.3-nts-vc9-x86.zip
|
||||||
- IF %PHP%==1 7z x php_intl-3.0.0-5.4-nts-vc9-x86.zip -y > 7z.log
|
- IF %PHP%==1 7z x php_intl-3.0.0-5.3-nts-vc9-x86.zip -y > 7z.log
|
||||||
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/apc/3.1.13/php_apc-3.1.13-5.4-nts-vc9-x86.zip
|
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/apc/3.1.13/php_apc-3.1.13-5.3-nts-vc9-x86.zip
|
||||||
- IF %PHP%==1 7z x php_apc-3.1.13-5.4-nts-vc9-x86.zip -y > 7z.log
|
- IF %PHP%==1 7z x php_apc-3.1.13-5.3-nts-vc9-x86.zip -y > 7z.log
|
||||||
|
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/memcache/3.0.8/php_memcache-3.0.8-5.3-nts-vc9-x86.zip
|
||||||
|
- IF %PHP%==1 7z x php_memcache-3.0.8-5.3-nts-vc9-x86.zip -y > 7z.log
|
||||||
- IF %PHP%==1 cd ..
|
- IF %PHP%==1 cd ..
|
||||||
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
|
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
|
||||||
- appveyor DownloadFile https://getcomposer.org/composer.phar
|
- appveyor DownloadFile https://getcomposer.org/composer.phar
|
||||||
|
|
|
@ -37,7 +37,8 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase
|
||||||
if ('\\' === DIRECTORY_SEPARATOR && null === self::$symlinkOnWindows) {
|
if ('\\' === DIRECTORY_SEPARATOR && null === self::$symlinkOnWindows) {
|
||||||
$target = tempnam(sys_get_temp_dir(), 'sl');
|
$target = tempnam(sys_get_temp_dir(), 'sl');
|
||||||
$link = sys_get_temp_dir().'/sl'.microtime(true).mt_rand();
|
$link = sys_get_temp_dir().'/sl'.microtime(true).mt_rand();
|
||||||
if (self::$symlinkOnWindows = @symlink($target, $link)) {
|
if (@symlink($target, $link)) {
|
||||||
|
self::$symlinkOnWindows = @is_link($link);
|
||||||
unlink($link);
|
unlink($link);
|
||||||
}
|
}
|
||||||
unlink($target);
|
unlink($target);
|
||||||
|
|
|
@ -210,14 +210,16 @@ class IntlDateFormatter
|
||||||
// behave like the intl extension
|
// behave like the intl extension
|
||||||
$argumentError = null;
|
$argumentError = null;
|
||||||
if (!is_int($timestamp)) {
|
if (!is_int($timestamp)) {
|
||||||
if (PHP_VERSION_ID < 50304) {
|
if (!$timestamp instanceof \DateTime) {
|
||||||
$argumentError = 'datefmt_format: takes either an array or an integer timestamp value ';
|
|
||||||
} elseif (!$timestamp instanceof \DateTime) {
|
|
||||||
$argumentError = 'datefmt_format: takes either an array or an integer timestamp value or a DateTime object';
|
|
||||||
if (PHP_VERSION_ID >= 50500 || (extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone'))) {
|
if (PHP_VERSION_ID >= 50500 || (extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone'))) {
|
||||||
$argumentError = sprintf('datefmt_format: string \'%s\' is not numeric, which would be required for it to be a valid date', $timestamp);
|
$argumentError = sprintf('datefmt_format: string \'%s\' is not numeric, which would be required for it to be a valid date', $timestamp);
|
||||||
|
} elseif (PHP_VERSION_ID >= 50304) {
|
||||||
|
$argumentError = 'datefmt_format: takes either an array or an integer timestamp value or a DateTime object';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (PHP_VERSION_ID < 50304 && null === $argumentError) {
|
||||||
|
$argumentError = 'datefmt_format: takes either an array or an integer timestamp value ';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (null !== $argumentError) {
|
if (null !== $argumentError) {
|
||||||
|
|
|
@ -824,7 +824,7 @@ class NumberFormatter
|
||||||
// The negative PHP_INT_MAX was being converted to float
|
// The negative PHP_INT_MAX was being converted to float
|
||||||
if (
|
if (
|
||||||
$value == self::$int32Range['negative'] &&
|
$value == self::$int32Range['negative'] &&
|
||||||
((PHP_VERSION_ID < 50400 && PHP_VERSION_ID >= 50314) || PHP_VERSION_ID >= 50404)
|
((PHP_VERSION_ID < 50400 && PHP_VERSION_ID >= 50314) || PHP_VERSION_ID >= 50404 || (extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone')))
|
||||||
) {
|
) {
|
||||||
return (int) $value;
|
return (int) $value;
|
||||||
}
|
}
|
||||||
|
@ -837,7 +837,8 @@ class NumberFormatter
|
||||||
// A 32 bit integer was being generated instead of a 64 bit integer
|
// A 32 bit integer was being generated instead of a 64 bit integer
|
||||||
if (
|
if (
|
||||||
($value > self::$int32Range['positive'] || $value < self::$int32Range['negative']) &&
|
($value > self::$int32Range['positive'] || $value < self::$int32Range['negative']) &&
|
||||||
(PHP_VERSION_ID < 50314 || (PHP_VERSION_ID >= 50400 && PHP_VERSION_ID < 50404))
|
(PHP_VERSION_ID < 50314 || (PHP_VERSION_ID >= 50400 && PHP_VERSION_ID < 50404)) &&
|
||||||
|
!(extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone'))
|
||||||
) {
|
) {
|
||||||
$value = (-2147483648 - ($value % -2147483648)) * ($value / abs($value));
|
$value = (-2147483648 - ($value % -2147483648)) * ($value / abs($value));
|
||||||
}
|
}
|
||||||
|
|
|
@ -590,7 +590,7 @@ abstract class AbstractNumberFormatterTest extends \PHPUnit_Framework_TestCase
|
||||||
|
|
||||||
// Bug #59597 was fixed on PHP 5.3.14 and 5.4.4
|
// Bug #59597 was fixed on PHP 5.3.14 and 5.4.4
|
||||||
// The negative PHP_INT_MAX was being converted to float
|
// The negative PHP_INT_MAX was being converted to float
|
||||||
if ((PHP_VERSION_ID < 50400 && PHP_VERSION_ID >= 50314) || PHP_VERSION_ID >= 50404) {
|
if ((PHP_VERSION_ID < 50400 && PHP_VERSION_ID >= 50314) || PHP_VERSION_ID >= 50404 || (extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone'))) {
|
||||||
$this->assertInternalType('int', $parsedValue);
|
$this->assertInternalType('int', $parsedValue);
|
||||||
} else {
|
} else {
|
||||||
$this->assertInternalType('float', $parsedValue);
|
$this->assertInternalType('float', $parsedValue);
|
||||||
|
|
|
@ -79,6 +79,10 @@ abstract class AbstractComparisonValidatorTestCase extends AbstractConstraintVal
|
||||||
// Make sure we have the correct version loaded
|
// Make sure we have the correct version loaded
|
||||||
if ($dirtyValue instanceof \DateTime) {
|
if ($dirtyValue instanceof \DateTime) {
|
||||||
IntlTestHelper::requireIntl($this);
|
IntlTestHelper::requireIntl($this);
|
||||||
|
|
||||||
|
if (PHP_VERSION_ID < 50304 && !(extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone'))) {
|
||||||
|
$this->markTestSkipped('Intl supports formatting DateTime objects since 5.3.4');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$constraint = $this->createConstraint(array('value' => $comparedValue));
|
$constraint = $this->createConstraint(array('value' => $comparedValue));
|
||||||
|
|
Reference in New Issue