@@ -625,27 +625,24 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
625
625
zval * class_val = NULL ;
626
626
nr_php_string_hash_key_t * method_key = NULL ;
627
627
zval * module_val = NULL ;
628
- zend_ulong key_num = 0 ;
629
628
630
629
char * hookpath = NULL ;
631
630
632
631
hook_implementation_map = nr_php_get_zval_object_property (
633
632
module_handler , "hookImplementationsMap" );
634
633
if (hook_implementation_map ) {
635
634
if (nr_php_is_zval_valid_array (hook_implementation_map )) {
636
- ZEND_HASH_FOREACH_KEY_VAL (Z_ARRVAL_P (hook_implementation_map ), key_num ,
637
- hook_key , hook_val ) {
638
- (void )key_num ;
635
+ ZEND_HASH_FOREACH_STR_KEY_VAL (Z_ARRVAL_P (hook_implementation_map ),
636
+ hook_key , hook_val ) {
639
637
if ((NULL == hook_key ) || (0 == nr_php_is_zval_valid_array (hook_val ))) {
640
638
nrl_warning (NRL_FRAMEWORK ,
641
639
"hookImplementationsMap[hook = %s]: invalid value" ,
642
640
NRSAFESTR (ZEND_STRING_VALUE (hook_key )));
643
641
return false;
644
642
}
645
643
646
- ZEND_HASH_FOREACH_KEY_VAL (Z_ARRVAL_P (hook_val ), key_num , class_key ,
647
- class_val ) {
648
- (void )key_num ;
644
+ ZEND_HASH_FOREACH_STR_KEY_VAL (Z_ARRVAL_P (hook_val ), class_key ,
645
+ class_val ) {
649
646
if ((NULL == class_key )
650
647
|| (0 == nr_php_is_zval_valid_array (class_val ))) {
651
648
nrl_warning (NRL_FRAMEWORK ,
@@ -654,10 +651,8 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
654
651
return false;
655
652
}
656
653
657
- ZEND_HASH_FOREACH_KEY_VAL (Z_ARRVAL_P (class_val ), key_num , method_key ,
658
- module_val ) {
659
- (void )key_num ;
660
-
654
+ ZEND_HASH_FOREACH_STR_KEY_VAL (Z_ARRVAL_P (class_val ), method_key ,
655
+ module_val ) {
661
656
if ((NULL == method_key )
662
657
|| (0 == nr_php_is_zval_valid_string (module_val ))) {
663
658
nrl_warning (NRL_FRAMEWORK ,
0 commit comments