chore(agent): remove obsolete code (16/17) (#1085)

This PR removes obsolete `PHP7` codeblocks. PR: 16/17

Author: hahuja2

agent/tests/test_call.c

@@ -78,7 +78,6 @@ static void test_callable(TSRMLS_D) {
   nr_php_zval_free(&callable);
   nr_php_zval_free(&retval);
 
-#ifdef PHP7
   callable = tlib_php_request_eval_expr(
       "new class { function __invoke() { return 42; } }" TSRMLS_CC);
   retval = nr_php_call_callable(callable);
@@ -89,7 +88,6 @@ static void test_callable(TSRMLS_D) {
                           (long)Z_LVAL_P(retval));
   nr_php_zval_free(&callable);
   nr_php_zval_free(&retval);
-#endif /* PHP7 */
 
   /*
    * Test : With parameters.
@@ -150,7 +148,6 @@ static void test_callable(TSRMLS_D) {
   nr_php_zval_free(&callable);
   nr_php_zval_free(&retval);
 
-#ifdef PHP7
   callable = tlib_php_request_eval_expr(
       "new class { function __invoke($n) { return square($n); } }" TSRMLS_CC);
   retval = nr_php_call_callable(callable, param);
@@ -161,7 +158,6 @@ static void test_callable(TSRMLS_D) {
                           (long)Z_LVAL_P(retval));
   nr_php_zval_free(&callable);
   nr_php_zval_free(&retval);
-#endif /* PHP7 */
 
   nr_php_zval_free(&param);
   tlib_php_request_end();

agent/tests/test_fw_codeigniter.c

@@ -27,7 +27,6 @@ static void invoke_cufa(TSRMLS_D) {
 }
 
 static void test_get_topmost_user_op_array(TSRMLS_D) {
-#ifdef PHP7
   /*
    * First, we'll test this with call_user_func_array() inlining.
    */
@@ -43,11 +42,6 @@ static void test_get_topmost_user_op_array(TSRMLS_D) {
   CG(compiler_options) |= ZEND_COMPILE_NO_BUILTINS;
   invoke_cufa(TSRMLS_C);
   tlib_php_request_end();
-#else
-  tlib_php_request_start();
-  invoke_cufa(TSRMLS_C);
-  tlib_php_request_end();
-#endif /* PHP7 */
 }
 
 tlib_parallel_info_t parallel_info = {.suggested_nthreads = 1, .state_size = 0};

agent/tests/test_pdo.c

@@ -302,11 +302,9 @@ static void test_disable_persistence(TSRMLS_D) {
       "array(PDO::ATTR_PERSISTENT => false)" TSRMLS_CC);
 
   for (i = 0; bad_options[i]; i++) {
-#ifdef PHP7
     if (IS_UNDEF == Z_TYPE_P(bad_options[i])) {
       continue;
     }
-#endif
 
     input = nr_php_zval_alloc();
 

agent/tests/tlib_php.c

@@ -600,16 +600,7 @@ tlib_php_internal_function_handler_t tlib_php_replace_internal_function(
     zend_class_entry* ce = NULL;
     char* lcclass = nr_string_to_lowercase(klass);
 
-#ifdef PHP7
     ce = (zend_class_entry*)nr_php_zend_hash_find_ptr(CG(class_table), lcclass);
-#else
-    zend_class_entry** ce_ptr
-        = nr_php_zend_hash_find_ptr(CG(class_table), lcclass);
-
-    if (ce_ptr) {
-      ce = *ce_ptr;
-    }
-#endif /* PHP7 */
 
     nr_free(lcclass);
     if (NULL == ce) {
@@ -670,7 +661,6 @@ zval* tlib_php_zval_create_default(zend_uchar type TSRMLS_DC) {
       nr_php_zval_str(zv, "");
       break;
 
-#ifdef PHP7
     case IS_UNDEF:
       ZVAL_UNDEF(zv);
       break;
@@ -732,15 +722,6 @@ zval* tlib_php_zval_create_default(zend_uchar type TSRMLS_DC) {
         ZVAL_NEW_REF(zv, &refval);
       }
       break;
-#else
-    case IS_BOOL:
-      ZVAL_BOOL(zv, 0);
-      break;
-
-    case IS_RESOURCE:
-      ZEND_REGISTER_RESOURCE(zv, NULL, le_tlib);
-      break;
-#endif /* PHP7 */
 
     default:
       nr_php_zval_free(&zv);
@@ -750,17 +731,10 @@ zval* tlib_php_zval_create_default(zend_uchar type TSRMLS_DC) {
   return zv;
 }
 
-#ifdef PHP7
 static const zend_uchar default_zval_types[] = {
     IS_UNDEF,  IS_NULL,  IS_FALSE,  IS_TRUE,     IS_LONG,      IS_DOUBLE,
     IS_STRING, IS_ARRAY, IS_OBJECT, IS_RESOURCE, IS_REFERENCE,
 };
-#else
-static const zend_uchar default_zval_types[] = {
-    IS_NULL,  IS_LONG,   IS_DOUBLE, IS_BOOL,
-    IS_ARRAY, IS_OBJECT, IS_STRING, IS_RESOURCE,
-};
-#endif
 
 zval** tlib_php_zvals_of_all_types(TSRMLS_D) {
   zval** arr;
@@ -829,11 +803,7 @@ char* tlib_php_zval_dump(zval* zv TSRMLS_DC) {
   }
 
   tlib_php_request_eval("ob_start();" TSRMLS_CC);
-#ifdef PHP7
   php_var_dump(zv, 0);
-#else
-  php_var_dump(&zv, 0 TSRMLS_CC);
-#endif
   result = tlib_php_request_eval_expr("ob_get_clean()" TSRMLS_CC);
   if (nr_php_is_zval_valid_string(result)) {
     dump = nr_strndup(Z_STRVAL_P(result), Z_STRLEN_P(result));