Amend PDO driver-specific class names

ext/pdo_dblib/pdo_dblib.c

@@ -204,7 +204,7 @@ PHP_MINIT_FUNCTION(pdo_dblib)
 		return FAILURE;
 	}
 
-	PdoDblib_ce = register_class_PdoDblib(pdo_dbh_ce);
+	PdoDblib_ce = register_class_Pdo_Dblib(pdo_dbh_ce);
 	PdoDblib_ce->create_object = pdo_dbh_new;
 
 	if (FAILURE == php_pdo_register_driver(&pdo_dblib_driver)) {

ext/pdo_dblib/pdo_dblib.stub.php

@@ -2,11 +2,13 @@
 
 /** @generate-class-entries */
 
+namespace Pdo;
+
 /**
  * @strict-properties
  * @not-serializable
  */
-class PdoDblib extends PDO
+class Dblib extends PDO
 {
     /** @cvalue PDO_DBLIB_ATTR_CONNECTION_TIMEOUT */
     public const int ATTR_CONNECTION_TIMEOUT = UNKNOWN;

ext/pdo_dblib/tests/pdodblib_001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-PdoDblib basic
+Pdo\Dblib basic
 --EXTENSIONS--
 pdo_dblib
 --SKIPIF--
@@ -11,7 +11,7 @@ getDbConnection();
 <?php
 
 require __DIR__ . '/config.inc';
-$db = getDbConnection(PdoDblib::class);
+$db = getDbConnection(Pdo\Dblib::class);
 
 $db->query("CREATE TABLE #pdo_dblib_001(name VARCHAR(32)); ");
 $db->query("INSERT INTO #pdo_dblib_001 VALUES('PHP'), ('PHP6');");

ext/pdo_dblib/tests/pdodblib_002.phpt

@@ -1,5 +1,5 @@
 --TEST--
-PdoDblib create through PDO::connect
+Pdo\Dblib create through PDO::connect
 --EXTENSIONS--
 pdo_dblib
 --SKIPIF--
@@ -13,8 +13,8 @@ getDbConnection();
 require __DIR__ . '/config.inc';
 
 $db = connectToDb();
-if (!$db instanceof PdoDblib) {
-    echo "Wrong class type. Should be PdoDblib but is " . get_class($db) . "\n";
+if (!$db instanceof Pdo\Dblib) {
+    echo "Wrong class type. Should be Pdo\Dblib but is " . get_class($db) . "\n";
 }
 
 $db->query("CREATE TABLE #pdo_dblib_002(name VARCHAR(32))");

ext/pdo_firebird/pdo_firebird.c

@@ -70,7 +70,7 @@ PHP_MINIT_FUNCTION(pdo_firebird) /* {{{ */
 		return FAILURE;
 	}
 
-	PdoFirebird_ce = register_class_PdoFirebird(pdo_dbh_ce);
+	PdoFirebird_ce = register_class_Pdo_Firebird(pdo_dbh_ce);
 	PdoFirebird_ce->create_object = pdo_dbh_new;
 
 #ifdef ZEND_SIGNALS

ext/pdo_firebird/pdo_firebird.stub.php

@@ -2,11 +2,13 @@
 
 /** @generate-class-entries */
 
+namespace Pdo;
+
 /**
  * @strict-properties
  * @not-serializable
  */
-class PdoFirebird extends PDO
+class Firebird extends PDO
 {
     /** @cvalue PDO_FB_ATTR_DATE_FORMAT */
     public const int ATTR_DATE_FORMAT = UNKNOWN;

ext/pdo_firebird/tests/pdofirebird_002.phpt

@@ -13,8 +13,8 @@ See https://github.com/FirebirdSQL/firebird/issues/7849
 require_once __DIR__ . "/testdb.inc";
 
 $db = connectToDb();
-if (!$db instanceof PdoFirebird) {
-    echo "Wrong class type. Should be PdoFirebird but is " . get_class($db) . "\n";
+if (!$db instanceof Pdo\Firebird) {
+    echo "Wrong class type. Should be Pdo\Firebird but is " . get_class($db) . "\n";
 }
 
 $db->query('CREATE TABLE pdofirebird_002 (idx INT NOT NULL PRIMARY KEY, name VARCHAR(20))');

ext/pdo_firebird/tests/testdb.inc

@@ -21,8 +21,8 @@ function getDbConnection($class = PDO::class): PDO {
     return new $class(PDO_FIREBIRD_TEST_DSN, PDO_FIREBIRD_TEST_USER, PDO_FIREBIRD_TEST_PASS);
 }
 
-function connectToDb(): PdoFirebird {
-    return PdoFirebird::connect(PDO_FIREBIRD_TEST_DSN, PDO_FIREBIRD_TEST_USER, PDO_FIREBIRD_TEST_PASS);
+function connectToDb(): Pdo\Firebird {
+    return Pdo\Firebird::connect(PDO_FIREBIRD_TEST_DSN, PDO_FIREBIRD_TEST_USER, PDO_FIREBIRD_TEST_PASS);
 }
 
 ?>

ext/pdo_mysql/pdo_mysql.c

@@ -84,10 +84,8 @@ static const MYSQLND_REVERSE_API pdo_mysql_reverse_api = {
 };
 #endif
 
-/* proto string PDO::mysqlGetWarningCount()
- * Returns the number of SQL warnings during the execution of the last statement
- */
-PHP_METHOD(PdoMysql, getWarningCount)
+/* Returns the number of SQL warnings during the execution of the last statement */
+PHP_METHOD(Pdo_Mysql, getWarningCount)
 {
 	pdo_dbh_t *dbh;
 	pdo_mysql_db_handle *H;
@@ -151,7 +149,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql)
 	mysqlnd_reverse_api_register_api(&pdo_mysql_reverse_api);
 #endif
 
-	pdo_mysql_ce = register_class_PdoMysql(pdo_dbh_ce);
+	pdo_mysql_ce = register_class_Pdo_Mysql(pdo_dbh_ce);
 	pdo_mysql_ce->create_object = pdo_dbh_new;
 
 	if (php_pdo_register_driver(&pdo_mysql_driver) == FAILURE) {

ext/pdo_mysql/pdo_mysql.stub.php

@@ -2,11 +2,13 @@
 
 /** @generate-class-entries */
 
+namespace Pdo;
+
 /**
  * @strict-properties
  * @not-serializable
  */
-class PdoMysql extends PDO
+class Mysql extends PDO
 {
     /** @cvalue PDO_MYSQL_ATTR_USE_BUFFERED_QUERY */
     public const int ATTR_USE_BUFFERED_QUERY = UNKNOWN;

ext/pdo_mysql/tests/pdomysql_001.phpt

@@ -12,7 +12,7 @@ MySQLPDOTest::skip();
 
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 
-$db = MySQLPDOTest::factory(PdoMysql::class);
+$db = MySQLPDOTest::factory(Pdo\Mysql::class);
 
 $db->query('CREATE TABLE pdomysql_001 (id INT, name TEXT)');
 

ext/pdo_mysql/tests/pdomysql_002.phpt

@@ -13,8 +13,8 @@ MySQLPDOTest::skip();
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 
 $db = Pdo::connect(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS);
-if (!$db instanceof PdoMysql) {
-    echo "Wrong class type. Should be PdoMysql but is " . get_class($db) . "\n";
+if (!$db instanceof Pdo\Mysql) {
+    echo "Wrong class type. Should be Pdo\Mysql but is " . get_class($db) . "\n";
 }
 
 $db->exec('CREATE TABLE pdomysql_002(id INT NOT NULL PRIMARY KEY, name VARCHAR(10))');

ext/pdo_mysql/tests/pdomysql_003.phpt

@@ -13,8 +13,8 @@ MySQLPDOTest::skip();
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 
 $db = Pdo::connect(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS);
-if (!$db instanceof PdoMysql) {
-    echo "Wrong class type. Should be PdoMysql but is " . get_class($db) . "\n";
+if (!$db instanceof Pdo\Mysql) {
+    echo "Wrong class type. Should be Pdo\Mysql but is " . get_class($db) . "\n";
 }
 
 $assertWarnings = function ($db, $q, $count) {

ext/pdo_odbc/pdo_odbc.c

@@ -107,7 +107,7 @@ PHP_MINIT_FUNCTION(pdo_odbc)
 	REGISTER_PDO_CLASS_CONST_LONG("ODBC_SQL_USE_DRIVER", SQL_CUR_USE_DRIVER);
 	REGISTER_PDO_CLASS_CONST_LONG("ODBC_SQL_USE_ODBC", SQL_CUR_USE_ODBC);
 
-	pdo_odbc_ce = register_class_PdoOdbc(pdo_dbh_ce);
+	pdo_odbc_ce = register_class_Pdo_Odbc(pdo_dbh_ce);
 	pdo_odbc_ce->create_object = pdo_dbh_new;
 
 	return php_pdo_register_driver_specific_ce(&pdo_odbc_driver, pdo_odbc_ce);

ext/pdo_odbc/pdo_odbc.stub.php

@@ -2,30 +2,34 @@
 
 /** @generate-class-entries */
 
-/**
- * @var string
- * @cvalue PDO_ODBC_TYPE
- */
-const PDO_ODBC_TYPE = UNKNOWN;
+namespace {
+    /**
+     * @var string
+     * @cvalue PDO_ODBC_TYPE
+     */
+    const PDO_ODBC_TYPE = UNKNOWN;
+}
 
-/**
- * @strict-properties
- * @not-serializable
- */
-class PdoOdbc extends PDO
-{
-    /** @cvalue PDO_ODBC_ATTR_USE_CURSOR_LIBRARY */
-    public const int ATTR_USE_CURSOR_LIBRARY = UNKNOWN;
+namespace Pdo {
+    /**
+     * @strict-properties
+     * @not-serializable
+     */
+    class Odbc extends PDO
+    {
+        /** @cvalue PDO_ODBC_ATTR_USE_CURSOR_LIBRARY */
+        public const int ATTR_USE_CURSOR_LIBRARY = UNKNOWN;
 
-    /** @cvalue PDO_ODBC_ATTR_ASSUME_UTF8 */
-    public const int ATTR_ASSUME_UTF8 = UNKNOWN;
+        /** @cvalue PDO_ODBC_ATTR_ASSUME_UTF8 */
+        public const int ATTR_ASSUME_UTF8 = UNKNOWN;
 
-    /** @cvalue SQL_CUR_USE_IF_NEEDED */
-    public const int SQL_USE_IF_NEEDED = UNKNOWN;
+        /** @cvalue SQL_CUR_USE_IF_NEEDED */
+        public const int SQL_USE_IF_NEEDED = UNKNOWN;
 
-    /** @cvalue SQL_CUR_USE_DRIVER */
-    public const int SQL_USE_DRIVER = UNKNOWN;
+        /** @cvalue SQL_CUR_USE_DRIVER */
+        public const int SQL_USE_DRIVER = UNKNOWN;
 
-    /** @cvalue SQL_CUR_USE_ODBC */
-    public const int SQL_USE_ODBC = UNKNOWN;
+        /** @cvalue SQL_CUR_USE_ODBC */
+        public const int SQL_USE_ODBC = UNKNOWN;
+    }
 }

ext/pdo_odbc/tests/pdoodbc_001.phpt

@@ -12,7 +12,7 @@ PDOTest::skip();
 
 require 'ext/pdo/tests/pdo_test.inc';
 $config = PDOTest::get_config(__DIR__ . "/common.phpt");
-$db = new PdoOdbc($config['ENV']['PDOTEST_DSN'], $config['ENV']['PDOTEST_USER'], $config['ENV']['PDOTEST_PASS']);
+$db = new Pdo\Odbc($config['ENV']['PDOTEST_DSN'], $config['ENV']['PDOTEST_USER'], $config['ENV']['PDOTEST_PASS']);
 
 $db->query("CREATE TABLE pdoodbc_001 (id INT, name TEXT)");
 $db->query("INSERT INTO pdoodbc_001 VALUES (NULL, 'PHP'), (NULL, 'PHP6')");

ext/pdo_odbc/tests/pdoodbc_002.phpt

@@ -12,9 +12,9 @@ PDOTest::skip();
 
 require 'ext/pdo/tests/pdo_test.inc';
 $config = PDOTest::get_config(__DIR__ . "/common.phpt");
-$db = PdoOdbc::connect($config['ENV']['PDOTEST_DSN'], $config['ENV']['PDOTEST_USER'], $config['ENV']['PDOTEST_PASS']);
-if (!$db instanceof PdoOdbc) {
-    echo "Wrong class type. Should be PdoOdbc but is " . get_class($db) . "\n";
+$db = Pdo\Odbc::connect($config['ENV']['PDOTEST_DSN'], $config['ENV']['PDOTEST_USER'], $config['ENV']['PDOTEST_PASS']);
+if (!$db instanceof Pdo\Odbc) {
+    echo "Wrong class type. Should be Pdo\Odbc but is " . get_class($db) . "\n";
 }
 
 $db->exec('CREATE TABLE pdoodbc_002(id INT NOT NULL PRIMARY KEY, name VARCHAR(10))');