From: Adam Harvey <aharvey@php.net>
Date: Wed, 21 May 2014 20:05:08 +0000 (-0500)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~270^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=549331a9256eacfae5e77528499455fb2faf9d58;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add microseconds to the serialised form of DateTime objects.
---

549331a9256eacfae5e77528499455fb2faf9d58
diff --cc NEWS
index abb3708d0c,df234c0fed..6d546cb5fb
--- a/NEWS
+++ b/NEWS
@@@ -1,13 -1,25 +1,17 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.14
 +?? ??? 2014, PHP 5.6.0 Beta 4
  
+ - Date:
+   . Fixed bug #67308 (Serialize of DateTime truncates fractions of second).
+     (Adam)
+ 
 -?? ??? 2014, PHP 5.5.13
 -
 -- CLI server:
 -  . Fixed bug #67079 (Missing MIME types for XML/XSL files). (Anatol)
 -
 -- COM:
 -  . Fixed bug #66431 (Special Character via COM Interface (CP_UTF8)). (Anatol)
 +15 May 2014, PHP 5.6.0 Beta 3
  
  - Core:
 -  . Fixed bug #65701 (copy() doesn't work when destination filename is created
 -    by tempnam()). (Boro Sitnikovski)
 -  . Fixed bug #67072 (Echoing unserialized "SplFileObject" crash). (Anatol)
 -  . Fixed bug #67245 (usage of memcpy() with overlapping src and dst in
 -    zend_exceptions.c). (Bob)
 +  . Fixed bug #67169 (array_splice all elements, then []= gives wrong index).
 +    (Nikita)
 +  . Fixed bug #67198 (php://input regression). (Mike)
    . Fixed bug #67247 (spl_fixedarray_resize integer overflow). (Stas)
    . Fixed bug #67250 (iptcparse out-of-bounds read). (Stas)
    . Fixed bug #67252 (convert_uudecode out-of-bounds read). (Stas)
diff --cc ext/date/tests/DateTimeImmutable_createFromMutable.phpt
index db893b9821,0000000000..ac92fb4bb4
mode 100644,000000..100644
--- a/ext/date/tests/DateTimeImmutable_createFromMutable.phpt
+++ b/ext/date/tests/DateTimeImmutable_createFromMutable.phpt
@@@ -1,26 -1,0 +1,26 @@@
 +--TEST--
 +Tests for DateTimeImmutable::createFromMutable.
 +--INI--
 +date.timezone=Europe/London
 +--FILE--
 +<?php
 +$current = "2014-03-02 16:24:08";
 +
 +$i = DateTimeImmutable::createFromMutable( date_create( $current ) );
 +var_dump( $i );
 +
 +$i = DateTimeImmutable::createFromMutable( date_create_immutable( $current ) );
 +var_dump( $i );
 +?>
 +--EXPECTF--
 +object(DateTimeImmutable)#%d (3) {
 +  ["date"]=>
-   string(19) "2014-03-02 16:24:08"
++  string(26) "2014-03-02 16:24:08.000000"
 +  ["timezone_type"]=>
 +  int(3)
 +  ["timezone"]=>
 +  string(13) "Europe/London"
 +}
 +
 +Warning: DateTimeImmutable::createFromMutable() expects parameter 1 to be DateTime, object given in %stests%eDateTimeImmutable_createFromMutable.php on line %d
 +NULL