From: Sara Golemon <pollita@php.net>
Date: Thu, 23 Mar 2017 20:38:58 +0000 (-0700)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.4RC1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7835e2ebc5704d5bd8c1baa1cf98cf94facff740;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug where `yield from` is captured too greedily
---

7835e2ebc5704d5bd8c1baa1cf98cf94facff740
diff --cc NEWS
index dc8831bc88,f82f68cb91..ae0f6e096e
--- a/NEWS
+++ b/NEWS
@@@ -8,10 -7,9 +8,11 @@@ PH
      USE_ZEND_ALLOC=0). (Nikita)
    . Fixed bug #73960 (Leak with instance method calling static method with
      referenced return). (Nikita)
 +  . Fixed bug #69676 (Resolution of self::FOO in class constants not correct).
 +    (Nikita)
    . Fixed bug #74265 (Build problems after 7.0.17 release: undefined reference
      to `isfinite'). (Nikita)
+   . Fixed bug #74302 (yield fromLABEL is over-greedy). (Sara)
  
  - Date:
    . Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8)