review: flatten conditional

Author: bduranleau-nr

agent/fw_drupal8.c

@@ -627,68 +627,66 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
 
   hook_implementation_map = nr_php_get_zval_object_property(
       module_handler, "hookImplementationsMap");
-  if (hook_implementation_map) {
-    if (nr_php_is_zval_valid_array(hook_implementation_map)) {
-      ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_implementation_map),
-                                    hook_key, hook_val) {
-        if ((NULL == hook_key) || (0 == nr_php_is_zval_valid_array(hook_val))) {
+
+  if (NULL == hook_implementation_map) {
+    nrl_warning(NRL_FRAMEWORK, "NULL hookImplementationsMap object property");
+    return false;
+  }
+
+  if (!nr_php_is_zval_valid_array(hook_implementation_map)) {
+    nrl_warning(NRL_FRAMEWORK,
+                "hookImplementationsMap property not a valid array");
+    return false;
+  }
+
+  ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_implementation_map), hook_key,
+                                hook_val) {
+    if ((NULL == hook_key) || (0 == nr_php_is_zval_valid_array(hook_val))) {
+      nrl_warning(NRL_FRAMEWORK,
+                  "hookImplementationsMap[hook = %s]: invalid value",
+                  NRSAFESTR(ZEND_STRING_VALUE(hook_key)));
+      return false;
+    }
+
+    ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_val), class_key, class_val) {
+      if ((NULL == class_key) || (0 == nr_php_is_zval_valid_array(class_val))) {
+        nrl_warning(NRL_FRAMEWORK,
+                    "hookImplementationsMap[class = %s]: invalid value",
+                    NRSAFESTR(ZEND_STRING_VALUE(class_key)));
+        return false;
+      }
+
+      ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(class_val), method_key,
+                                    module_val) {
+        if ((NULL == method_key)
+            || (0 == nr_php_is_zval_valid_string(module_val))) {
           nrl_warning(NRL_FRAMEWORK,
-                      "hookImplementationsMap[hook = %s]: invalid value",
-                      NRSAFESTR(ZEND_STRING_VALUE(hook_key)));
+                      "hookImplementationsMap[method = %s]: invalid value",
+                      NRSAFESTR(ZEND_STRING_VALUE(method_key)));
           return false;
         }
 
-        ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_val), class_key,
-                                      class_val) {
-          if ((NULL == class_key)
-              || (0 == nr_php_is_zval_valid_array(class_val))) {
-            nrl_warning(NRL_FRAMEWORK,
-                        "hookImplementationsMap[class = %s]: invalid value",
-                        NRSAFESTR(ZEND_STRING_VALUE(class_key)));
-            return false;
-          }
-
-          ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(class_val), method_key,
-                                        module_val) {
-            if ((NULL == method_key)
-                || (0 == nr_php_is_zval_valid_string(module_val))) {
-              nrl_warning(NRL_FRAMEWORK,
-                          "hookImplementationsMap[method = %s]: invalid value",
-                          NRSAFESTR(ZEND_STRING_VALUE(method_key)));
-              return false;
-            }
-
-            if (0
-                == nr_stricmp(ZEND_STRING_VALUE(class_key),
-                              "Drupal\\Core\\Extension\\ProceduralCall")) {
-              hookpath = nr_formatf("%s", ZEND_STRING_VALUE(method_key));
-            } else {
-              hookpath = nr_formatf("%s::%s", ZEND_STRING_VALUE(class_key),
-                                    ZEND_STRING_VALUE(method_key));
-            }
-
-            nr_php_wrap_user_function_drupal(
-                hookpath, nr_strlen(hookpath), Z_STRVAL_P(module_val),
-                Z_STRLEN_P(module_val), ZEND_STRING_VALUE(hook_key),
-                ZEND_STRING_LEN(hook_key));
-
-            nr_free(hookpath);
-          }
-          ZEND_HASH_FOREACH_END();
+        if (0
+            == nr_stricmp(ZEND_STRING_VALUE(class_key),
+                          "Drupal\\Core\\Extension\\ProceduralCall")) {
+          hookpath = nr_formatf("%s", ZEND_STRING_VALUE(method_key));
+        } else {
+          hookpath = nr_formatf("%s::%s", ZEND_STRING_VALUE(class_key),
+                                ZEND_STRING_VALUE(method_key));
         }
-        ZEND_HASH_FOREACH_END();
+
+        nr_php_wrap_user_function_drupal(
+            hookpath, nr_strlen(hookpath), Z_STRVAL_P(module_val),
+            Z_STRLEN_P(module_val), ZEND_STRING_VALUE(hook_key),
+            ZEND_STRING_LEN(hook_key));
+
+        nr_free(hookpath);
       }
       ZEND_HASH_FOREACH_END();
-
-    } else {
-      nrl_warning(NRL_FRAMEWORK,
-                  "hookImplementationsMap property not a valid array");
-      return false;
     }
-  } else {
-    nrl_warning(NRL_FRAMEWORK, "NULL hookImplementationsMap object property");
-    return false;
+    ZEND_HASH_FOREACH_END();
   }
+  ZEND_HASH_FOREACH_END();
 
   return true;
 }