Merge pull request #1 from php/master

Updating fork

Author: kamil-tekiela

NEWS

@@ -1,12 +1,18 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.0.0rc1
+?? ??? ????, PHP 8.0.0RC1
+
+
+17 Sep 2020, PHP 8.0.0beta4
 
 - Core:
   . Implement #[Attr] Attribute syntax as per final vote in RFC
     https://wiki.php.net/rfc/shorter_attribute_syntax_change
   . Fixed bug #80045 (memleak after two set_exception_handler calls with
     __call). (Nikita)
+  . Fixed bug #80096 (Segmentation fault with named arguments in nested call).
+    (Nikita)
+  . Fixed faulty generator cleanup with yield from. (Bob)
 
 - Date:
   . Fixed bug #80057 (DateTimeImmutable::createFromFormat() does not populate

UPGRADING.INTERNALS

@@ -370,19 +370,19 @@ PHP 8.0 INTERNALS UPGRADE NOTES
 
   u. Instead of overwriting zend_error_cb extensions with debugging, monitoring
      use-cases catching Errors/Exceptions are strongly encouraged to use
-	 the new error notification API instead.
+	 the new error observer API instead.
 
-	 Error notification callbacks are guaranteed to be called regardless of
+	 Error observering callbacks are guaranteed to be called regardless of
 	 the users error_reporting setting or userland error handler return values.
 
-     Register notification callbacks during MINIT of an extension:
+     Register observer callbacks during MINIT of an extension:
 
-		void my_error_notify_cb(int type,
+		void my_error_observer_cb(int type,
 			const char *error_filename,
 			uint32_t error_lineno,
 			zend_string *message) {
 		}
-		zend_register_error_notify_callback(my_error_notify_cb);
+		zend_observer_error_register(my_error_observer_cb);
 
   v. The following APIs have been removed from the Zend Engine:
      - zend_ts_hash_init_ex(), drop the last argument and use zend_ts_hash_init() instead

Zend/tests/bug31720.phpt

@@ -12,4 +12,4 @@ try {
 ?>
 --EXPECTF--
 Warning: Undefined variable $nonesuchvar in %s on line %d
-array_walk(): Argument #2 ($funcname) must be a valid callback, first array member is not a valid class name or object
+array_walk(): Argument #2 ($callback) must be a valid callback, first array member is not a valid class name or object

Zend/tests/bug41026.phpt

@@ -23,4 +23,4 @@ echo "Done\n";
 --EXPECT--
 Done
 
-Warning: (Registered shutdown functions) Unable to call self::on_shutdown() - function does not exist in Unknown on line 0
+Fatal error: Registered shutdown function self::on_shutdown() cannot be called, function does not exist in Unknown on line 0

Zend/tests/bug52355.phpt

@@ -10,11 +10,15 @@ $foo = -sin(0);
 
 var_dump($foo);
 
-var_dump(@(1.0 / -0.0));
+try {
+    var_dump(1.0 / -0.0);
+} catch (\DivisionByZeroError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 ?>
 --EXPECT--
 float(-0)
 float(-0)
 float(-0)
-float(-INF)
+Division by zero

Zend/tests/bug69957.phpt

@@ -60,23 +60,26 @@ try {
 }
 
 ?>
---EXPECTF--
-Warning: Division by zero in %sbug69957.php on line %d
-float(INF)
+--EXPECT--
+Variable div
+Type: DivisionByZeroError
+Message: Division by zero
 
 Variable mod
 Type: DivisionByZeroError
 Message: Modulo by zero
 
-Warning: Division by zero in %sbug69957.php on line %d
-float(INF)
+Literal div
+Type: DivisionByZeroError
+Message: Division by zero
 
 Literal mod
 Type: DivisionByZeroError
 Message: Modulo by zero
 
-Warning: Division by zero in %sbug69957.php on line %d
-float(INF)
+Double div
+Type: DivisionByZeroError
+Message: Division by zero
 
 Double mod
 Type: DivisionByZeroError

Zend/tests/bug76667.phpt

@@ -16,23 +16,14 @@ class T {
 }
 
 $x = new T;
-$x->x = 1;
+try {
+    $x->x = 1;
+} catch (\DivisionByZeroError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 ?>
 --EXPECTF--
 Warning: Undefined variable $undefined in %s on line %d
 
 Warning: Attempt to read property "1" on null in %s on line %d
-
-Warning: Division by zero in %s on line %d
-
-Warning: Undefined variable $undefined in %s on line %d
-
-Warning: Attempt to read property "NAN" on null in %s on line %d
-
-Warning: Division by zero in %s on line %d
-
-Warning: Undefined variable $undefined in %s on line %d
-
-Warning: Attempt to read property "NAN" on null in %s on line %d
-
-Warning: Division by zero in %s on line %d
+Division by zero

Zend/tests/bug80096.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Bug #80096: Segmentation fault with named arguments in nested call
+--FILE--
+<?php
+
+function println($arg) {
+    echo $arg, "\n";
+}
+
+println(htmlentities("The < character is encoded as &lt;", double_encode: false));
+
+?>
+--EXPECT--
+The &lt; character is encoded as &lt;

Zend/tests/generators/repeated_yield_from_with_immediate_release.phpt

@@ -0,0 +1,19 @@
+--TEST--
+A generator can be yielded from multiple times, testing immediate release of the yield from'ing generator
+--FILE--
+<?php
+
+function gen() {
+	yield 42;
+}
+function yield_from($gen) {
+	yield from $gen;
+}
+$gen = gen();
+var_dump(yield_from($gen)->current());
+var_dump(yield_from($gen)->current());
+
+?>
+--EXPECT--
+int(42)
+int(42)

Zend/tests/generators/yield_from_aborted_generator_with_children.phpt

@@ -0,0 +1,31 @@
+--TEST--
+Impossible to yield from a generator which already failed, nested version
+--FILE--
+<?php
+
+function from() {
+    yield 0;
+    throw new Exception();
+}
+function gen($gen) {
+    yield from $gen;
+}
+
+$gen1 = from();
+$gen2 = gen($gen1);
+$gen3 = gen($gen1);
+try {
+    $gen2->next();
+} catch (Exception $e) {
+    unset($gen2);
+}
+$gen3->next();
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Generator passed to yield from was aborted without proper return and is unable to continue in %s:%d
+Stack trace:
+#0 [internal function]: gen(Object(Generator))
+#1 %s(%d): Generator->next()
+#2 {main}
+  thrown in %s on line %d