From: Adam Harvey <aharvey@php.net>
Date: Fri, 23 May 2014 15:14:00 +0000 (+0000)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.14RC1~55^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d9cc9223894a0683b4e20abe6d3f25fd96c8b67;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test caused by fdb2709.

Conflicts:
	ext/intl/tests/dateformat_format.phpt
---

6d9cc9223894a0683b4e20abe6d3f25fd96c8b67
diff --cc ext/intl/tests/dateformat_format.phpt
index 8b410876c0,20908b3f3f..f9a90684dd
--- a/ext/intl/tests/dateformat_format.phpt
+++ b/ext/intl/tests/dateformat_format.phpt
@@@ -358,41 -355,41 +358,41 @@@ Date is: DateTime::__set_state(array
  Formatted DateTime is : 20091231 03:02 PM
  ------------
  Date is: DateTime::__set_state(array(
-    'date' => '2000-12-30 19:04:05',
+    'date' => '2000-12-30 19:04:05.000000',
 -   'timezone_type' => 3,
 -   'timezone' => 'America/Los_Angeles',
 +   'timezone_type' => 2,
 +   'timezone' => 'PDT',
  ))
  ------------
  Formatted DateTime is : Saturday, December 30, 2000 5:04:05 PM GMT-10:00
  ------------
  Date is: DateTime::__set_state(array(
-    'date' => '2000-12-30 19:04:05',
+    'date' => '2000-12-30 19:04:05.000000',
 -   'timezone_type' => 3,
 -   'timezone' => 'America/Los_Angeles',
 +   'timezone_type' => 2,
 +   'timezone' => 'PDT',
  ))
  ------------
  Formatted DateTime is : December 30, 2000 5:04:05 PM GMT-10:00
  ------------
  Date is: DateTime::__set_state(array(
-    'date' => '2000-12-30 19:04:05',
+    'date' => '2000-12-30 19:04:05.000000',
 -   'timezone_type' => 3,
 -   'timezone' => 'America/Los_Angeles',
 +   'timezone_type' => 2,
 +   'timezone' => 'PDT',
  ))
  ------------
  Formatted DateTime is : Dec 30, 2000 5:04:05 PM
  ------------
  Date is: DateTime::__set_state(array(
-    'date' => '2000-12-30 19:04:05',
+    'date' => '2000-12-30 19:04:05.000000',
 -   'timezone_type' => 3,
 -   'timezone' => 'America/Los_Angeles',
 +   'timezone_type' => 2,
 +   'timezone' => 'PDT',
  ))
  ------------
  Formatted DateTime is : 12/30/00 5:04 PM
  ------------
  Date is: DateTime::__set_state(array(
-    'date' => '2000-12-30 19:04:05',
+    'date' => '2000-12-30 19:04:05.000000',
 -   'timezone_type' => 3,
 -   'timezone' => 'America/Los_Angeles',
 +   'timezone_type' => 2,
 +   'timezone' => 'PDT',
  ))
  ------------
  Formatted DateTime is : 20001230 05:04 PM