summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-10-10 11:06:34 +0200
committerAnatoliy Belsky <ab@php.net>2012-10-10 11:06:34 +0200
commite70aed5c743f0f86de906af2199dd0e07d007956 (patch)
tree0c354617380433504bd6c757efc6b5abb2ac5a71
parent4e5e8c9da093f9237d2a71a7442e94a2a22f370a (diff)
parent674ccefc2d74c1ca145ca713cce7da92c1b591ed (diff)
downloadphp-git-e70aed5c743f0f86de906af2199dd0e07d007956.tar.gz
Merge branch 'PHP-5.4'
* PHP-5.4: Fix warnings preventing this test from passing
-rw-r--r--ext/date/tests/bug62896.phpt2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/date/tests/bug62896.phpt b/ext/date/tests/bug62896.phpt
index 7584546b5a..ccdcfb029c 100644
--- a/ext/date/tests/bug62896.phpt
+++ b/ext/date/tests/bug62896.phpt
@@ -1,5 +1,7 @@
--TEST--
Bug #62896 Unixtimestamp may take on local times DST flag (this test will only be valid during CEST)
+--INI--
+date.timezone=Europe/Berlin
--FILE--
<?php
$tz = new DateTimeZone('Europe/Berlin');