- Fixed test case for #54851.

- Make test case for #32555 the same for all branches.

diff --git a/ext/date/tests/bug32555.phpt b/ext/date/tests/bug32555.phpt
index 31fafbfd48777bbb3ca0c95ac43bea3519387b68..fca34ffa1913f8071a2894b74cd49f2bc943d1be 100644 (file)
--- a/ext/date/tests/bug32555.phpt
+++ b/ext/date/tests/bug32555.phpt
@@ -8,7 +8,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die('skip strftime uses system TZ');
 date.timezone=US/Eastern
 --FILE--
 <?php
-
 $stamp = 1112427000;
 print strftime('%c %Z',strtotime('now',$stamp)) ."\n";
 print strftime('%c %Z',strtotime('tomorrow',$stamp)) ."\n";

diff --git a/ext/date/tests/bug54851.phpt b/ext/date/tests/bug54851.phpt
index ba0dc0213331beb6b9977ae235e223ba1ca6fee4..34be1766cdb0e1fc95617fdf37b0d1123287612a 100644 (file)
--- a/ext/date/tests/bug54851.phpt
+++ b/ext/date/tests/bug54851.phpt
@@ -5,7 +5,7 @@ date.timezone=UTC
 --FILE--
 <?php
 $date = new DateTime("2011-05-17T22:14:12");
-$date2 = DateTime::createFromFormat("D H i s", $date->format("D"). ' 0 0 0');
+$date2 = DateTime::createFromFormat("D H i s", $date->format("D"). ' 0 00 00');
 echo $date->format("r"), "\n";
 echo $date2->format("r"), "\n";
 var_dump($date->format("D") == $date2->format("D"));
@@ -20,7 +20,7 @@ var_dump($datePre->format("Y-m-d") == $datePost->format("Y-m-d"));
 // Verify that our implementation is the same as for the constructor and
 // strtotime
 $date1 = new DateTime("Tuesday");
-$date2 = DateTime::createFromFormat("D H i s", "Tuesday 0 0 0");
+$date2 = DateTime::createFromFormat("D H i s", "Tuesday 0 00 00");
 echo $date1->format('r'), "\n";
 echo $date2->format('r'), "\n";
 var_dump($date1->format('D') == $date2->format('D'));