Update versions for PHP 7.4.7

NEWS

@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 7.4.7
+11 Jun 2020, PHP 7.4.7
 
 - Core:
   . Fixed bug #79599 (coredump in set_error_handler). (Laruence)
@@ -8,6 +8,8 @@ PHP                                                                        NEWS
   . Fixed bug #79489 (.user.ini does not inherit). (cmb)
   . Fixed bug #79600 (Regression in 7.4.6 when yielding an array based
     generator). (Nikita)
+  . Fixed bug #79657 ("yield from" hangs when invalid value encountered).
+    (Nikita)
 
 - FFI:
   . Fixed bug #79571 (FFI: var_dumping unions may segfault). (cmb)
@@ -21,10 +23,6 @@ PHP                                                                        NEWS
     variable). (Nikita)
   . Fixed bug #79603 (RTD collision with opcache). (Nikita)
 
-- SimpleXML:
-  . Fixed bug #79528 (Different object of the same xml between 7.4.5 and
-    7.4.4). (cmb)
-
 - Standard:
   . Fixed bug #79561 (dns_get_record() fails with DNS_ALL). (cmb)
 
@@ -63,6 +61,10 @@ PHP                                                                        NEWS
 - Phar:
   . Fixed bug #79503 (Memory leak on duplicate metadata). (cmb)
 
+- SimpleXML:
+  . Fixed bug #79528 (Different object of the same xml between 7.4.5 and
+    7.4.4). (cmb)
+
 - SPL:
   . Fixed bug #69264 (__debugInfo() ignored while extending SPL classes). (cmb)
   . Fixed bug #67369 (ArrayObject serialization drops the iterator class).

Zend/tests/bug79657.phpt

@@ -0,0 +1,42 @@
+--TEST--
+Bug #79657: "yield from" hangs when invalid value encountered
+--FILE--
+<?php
+
+function throwException(): iterable
+{
+    throw new Exception();
+}
+
+function loop(): iterable
+{
+    $callbacks = [
+        function () {
+            yield 'first';
+        },
+        function () {
+            yield from throwException();
+        }
+    ];
+
+    foreach ($callbacks as $callback) {
+        yield from $callback();
+    }
+}
+
+function get(string $first, int $second): array
+{
+    return [];
+}
+
+get(...loop());
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Exception in %s:%d
+Stack trace:
+#0 %s(%d): throwException()
+#1 %s(%d): {closure}()
+#2 %s(%d): loop()
+#3 {main}
+  thrown in %s on line %d

Zend/zend_generators.c

@@ -857,6 +857,7 @@ try_again:
 			} else {
 				generator = zend_generator_get_current(orig_generator);
 				zend_generator_throw_exception(generator, NULL);
+				orig_generator->flags &= ~ZEND_GENERATOR_DO_INIT;
 				goto try_again;
 			}
 		}

configure.ac

@@ -17,7 +17,7 @@ dnl Basic autoconf initialization, generation of config.nice.
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ([2.68])
-AC_INIT([PHP],[7.4.7-dev],[https://bugs.php.net],[php],[https://www.php.net])
+AC_INIT([PHP],[7.4.7],[https://bugs.php.net],[php],[https://www.php.net])
 AC_CONFIG_SRCDIR([main/php_version.h])
 AC_CONFIG_AUX_DIR([build])
 AC_PRESERVE_HELP_ORDER

main/php_version.h

@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 4
 #define PHP_RELEASE_VERSION 7
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.4.7-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "7.4.7"
 #define PHP_VERSION_ID 70407