From: Anatol Belski <ab@php.net>
Date: Mon, 28 May 2018 15:15:22 +0000 (+0200)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha2~10^2~34^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74be58938c8839062bbc3803547ec96010e3e411;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Translate correct C++ version with suitable compiler
  Fixed bug #76383 (array_map on $GLOBALS returns IS_INDIRECT)
---

74be58938c8839062bbc3803547ec96010e3e411
diff --cc ext/standard/array.c
index 55d338faad,0a9cfb30cb..363abfc771
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@@ -6138,9 -6079,8 +6138,9 @@@ PHP_FUNCTION(array_map
  		}
  
  		array_init_size(return_value, maxlen);
 +		zend_hash_real_init(Z_ARRVAL_P(return_value), HT_FLAGS(Z_ARRVAL(arrays[0])) & HASH_FLAG_PACKED);
  
- 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(arrays[0]), num_key, str_key, zv) {
+ 		ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL(arrays[0]), num_key, str_key, zv) {
  			fci.retval = &result;
  			fci.param_count = 1;
  			fci.params = &arg;