Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).

1 files changed, 17 insertions, 0 deletions

diff --git a/Zend/tests/compound_assign_failure.phpt b/Zend/tests/compound_assign_failure.phpt
index f1afc783a0..f8d863106a 100644
--- a/Zend/tests/compound_assign_failure.phpt
+++ b/Zend/tests/compound_assign_failure.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Behavior of failing compound assignment
+--INI--
+opcache.optimization_level=0
 --FILE--
 <?php
 
@@ -17,8 +19,23 @@ try {
 	$a = 1;
 	$a <<= -1;
 } catch (Error $e) { var_dump($a); }
+
+set_error_handler(function() { throw new Exception; });
+
+try {
+	$a = [];
+	$a .= "foo";
+} catch (Throwable $e) { var_dump($a); }
+
+try {
+	$a = "foo";
+	$a .= [];
+} catch (Throwable $e) { var_dump($a); }
 ?>
 --EXPECT--
 int(1)
 int(1)
 int(1)
+array(0) {
+}
+string(3) "foo"