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