Skip to content

Commit aff7944

Browse files
committed
Fix PDO constructor
1 parent 352f626 commit aff7944

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

ext/pdo/pdo_dbh.stub.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44

55
class PDO
66
{
7-
/** @alias dbh_constructor */
7+
/** @alias PDO::dbh_constructor */
88
public function __construct(string $dsn, ?string $username = null, ?string $passwd = null, ?array $options = null) {}
99

10+
/** @return PDO */
11+
final private function dbh_constructor(string $dsn, ?string $username = null, ?string $passwd = null, ?array $options = null) {}
12+
1013
/** @return bool */
1114
public function beginTransaction() {}
1215

ext/pdo/pdo_dbh_arginfo.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO___construct, 0, 0, 1)
77
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
88
ZEND_END_ARG_INFO()
99

10+
#define arginfo_class_PDO_dbh_constructor arginfo_class_PDO___construct
11+
1012
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_beginTransaction, 0, 0, 0)
1113
ZEND_END_ARG_INFO()
1214

@@ -52,7 +54,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_setAttribute, 0, 0, 2)
5254
ZEND_END_ARG_INFO()
5355

5456

55-
ZEND_FUNCTION(dbh_constructor);
57+
ZEND_METHOD(PDO, dbh_constructor);
5658
ZEND_METHOD(PDO, beginTransaction);
5759
ZEND_METHOD(PDO, commit);
5860
ZEND_METHOD(PDO, errorCode);
@@ -70,7 +72,8 @@ ZEND_METHOD(PDO, setAttribute);
7072

7173

7274
static const zend_function_entry class_PDO_methods[] = {
73-
ZEND_ME_MAPPING(__construct, dbh_constructor, arginfo_class_PDO___construct, ZEND_ACC_PUBLIC)
75+
ZEND_MALIAS(PDO, PDO::__construct, dbh_constructor, arginfo_class_PDO___construct, ZEND_ACC_PUBLIC)
76+
ZEND_ME(PDO, dbh_constructor, arginfo_class_PDO_dbh_constructor, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
7477
ZEND_ME(PDO, beginTransaction, arginfo_class_PDO_beginTransaction, ZEND_ACC_PUBLIC)
7578
ZEND_ME(PDO, commit, arginfo_class_PDO_commit, ZEND_ACC_PUBLIC)
7679
ZEND_ME(PDO, errorCode, arginfo_class_PDO_errorCode, ZEND_ACC_PUBLIC)

0 commit comments

Comments
 (0)