From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 9 Apr 2020 08:35:50 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ba6a833ded8a25793338b44e10a83917f3c3dd9;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #78434
---

8ba6a833ded8a25793338b44e10a83917f3c3dd9
diff --cc Zend/tests/generators/yield_from_multi_tree.phpt
index a8fd195bd6,808d693eae..bfa9033688
--- a/Zend/tests/generators/yield_from_multi_tree.phpt
+++ b/Zend/tests/generators/yield_from_multi_tree.phpt
@@@ -10,10 -10,7 +10,7 @@@ function from($levels) 
  }
  
  function gen($gen, $level) {
-     if ($level % 2) {
-         yield $gen->current();
-     }
 -	yield from $gen;
 +    yield from $gen;
  }
  
  foreach (range(0, 6) as $levels) {