chore(agent): remove obsolete code (17/17) (#1088)

This PR removes the `PHP7` macro and the remaining uses of it in the
agent codebase.

Author: hahuja2

agent/php_agent.c

@@ -334,120 +334,6 @@ zend_execute_data* nr_get_zend_execute_data(NR_EXECUTE_PROTO TSRMLS_DC) {
 #endif
 }
 
-/*
- * Purpose : Return a pointer to the arguments for the true frame that is
- *           legitimate_frame_delta frames down from the top.
- *
- * Params  : 1. The number of true frames to walk down.  0 means "top of stack".
- *              The PHP5.5 half-formed stack top frame (with a null arguments
- *              block) is ignored.
- *
- *           2. The execution context supplied by the zend engine; this changes
- *              from PHP5.4 to PHP5.5, hence the use of macros.
- *
- * See this web page discussion migrating from 5.4 to 5.5 (July 22, 2013)
- *   http://www.php.net/manual/en/migration55.internals.php
- *
- * If the arguments pointer is null, it represents either a half-formed frame
- * (or the base of the call stack). Go up one frame, and use the arguments
- * vector from there. The two functions appear to be identical.
- *
- * For PHP 5.4 (and presumably earlier), this additional stack frame isn't
- * there.
- *
- * See the picture near line 1525 of PHP 5.5.3 zend_execute.c
- */
-#if ZEND_MODULE_API_NO >= ZEND_5_5_X_API_NO && !defined(PHP7) \
-    && !defined(PHP8) /* PHP 5.5 and 5.6 */
-static void** nr_php_get_php55_stack_arguments(int legitimate_frame_delta,
-                                               NR_EXECUTE_PROTO TSRMLS_DC) {
-  zend_execute_data* ex;
-  void** arguments;
-  int i;
-
-  ex = nr_get_zend_execute_data(NR_EXECUTE_ORIG_ARGS TSRMLS_CC);
-
-  arguments = ex->function_state.arguments;
-  if (NULL == arguments) {
-    ex = ex->prev_execute_data; /* discard top partially formed frame */
-  }
-
-  if (NULL == ex) {
-    return NULL;
-  }
-
-  arguments = ex->function_state.arguments;
-  if (NULL == arguments) {
-    return NULL; /* PHP stack appears to be be malformed */
-  }
-
-  for (i = 0; i < legitimate_frame_delta; i++) {
-    ex = ex->prev_execute_data;
-    if (NULL == ex) {
-      return NULL; /* No caller; we're at the bottom of the stack */
-    }
-    arguments = ex->function_state.arguments;
-    if (NULL == arguments) {
-      return NULL; /* PHP stack appears to be be malformed */
-    }
-  }
-
-  return arguments;
-}
-#endif
-
-#if !defined(PHP7) && !defined(PHP8) /* PHP 5.5 and 5.6 */
-/*
- * Use detailed zend specific knowledge of the interpreter stack
- * to read the argument vector.
- * Here, the 'h' suffix means "hackery".
- */
-static zval* nr_php_get_user_func_arg_via_h(int requested_arg_index,
-                                            int* arg_count_p,
-                                            NR_EXECUTE_PROTO TSRMLS_DC) {
-  void** p = 0;
-  zval** argp = 0;
-  zval* arg = 0;
-
-  NR_UNUSED_SPECIALFN;
-
-  if (NULL == arg_count_p) {
-    return NULL;
-  }
-  *arg_count_p = -1;
-  if (NULL == nr_get_zend_execute_data(NR_EXECUTE_ORIG_ARGS TSRMLS_CC)) {
-    return NULL;
-  }
-
-#if ZEND_MODULE_API_NO >= ZEND_5_5_X_API_NO
-  p = nr_php_get_php55_stack_arguments(0, NR_EXECUTE_ORIG_ARGS TSRMLS_CC);
-  if (NULL == p) {
-    return NULL;
-  }
-  *arg_count_p = (int)(zend_uintptr_t)*p;
-#else
-  p = nr_get_zend_execute_data(NR_EXECUTE_ORIG_ARGS TSRMLS_CC)
-          ->function_state.arguments;
-  if (NULL == p) {
-    return NULL;
-  }
-  *arg_count_p = (int)(zend_uintptr_t)*p;
-#endif /* PHP >= 5.5 */
-
-  if (requested_arg_index > *arg_count_p) {
-    return NULL;
-  }
-
-  argp = ((zval**)p) - *arg_count_p + requested_arg_index - 1;
-  if (NULL == argp) {
-    return NULL;
-  }
-
-  arg = *argp;
-  return arg;
-}
-#endif /* !PHP7 && !PHP8*/
-
 /*
  * NOTICE: requested_arg_index is a 1-based value, not a 0-based value!
  */

agent/php_compat.h

@@ -11,7 +11,6 @@
 #endif /* PHP 8.0+ */
 
 #if ZEND_MODULE_API_NO >= ZEND_7_0_X_API_NO /* PHP 7.0+ */
-#define PHP7
 
 typedef uint32_t zend_uint;
 typedef size_t nr_string_len_t;

agent/php_newrelic.h

@@ -141,11 +141,7 @@ extern zend_module_entry newrelic_module_entry;
 /*
  * Convenience macro to handle unused TSRM parameters.
  */
-#if ZTS && !defined(PHP7) && !defined(PHP8)
-#define NR_UNUSED_TSRMLS (void)tsrm_ls;
-#else
 #define NR_UNUSED_TSRMLS
-#endif
 
 typedef enum {
   NR_FW_UNSET = 0,

agent/tests/test_agent.c

@@ -592,9 +592,6 @@ static void test_nr_php_zend_function_lineno() {
 #endif /* PHP 7+ */
 
 void test_main(void* p NRUNUSED) {
-#if defined(ZTS) && !defined(PHP7)
-  void*** tsrm_ls = NULL;
-#endif /* ZTS && !PHP7 */
 
   tlib_php_engine_create("" PTSRMLS_CC);
 

agent/tests/test_api_datastore.c

@@ -131,9 +131,6 @@ static void test_validate(TSRMLS_D) {
 }
 
 void test_main(void* p NRUNUSED) {
-#if defined(ZTS) && !defined(PHP7)
-  void*** tsrm_ls = NULL;
-#endif /* ZTS && !PHP7 */
 
   tlib_php_engine_create("" PTSRMLS_CC);
 

agent/tests/test_api_distributed_trace.c

@@ -35,9 +35,6 @@ static void test_accept_distributed_trace_payload() {
 }
 
 void test_main(void* p NRUNUSED) {
-#if defined(ZTS) && !defined(PHP7)
-  void*** tsrm_ls = NULL;
-#endif /* ZTS && !PHP7 */
 
   tlib_php_engine_create("" PTSRMLS_CC);
 

agent/tests/test_api_internal.c

@@ -150,9 +150,6 @@ static void test_segments(TSRMLS_D) {
 }
 
 void test_main(void* p NRUNUSED) {
-#if defined(ZTS) && !defined(PHP7)
-  void*** tsrm_ls = NULL;
-#endif /* ZTS && !PHP7 */
 
   tlib_php_engine_create("" PTSRMLS_CC);
 

agent/tests/test_api_metadata_dt_disabled.c

@@ -86,9 +86,6 @@ static void test_get_trace_metadata_when_dt_disabled(TSRMLS_D) {
 }
 
 void test_main(void* p NRUNUSED) {
-#if defined(ZTS) && !defined(PHP7)
-  void*** tsrm_ls = NULL;
-#endif /* ZTS && !PHP7 */
 
   tlib_php_engine_create(
       "newrelic.distributed_tracing_enabled = false\n" PTSRMLS_CC);

agent/tests/test_api_metadata_dt_enabled.c

@@ -88,9 +88,6 @@ static void test_get_trace_metadata_when_dt_enabled(TSRMLS_D) {
 }
 
 void test_main(void* p NRUNUSED) {
-#if defined(ZTS) && !defined(PHP7)
-  void*** tsrm_ls = NULL;
-#endif /* ZTS && !PHP7 */
 
 
     tlib_php_engine_create("newrelic.distributed_tracing_enabled = true\n" PTSRMLS_CC);

agent/tests/test_call.c

@@ -164,9 +164,6 @@ static void test_callable(TSRMLS_D) {
 }
 
 void test_main(void* p NRUNUSED) {
-#if defined(ZTS) && !defined(PHP7)
-  void*** tsrm_ls = NULL;
-#endif /* ZTS && !PHP7 */
 
   tlib_php_engine_create("" PTSRMLS_CC);