Fixed bug #62073

(Different ways of iterating over an SplMaxHeap result in in different keys)

diff --cc NEWS
index 5fa6ecbcd1cb578ffd665ae877f39a984632c499,5f1146ac85dff1183c75bc5295b75ad12ef679c9..078725f3c693cdd452c43dfba121ab241cc72f9c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -4,25 -4,6 +4,29 @@@ PH
  
  ?? ??? 2012, PHP 5.3.14
  
- - FPM
++- FPM:
 +  . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
 +  . Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
 +  . Fixed bug #61295 (php-fpm should not fail with commented 'user'
 +    for non-root start). (fat)
 +  . Fixed bug #61026 (FPM pools can listen on the same address). (fat)
 +
- - Intl
++- Intl:
 +  . Fixed bug #62083 (grapheme_extract() memory leaks). (Gustavo)
 +  . Fixed bug #62082 (memory corruption in internal get_icu_disp_value_src_php
 +    function). (Gustavo)
 +  . Fixed bug #62081 (IntlDateFormatter constructor leaks memory when called
 +    twice). (Gustavo)
 +  . Fixed bug #62070 (Collator::getSortKey() returns garbage). (Gustavo)
 +  . Fixed bug #62017 (datefmt_create with incorrectly encoded timezone leaks
 +    pattern). (Gustavo)
 +  . Fixed bug #60785 (memory leak in IntlDateFormatter constructor). (Gustavo)
 +  . Fixed bug #55610 (ResourceBundle should implement Traversable). (stealth35)
 +
++- SPL:
++  . Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in
++    in different keys). (reeze.xia@gmail.com)
++
  - XML Writer:
    . Fixed bug #62064 (memory leak in the XML Writer module). 
      (jean-pierre dot lozi at lip6 dot fr)
@@@ -145,7 -126,7 +149,7 @@@
    . Fixed bug #60968 (Late static binding doesn't work with 
      ReflectionMethod::invokeArgs()). (Laruence)
  
--- SOAP
++- SOAP:
    . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
    . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
      User-Agent header). (carloschilazo at gmail dot com)
@@@ -154,7 -135,7 +158,7 @@@
    . Fixed bug #49853 (Soap Client stream context header option ignored).
      (Dmitry)
  
--- SPL
++- SPL:
    . Fixed memory leak when calling SplFileInfo's constructor twice. (Felipe)
    . Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
      FilesystemIterator's iterators are requested more than once without

diff --cc ext/spl/tests/bug62073.phpt
index 0000000000000000000000000000000000000000,2472059b25d06cc8de18ba67f146575b453961dc..3bd355317f6d645e151619f3cb2cf4e51c22cfc6
mode 000000,100644..100644
--- /dev/null
--- 2/ext/spl/tests/bug62073.phpt
+++ b/ext/spl/tests/bug62073.phpt
@@@ -1,0 -1,24 +1,22 @@@
 -$heap = new SplMaxHeap;
+ --TEST--
+ Bug #62073 (different ways of iterating over an SplMaxHeap result in different keys)
+ --FILE--
+ <?php
 -  break;
++$heap = new SplMaxHeap();
+ $heap->insert(42);
+ foreach ($heap as $key => $value) {
 -var_dump($key);
 -var_dump($value);
++    var_dump($key);
++    var_dump($value);
++    break;
+ }
 -$heap = new SplMaxHeap;
+ 
 -==DONE==
++$heap = new SplMaxHeap();
+ $heap->insert(42);
+ var_dump($heap->key());
+ var_dump($heap->current());
+ ?>
 -==DONE==
+ --EXPECT--
+ int(0)
+ int(42)
+ int(0)
+ int(42)