summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-08-20 14:43:22 -0700
committerStanislav Malyshev <stas@php.net>2014-08-20 14:43:22 -0700
commit2dfabd8b5125f6b114ac43cc4850f1dffcb4af84 (patch)
tree7c8347ad27c6ec6d1894efb8806095f0ba037001
parent42e1df9b01fb47fb881d05d12d3887a1195729be (diff)
parent6424bf659dc912efba120ea58c04898adfa751f4 (diff)
downloadphp-git-2dfabd8b5125f6b114ac43cc4850f1dffcb4af84.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fix test
-rw-r--r--ext/date/tests/bug67109.phpt16
1 files changed, 9 insertions, 7 deletions
diff --git a/ext/date/tests/bug67109.phpt b/ext/date/tests/bug67109.phpt
index bcdacb038c..a36bb98bb0 100644
--- a/ext/date/tests/bug67109.phpt
+++ b/ext/date/tests/bug67109.phpt
@@ -1,12 +1,14 @@
--TEST--
Bug #67109 (First uppercase letter breaks date string parsing)
+--INI--
+date.timezone=UTC
--FILE--
<?php
-var_dump(date('d.m.Y',strtotime('last day of this month')));
-var_dump(date('d.m.Y',strtotime('Last day of this month')));
-var_dump(date('d.m.Y',strtotime('lAst Day of This Month')));
+var_dump(date('d.m.Y',strtotime('last day of april')));
+var_dump(date('d.m.Y',strtotime('Last day of april')));
+var_dump(date('d.m.Y',strtotime('lAst Day of April')));
?>
---EXPECT--
-string(10) "31.08.2014"
-string(10) "31.08.2014"
-string(10) "31.08.2014"
+--EXPECTF--
+string(10) "30.04.%d"
+string(10) "30.04.%d"
+string(10) "30.04.%d"