From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 31 Aug 2020 15:06:08 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4acac9bd72630c8dea2d61bf9b550814467e54db;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix leak on assign concat of array and empty string
---

4acac9bd72630c8dea2d61bf9b550814467e54db
diff --cc Zend/tests/assign_concat_array_empty_string.phpt
index 0000000000,fcacb60675..6e551d9039
mode 000000,100644..100644
--- a/Zend/tests/assign_concat_array_empty_string.phpt
+++ b/Zend/tests/assign_concat_array_empty_string.phpt
@@@ -1,0 -1,13 +1,13 @@@
+ --TEST--
+ Assign concat of array and empty string
+ --FILE--
+ <?php
+ 
+ $a = [0];
+ $a .= '';
+ var_dump($a);
+ 
+ ?>
+ --EXPECTF--
 -Notice: Array to string conversion in %s on line %d
++Warning: Array to string conversion in %s on line %d
+ string(5) "Array"