[ci] Testing with UTC hides bugs

nicolas-grekas · nicolas-grekas · commit 05c58804a13e · 2016-11-17T11:46:13.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -47,6 +47,7 @@ before_install:
     # A sigchild-enabled-PHP is used to test the Process component on the lowest PHP matrix line
     - if [[ ! $deps && $PHP = ${MIN_PHP%.*} && ! -d php-$MIN_PHP/sapi ]]; then wget http://museum.php.net/php5/php-$MIN_PHP.tar.bz2 -O - | tar -xj; (cd php-$MIN_PHP; ./configure --enable-sigchild --enable-pcntl; make -j2); fi
     - if [[ ! $PHP = hhvm* ]]; then INI_FILE=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; else INI_FILE=/etc/hhvm/php.ini; fi
+    - if [[ ! $skip ]]; then echo date.timezone = Europe/Paris >> $INI_FILE; fi
     - if [[ ! $skip ]]; then echo memory_limit = -1 >> $INI_FILE; fi
     - if [[ ! $skip ]]; then echo session.gc_probability = 0 >> $INI_FILE; fi
     - if [[ ! $skip && $PHP = 5.* ]]; then echo extension = mongo.so >> $INI_FILE; fi
diff --git a/appveyor.yml b/appveyor.yml
@@ -33,7 +33,7 @@ install:
     - cd ..
     - copy /Y php.ini-development php.ini-min
     - echo max_execution_time=1200 >> php.ini-min
-    - echo date.timezone="UTC" >> php.ini-min
+    - echo date.timezone="America/Los_Angeles" >> php.ini-min
     - echo extension_dir=ext >> php.ini-min
     - copy /Y php.ini-min php.ini-max
     - echo extension=php_openssl.dll >> php.ini-max
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
@@ -908,9 +908,7 @@ protected function getDateTime($timestamp, $timeZone)
     {
         $dateTime = new \DateTime();
         $dateTime->setTimestamp(null === $timestamp ? time() : $timestamp);
-        if (null !== $timeZone) {
-            $dateTime->setTimezone(new \DateTimeZone($timeZone));
-        }
+        $dateTime->setTimezone(new \DateTimeZone($timeZone ?: date_default_timezone_get()));
 
         return $dateTime;
     }

Original file line number	Diff line number	Diff line change
`@@ -908,9 +908,7 @@ protected function getDateTime($timestamp, $timeZone)`
`908`	`908`	`{`
`909`	`909`	`$dateTime = new \DateTime();`
`910`	`910`	`$dateTime->setTimestamp(null === $timestamp ? time() : $timestamp);`
`911`		`- if (null !== $timeZone) {`
`912`		`- $dateTime->setTimezone(new \DateTimeZone($timeZone));`
`913`		`- }`
	`911`	`+ $dateTime->setTimezone(new \DateTimeZone($timeZone ?: date_default_timezone_get()));`
`914`	`912`
`915`	`913`	`return $dateTime;`
`916`	`914`	`}`