Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: fix test for 5.4/5.5
12 years ago · b16950b5d3
1 changed files with 2 additions and 2 deletions
--- a/ext/date/tests/bug67118_2.phpt
+++ b/ext/date/tests/bug67118_2.phpt
@ -26,10 +26,10 @@ First try
 Second try
 object(Foo)#1 (3) {
  ["date"]=>
-  string(26) "2007-09-12 15:49:12.000000"
+  string(%d) "2007-09-12 15:49:%s"
  ["timezone_type"]=>
  int(3)
  ["timezone"]=>
  string(3) "UTC"
 }
-Done
+Done