refactor: combine php specific tests into a single test

newrelic · Dec 17, 2024 · 1cc35ad · 1cc35ad
1 parent 9807f77
commit 1cc35ad
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 107 deletions.
diff --git a/tests/integration/pdo/test_query_1.php b/tests/integration/pdo/test_query_1.php
@@ -11,9 +11,6 @@
 
 /*SKIPIF
 <?php require('skipif_sqlite.inc');
-if (version_compare(PHP_VERSION, "8.1", ">=")) {
-  die("skip: PHP >= 8.1.0 not supported\n");
-}
 */
 
 /*INI
@@ -82,11 +79,19 @@ function test_pdo_query() {
   tap_equal(1, $conn->exec("INSERT INTO test VALUES (2, 'two');"), 'insert two');
   tap_equal(1, $conn->exec("INSERT INTO test VALUES (3, 'three');"), 'insert three');
 
-  $expected = array(
-    array('id' => '1', 'desc' => 'one'),
-    array('id' => '2', 'desc' => 'two'),
-    array('id' => '3', 'desc' => 'three')
-  );
+  if (version_compare(PHP_VERSION, "8.1", "<")) {
+    $expected = array(
+        array('id' => '1', 'desc' => 'one'),
+        array('id' => '2', 'desc' => 'two'),
+        array('id' => '3', 'desc' => 'three')
+    );
+  } else {
+    $expected = array(
+        array('id' => 1, 'desc' => 'one'),
+        array('id' => 2, 'desc' => 'two'),
+        array('id' => 3, 'desc' => 'three')
+    );
+  }
 
   $result = $conn->query('SELECT * FROM test;');
   $actual = $result->fetchAll(PDO::FETCH_ASSOC);

diff --git a/tests/integration/pdo/test_query_1.php81.php b/tests/integration/pdo/test_query_1.php81.php