com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/intl/test s/dateformat_format.phpt
| From: | Adam Harvey | Date: | Fri, 23 May 2014 15:14:00 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/intl/test s/dateformat_format.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78509@lists.php.net to get a copy of this message | ||
Commit: 6d9cc9223894a0683b4e20abe6d3f25fd96c8b67
Author: Adam Harvey <aharvey@php.net> Fri, 23 May 2014 15:14:00 +0000
Parents: e5e6ba093fd55e75554e549ed40ebbc75a8cf063 319611ffbd21f003755b679a90ffbdccbecab769
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6d9cc9223894a0683b4e20abe6d3f25fd96c8b67
Log:
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
Changed paths:
MM ext/intl/tests/dateformat_format.phpt
Diff:
diff --cc ext/intl/tests/dateformat_format.phpt
index 8b41087,20908b3..f9a9068
--- 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