Merge branch 'PHP-5.5'

weltling · weltling · commit 77303a324815 · 2013-08-23T16:41:02.000+02:00
* PHP-5.5:
  ensure the test doesn't fail because of tz warning
diff --git a/ext/date/tests/bug65184.phpt b/ext/date/tests/bug65184.phpt
@@ -6,6 +6,8 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
     die("skip Test is valid for Windows");
 }
 ?>
+--INI--
+date.timezone = UTC
 --FILE--
 <?php
 	setlocale(LC_ALL, 'Japanese_Japan.932');

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {`
`6`	`6`	`die("skip Test is valid for Windows");`
`7`	`7`	`}`
`8`	`8`	`?>`
	`9`	`+--INI--`
	`10`	`+date.timezone = UTC`
`9`	`11`	`--FILE--`
`10`	`12`	`<?php`
`11`	`13`	`setlocale(LC_ALL, 'Japanese_Japan.932');`