From d03e5b2cfa1f7ea24e0a8a23baccffcaa714b6c5 Mon Sep 17 00:00:00 2001
From: Zach Neumann <zneumann@newrelic.com>
Date: Wed, 17 Apr 2024 10:51:06 -0600
Subject: [PATCH] fix tests

---
 .../test_bad_params_integer_headers.php       |  8 +++
 .../test_bad_params_integer_headers.php8.php  | 50 +++++++++++++++++++
 .../drupal7/test_bad_params_null_headers.php  |  8 +++
 .../test_bad_params_null_headers.php8.php     | 50 +++++++++++++++++++
 4 files changed, 116 insertions(+)
 create mode 100644 tests/integration/external/drupal7/test_bad_params_integer_headers.php8.php
 create mode 100644 tests/integration/external/drupal7/test_bad_params_null_headers.php8.php

diff --git a/tests/integration/external/drupal7/test_bad_params_integer_headers.php b/tests/integration/external/drupal7/test_bad_params_integer_headers.php
index 27beebb0c..1f0aec4c8 100644
--- a/tests/integration/external/drupal7/test_bad_params_integer_headers.php
+++ b/tests/integration/external/drupal7/test_bad_params_integer_headers.php
@@ -14,6 +14,9 @@
 /*SKIPIF
 <?php
 require("skipif.inc");
+if (version_compare(PHP_VERSION, "8.0", ">=")) {
+  die("skip: PHP >= 8.0 not supported\n");
+}
 */
 
 /*EXPECT_METRICS
@@ -32,6 +35,11 @@
     [{"name":"OtherTransactionTotalTime"},                         [1, "??", "??", "??", "??", "??"]],
     [{"name":"OtherTransactionTotalTime/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
     [{"name":"Supportability/framework/Drupal/forced"},            [1, 0, 0, 0, 0, 0]],
+    [{"name":"External/127.0.0.1/all"},                            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                                      [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                                 [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"OtherTransaction/php__FILE__"},                     [1, "??", "??", "??", "??", "??"]],
     [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
   ]
 ]
diff --git a/tests/integration/external/drupal7/test_bad_params_integer_headers.php8.php b/tests/integration/external/drupal7/test_bad_params_integer_headers.php8.php
new file mode 100644
index 000000000..f1fba9355
--- /dev/null
+++ b/tests/integration/external/drupal7/test_bad_params_integer_headers.php8.php
@@ -0,0 +1,50 @@
+<?php
+
+/*DESCRIPTION
+Test that adding cross process headers doesn't blow up if the second parameter
+is bogus.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+if (version_compare(PHP_VERSION, "8.0", "<")) {
+  die("skip: PHP < 8.0 not supported\n");
+}
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name":"Supportability/Logging/Forwarding/PHP/enabled"},     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/Logging/Metrics/PHP/enabled"},        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Errors/OtherTransaction/php__FILE__"},               [1, 0, 0, 0, 0, 0]],
+    [{"name":"Errors/all"},                                        [1, 0, 0, 0, 0, 0]],
+    [{"name":"Errors/allOther"},                                   [1, 0, 0, 0, 0, 0]],
+    [{"name":"OtherTransaction/all"},                              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},                      [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                         [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},            [1, 0, 0, 0, 0, 0]],
+    [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . $EXTERNAL_HOST;
+
+drupal_http_request($url, array("headers" => 22));
diff --git a/tests/integration/external/drupal7/test_bad_params_null_headers.php b/tests/integration/external/drupal7/test_bad_params_null_headers.php
index bfb431e9b..fe9463431 100644
--- a/tests/integration/external/drupal7/test_bad_params_null_headers.php
+++ b/tests/integration/external/drupal7/test_bad_params_null_headers.php
@@ -14,6 +14,9 @@
 /*SKIPIF
 <?php
 require("skipif.inc");
+if (version_compare(PHP_VERSION, "8.0", ">=")) {
+  die("skip: PHP >= 8.0 not supported\n");
+}
 */
 
 /*EXPECT_METRICS
@@ -32,6 +35,11 @@
     [{"name":"OtherTransactionTotalTime"},                         [1, "??", "??", "??", "??", "??"]],
     [{"name":"OtherTransactionTotalTime/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
     [{"name":"Supportability/framework/Drupal/forced"},            [1, 0, 0, 0, 0, 0]],
+    [{"name":"External/127.0.0.1/all"},                            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                                      [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                                 [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"OtherTransaction/php__FILE__"},                     [1, "??", "??", "??", "??", "??"]],
     [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
   ]
 ]
diff --git a/tests/integration/external/drupal7/test_bad_params_null_headers.php8.php b/tests/integration/external/drupal7/test_bad_params_null_headers.php8.php
new file mode 100644
index 000000000..9cde3d021
--- /dev/null
+++ b/tests/integration/external/drupal7/test_bad_params_null_headers.php8.php
@@ -0,0 +1,50 @@
+<?php
+
+/*DESCRIPTION
+Test that adding cross process headers doesn't blow up if the second parameter
+is bogus.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+if (version_compare(PHP_VERSION, "8.0", "<")) {
+  die("skip: PHP < 8.0 not supported\n");
+}
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name":"Supportability/Logging/Forwarding/PHP/enabled"},     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/Logging/Metrics/PHP/enabled"},        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Errors/OtherTransaction/php__FILE__"},               [1, 0, 0, 0, 0, 0]],
+    [{"name":"Errors/all"},                                        [1, 0, 0, 0, 0, 0]],
+    [{"name":"Errors/allOther"},                                   [1, 0, 0, 0, 0, 0]],
+    [{"name":"OtherTransaction/all"},                              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},                      [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                         [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},            [1, 0, 0, 0, 0, 0]],
+    [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . $EXTERNAL_HOST;
+
+drupal_http_request($url, array("headers" => NULL));