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

merged branch jakzal/2.3-tests-on-php-5.5 (PR #8324) 

This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] Fixed tests failing on PHP 5.5 and removed this version from the allowed failures

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

69ec7c8 Removed PHP 5.5 from the allowed failures.
3492186 [Intl] Fixed tests failing on PHP 5.5
This commit is contained in:
Fabien Potencier 2013-06-23 09:01:37 +02:00
parent e01c6c22e8 69ec7c8363
commit fa42a90bd8
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -6,10 +6,6 @@ php:
- 5.4
- 5.5
matrix:
allow_failures:
- php: 5.5
before_script:
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'

21
src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
View File

@ -850,27 +850,16 @@ abstract class AbstractIntlDateFormatterTest extends \PHPUnit_Framework_TestCase
public function setTimeZoneIdProvider()
{
$data = array(
return array(
array('UTC', 'UTC'),
array('GMT', 'GMT'),
array('GMT-03:00', 'GMT-03:00'),
array('Europe/Zurich', 'Europe/Zurich'),
array('GMT-0300', 'GMT-0300'),
array('Foo/Bar', 'Foo/Bar'),
array('GMT+00:AA', 'GMT+00:AA'),
array('GMT+00AA', 'GMT+00AA'),
);
// When time zone not exists, uses UTC by default
if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
$data[] = array('GMT-0300', 'UTC');
$data[] = array('Foo/Bar', 'UTC');
$data[] = array('GMT+00:AA', 'UTC');
$data[] = array('GMT+00AA', 'UTC');
} else {
$data[] = array('GMT-0300', 'GMT-0300');
$data[] = array('Foo/Bar', 'Foo/Bar');
$data[] = array('GMT+00:AA', 'GMT+00:AA');
$data[] = array('GMT+00AA', 'GMT+00AA');
}
return $data;
}
protected function getDefaultDateFormatter($pattern = null)