Redirect subclass tests

ext/pdo/tests/bug_43663.phpt

@@ -8,6 +8,12 @@ $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (getenv('PDOTEST_USECONNECT')) {
+    die('skip Test not customized for PDO::connect()');
+}
+
+echo 'nocache';
 ?>
 --FILE--
 <?php

ext/pdo/tests/bug_72788.phpt

@@ -8,6 +8,12 @@ $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (getenv('PDOTEST_USECONNECT')) {
+    die('skip Test not customized for PDO::connect()');
+}
+
+echo 'nocache';
 ?>
 --FILE--
 <?php

ext/pdo/tests/bug_77849.phpt

@@ -8,6 +8,12 @@ $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (getenv('PDOTEST_USECONNECT')) {
+    die('skip Test not customized for PDO::connect()');
+}
+
+echo 'nocache';
 ?>
 --FILE--
 <?php

ext/pdo/tests/pdo_023.phpt

@@ -8,6 +8,12 @@ $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (getenv('PDOTEST_USECONNECT')) {
+    die('skip Test not customized for PDO::connect()');
+}
+
+echo 'nocache';
 ?>
 --FILE--
 <?php

ext/pdo/tests/pdo_026.phpt

@@ -8,6 +8,12 @@ $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (getenv('PDOTEST_USECONNECT')) {
+    die('skip Test not customized for PDO::connect()');
+}
+
+echo 'nocache';
 ?>
 --FILE--
 <?php

ext/pdo/tests/pdo_029.phpt

@@ -8,6 +8,12 @@ $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (getenv('PDOTEST_USECONNECT')) {
+    die('skip Test not customized for PDO::connect()');
+}
+
+echo 'nocache';
 ?>
 --FILE--
 <?php

ext/pdo/tests/pdo_030.phpt

@@ -8,6 +8,12 @@ $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (getenv('PDOTEST_USECONNECT')) {
+    die('skip Test not customized for PDO::connect()');
+}
+
+echo 'nocache';
 ?>
 --FILE--
 <?php

ext/pdo/tests/pdo_test.inc

@@ -23,6 +23,8 @@ class PDOTest {
         $user = getenv('PDOTEST_USER');
         $pass = getenv('PDOTEST_PASS');
         $attr = getenv('PDOTEST_ATTR');
+        $useConnect = getenv('PDOTEST_USECONNECT');
+
         if (is_string($attr) && strlen($attr)) {
             $attr = unserialize($attr);
         } else {
@@ -32,7 +34,11 @@ class PDOTest {
         if ($user === false) $user = NULL;
         if ($pass === false) $pass = NULL;
 
-        $db = new $classname($dsn, $user, $pass, $attr);
+        if ($useConnect) {
+            $db = $classname::connect($dsn, $user, $pass, $attr);
+        } else {
+            $db = new $classname($dsn, $user, $pass, $attr);
+        }
 
         if (!$db) {
             die("Could not create PDO object (DSN=$dsn, user=$user)\n");

ext/pdo/tests/pecl_bug_5217.phpt

@@ -8,6 +8,12 @@ $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (getenv('PDOTEST_USECONNECT')) {
+    die('skip Test not customized for PDO::connect()');
+}
+
+echo 'nocache';
 ?>
 --FILE--
 <?php

ext/pdo_pgsql/tests/subclass_through_pdo_suite.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Postgres subclass
+--EXTENSIONS--
+pdo_pgsql
+--REDIRECTTEST--
+# Executes the pdo testsuite using PDO::connect()
+
+$config = [
+	'TESTS' => __DIR__ . '/ext/pdo/tests',
+    'ENV' => [
+        'PDOTEST_USECONNECT' => true,
+    ],
+];
+
+if (false !== getenv('PDO_PGSQL_TEST_DSN')) {
+	# user set them from their shell
+	$config['ENV']['PDOTEST_DSN'] = getenv('PDO_PGSQL_TEST_DSN');
+	if (false !== getenv('PDO_PGSQL_TEST_ATTR')) {
+		$config['ENV']['PDOTEST_ATTR'] = getenv('PDO_PGSQL_TEST_ATTR');
+	}
+} else {
+	$config['ENV']['PDOTEST_DSN'] = 'pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres';
+	$config['ENV']['PDOTEST_USER'] = 'postgres';
+	$config['ENV']['PDOTEST_PASS'] = 'postgres';
+}
+
+return $config;

ext/pdo_pgsql/tests/subclass_through_pgsql_suite.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Postgres subclass
+--EXTENSIONS--
+pdo_pgsql
+--REDIRECTTEST--
+# Executes the pdo_pgsql testsuite using PDO::connect()
+
+$config = [
+	'TESTS' => __DIR__ . '/ext/pdo_pgsql/tests',
+    'ENV' => [
+        'PDOTEST_USECONNECT' => true,
+    ],
+];
+
+if (false !== getenv('PDO_PGSQL_TEST_DSN')) {
+	# user set them from their shell
+	$config['ENV']['PDOTEST_DSN'] = getenv('PDO_PGSQL_TEST_DSN');
+	if (false !== getenv('PDO_PGSQL_TEST_ATTR')) {
+		$config['ENV']['PDOTEST_ATTR'] = getenv('PDO_PGSQL_TEST_ATTR');
+	}
+} else {
+	$config['ENV']['PDOTEST_DSN'] = 'pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres';
+	$config['ENV']['PDOTEST_USER'] = 'postgres';
+	$config['ENV']['PDOTEST_PASS'] = 'postgres';
+}
+
+return $config;

ext/pdo_pgsql/tests/subclasses/pdopgsql_001.phpt

@@ -2,6 +2,14 @@
 PdoPgsql subclass basic
 --EXTENSIONS--
 pdo_mysql
+--SKIPIF--
+<?php
+# This does not need to be executed by the redirect as we directly test
+# the ::connect() method here already.
+if (getenv('REDIR_TEST_DIR')) {
+    die('skip Excluding from a redirected set');
+}
+?>
 --FILE--
 <?php
 

ext/pdo_pgsql/tests/subclasses/pdopgsql_002.phpt

@@ -2,6 +2,14 @@
 PdoPgsql connect through PDO::connect
 --EXTENSIONS--
 pdo_mysql
+--SKIPIF--
+<?php
+# This does not need to be executed by the redirect as we directly test
+# the ::connect() method here already.
+if (getenv('REDIR_TEST_DIR')) {
+    die('skip Excluding from a redirected set');
+}
+?>
 --FILE--
 <?php
 

ext/pdo_pgsql/tests/subclasses/pdopgsql_003.phpt

@@ -2,6 +2,14 @@
 PdoPgsql getWarningCount
 --EXTENSIONS--
 pdo_mysql
+--SKIPIF--
+<?php
+# This does not need to be executed by the redirect as we directly test
+# the ::connect() method here already.
+if (getenv('REDIR_TEST_DIR')) {
+    die('skip Excluding from a redirected set');
+}
+?>
 --FILE--
 <?php
 

run-tests.php

@@ -1892,6 +1892,12 @@ function run_test(string $php, $file, array $env): string
 
         $junit->markTestAs('BORK', $shortname, $tested_file, 0, $ex->getMessage());
         return 'BORKED';
+    } catch (RedirectException $ex) {
+        show_result("SKIP", $ex->getMessage(), $tested_file);
+
+        $junit->markTestAs('SKIP', $shortname, $tested_file, 0, $ex->getMessage());
+
+        return 'SKIPPED';
     }
 
     $tested = $test->getName();
@@ -3296,6 +3302,10 @@ class BorkageException extends Exception
 {
 }
 
+class RedirectException extends Exception
+{
+}
+
 class JUnit
 {
     private bool $enabled = true;
@@ -3735,7 +3745,7 @@ class TestFile
     ];
 
     /**
-     * @throws BorkageException
+     * @throws BorkageException|RedirectException
      */
     public function __construct(string $fileName, bool $inRedirect)
     {
@@ -3880,15 +3890,15 @@ private function readFile(): void
     }
 
     /**
-     * @throws BorkageException
+     * @throws BorkageException|RedirectException
      */
     private function validateAndProcess(bool $inRedirect): void
     {
         // the redirect section allows a set of tests to be reused outside of
         // a given test dir
         if ($this->hasSection('REDIRECTTEST')) {
             if ($inRedirect) {
-                throw new BorkageException("Can't redirect a test from within a redirected test");
+                throw new RedirectException("Can't redirect a test from within a redirected test");
             }
             return;
         }