minor #9479 [Locale] fixed the failing test described in #9455 (andremaha)

fabpot · fabpot · commit 74201e01ce40 · 2013-11-14T06:54:51.000+01:00
This PR was merged into the 2.2 branch. Discussion ---------- [Locale] fixed the failing test described in #9455 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #9455 | License | MIT | Doc PR | - Commits ------- 3f91039 [Locale] fixed the failing test described in #9455
diff --git a/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php b/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php
@@ -503,18 +503,18 @@ public function testFormatWithGmtTimezoneIntl()
         $this->assertEquals('GMT+03:00', $formatter->format(0));
     }
 
-    public function testFormatWithDefaultTimezoneStub()
+    public function testFormatWithConstructorTimezoneStub()
     {
-        $formatter = new StubIntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT);
+        $formatter = new StubIntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT, 'UTC');
         $formatter->setPattern('yyyy-MM-dd HH:mm:ss');
 
         $this->assertEquals(
-            $this->createDateTime(0)->format('Y-m-d H:i:s'),
+            $this->createDateTime(0, 'UTC')->format('Y-m-d H:i:s'),
             $formatter->format(0)
         );
     }
 
-    public function testFormatWithDefaultTimezoneIntl()
+    public function testFormatWithConstructorTimezoneIntl()
     {
         $this->skipIfIntlExtensionIsNotLoaded();
         $this->skipIfICUVersionIsTooOld();
@@ -523,7 +523,7 @@ public function testFormatWithDefaultTimezoneIntl()
         $formatter->setPattern('yyyy-MM-dd HH:mm:ss');
 
         $this->assertEquals(
-            $this->createDateTime(0)->format('Y-m-d H:i:s'),
+            $this->createDateTime(0, 'UTC')->format('Y-m-d H:i:s'),
             $formatter->format(0)
         );
     }
@@ -541,7 +541,7 @@ public function testFormatWithDefaultTimezoneStubShouldUseTheTzEnvironmentVariab
         $formatter->setPattern('yyyy-MM-dd HH:mm:ss');
 
         $this->assertEquals(
-            $this->createDateTime(0)->format('Y-m-d H:i:s'),
+            $this->createDateTime(0, 'Europe/London')->format('Y-m-d H:i:s'),
             $formatter->format(0)
         );
 
@@ -564,7 +564,7 @@ public function testFormatWithDefaultTimezoneStubShouldUseDefaultDateTimeZoneVar
         $formatter->setPattern('yyyy-MM-dd HH:mm:ss');
 
         $this->assertEquals(
-            $this->createDateTime(0)->format('Y-m-d H:i:s'),
+            $this->createDateTime(0, 'Europe/London')->format('Y-m-d H:i:s'),
             $formatter->format(0)
         );
 
@@ -599,7 +599,7 @@ public function testFormatWithDefaultTimezoneIntlShouldUseTheTzEnvironmentVariab
         $this->assertEquals('Europe/Paris', getenv('TZ'));
 
         $this->assertEquals(
-            $this->createDateTime(0)->format('Y-m-d H:i:s'),
+            $this->createDateTime(0, 'Europe/Paris')->format('Y-m-d H:i:s'),
             $formatter->format(0)
         );
 
@@ -628,7 +628,7 @@ public function testFormatWithDefaultTimezoneIntlShouldUseDefaultDateTimeZoneVar
         $this->assertEquals('Europe/Paris', date_default_timezone_get());
 
         $this->assertEquals(
-            $this->createDateTime(0)->format('Y-m-d H:i:s'),
+            $this->createDateTime(0, 'Europe/Paris')->format('Y-m-d H:i:s'),
             $formatter->format(0)
         );
 
@@ -1223,13 +1223,8 @@ protected function createIntlFormatter($pattern = null)
         return new \IntlDateFormatter('en', \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, 'UTC', \IntlDateFormatter::GREGORIAN, $pattern);
     }
 
-    protected function createDateTime($timestamp = null)
+    protected function createDateTime($timestamp, $timeZone)
     {
-        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
-            $timeZone = date_default_timezone_get();
-        } else {
-            $timeZone = getenv('TZ') ?: 'UTC';
-        }
 
         $dateTime = new \DateTime();
         $dateTime->setTimestamp(null === $timestamp ? time() : $timestamp);
