- Need to make PDO::__construct() final to prevent SEGV it isn't called 1st

Author: helly25

ext/pdo/pdo_dbh.c

@@ -1075,6 +1075,7 @@ void pdo_dbh_init(TSRMLS_D)
 	INIT_CLASS_ENTRY(ce, "PDO", pdo_dbh_functions);
 	pdo_dbh_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	pdo_dbh_ce->create_object = pdo_dbh_new;
+	pdo_dbh_ce->constructor->common.fn_flags |= ZEND_ACC_FINAL;
 
 	memcpy(&pdo_dbh_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	pdo_dbh_object_handlers.get_method = dbh_method_get;

ext/pdo/tests/pdo_023_def.inc

@@ -21,12 +21,6 @@ class PDODatabaseX extends PDO
 {
     public $test1 = 1;
 
-    function __construct($connect)
-    {
-    	echo __METHOD__ . "()\n";
-    	parent::__construct($connect);
-    }
-    
     function __destruct()
     {
     	echo __METHOD__ . "()\n";

ext/pdo/tests/pdo_026.inc

@@ -30,12 +30,6 @@ class PDOStatementX extends PDOStatement
 
 class PDODatabase extends PDO
 {
-    function __construct($connect)
-    {
-    	echo __METHOD__ . "()\n";
-    	parent::__construct($connect);
-    }
-    
     function __destruct()
     {
     	echo __METHOD__ . "()\n";

ext/pdo_mysql/tests/pdo_023.phpt

@@ -22,7 +22,6 @@ require_once($PDO_TESTS . 'pdo_023.inc');
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-PDODatabaseX::__construct()
 int(1)
 int(2)
 object(PDODatabaseX)#%d (2) {

ext/pdo_mysql/tests/pdo_026.phpt

@@ -15,7 +15,6 @@ require_once($PDO_TESTS . 'pdo_026.inc');
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-PDODatabase::__construct()
 string(11) "PDODatabase"
 string(12) "PDOStatement"
 PDODatabase::query()

ext/pdo_pgsql/tests/pdo_023.phpt

@@ -22,7 +22,6 @@ require_once($PDO_TESTS . 'pdo_023.inc');
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-PDODatabaseX::__construct()
 int(1)
 int(2)
 object(PDODatabaseX)#%d (2) {

ext/pdo_pgsql/tests/pdo_026.phpt

@@ -15,7 +15,6 @@ require_once($PDO_TESTS . 'pdo_026.inc');
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-PDODatabase::__construct()
 string(11) "PDODatabase"
 string(12) "PDOStatement"
 PDODatabase::query()

ext/pdo_sqlite/tests/pdo_023.phpt

@@ -22,7 +22,6 @@ require_once($PDO_TESTS . 'pdo_023.inc');
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-PDODatabaseX::__construct()
 int(1)
 int(2)
 object(PDODatabaseX)#%d (2) {

ext/pdo_sqlite/tests/pdo_026.phpt

@@ -15,7 +15,6 @@ require_once($PDO_TESTS . 'pdo_026.inc');
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-PDODatabase::__construct()
 string(11) "PDODatabase"
 string(12) "PDOStatement"
 PDODatabase::query()

ext/sqlite/tests/pdo/pdo_023.phpt

@@ -22,7 +22,6 @@ require_once($PDO_TESTS . 'pdo_023.inc');
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-PDODatabaseX::__construct()
 int(1)
 int(2)
 object(PDODatabaseX)#%d (2) {

ext/sqlite/tests/pdo/pdo_026.phpt

@@ -15,7 +15,6 @@ require_once($PDO_TESTS . 'pdo_026.inc');
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-PDODatabase::__construct()
 string(11) "PDODatabase"
 string(12) "PDOStatement"
 PDODatabase::query()