diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-04-14 11:32:33 +0200 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-04-14 11:49:02 +0200 |
| commit | 1c469adb8b208e643086186a5e60a1df59ca2582 (patch) | |
| tree | eb149d3cb8695380a03372a3818a1558b6a613fb | |
| parent | c6485535c26f4c42253cef6ce95c10ab44a96560 (diff) | |
| download | php-git-1c469adb8b208e643086186a5e60a1df59ca2582.tar.gz | |
Remove PDO::dbh_constructor()
| -rw-r--r-- | ext/pdo/pdo_dbh.c | 5 | ||||
| -rw-r--r-- | ext/pdo/pdo_dbh.stub.php | 1 | ||||
| -rw-r--r-- | ext/pdo/pdo_dbh_arginfo.h | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 5694039593..4ff5da3e13 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -190,9 +190,8 @@ static char *dsn_from_uri(char *uri, char *buf, size_t buflen) /* {{{ */ } /* }}} */ -/* {{{ proto PDO::__construct(string dsn[, string username[, string passwd [, array options]]]) - */ -PHP_METHOD(PDO, dbh_constructor) +/* {{{ proto PDO::__construct(string dsn[, string username[, string passwd [, array options]]]) */ +PHP_METHOD(PDO, __construct) { zval *object = ZEND_THIS; pdo_dbh_t *dbh = NULL; diff --git a/ext/pdo/pdo_dbh.stub.php b/ext/pdo/pdo_dbh.stub.php index a743fb3a20..e0ecf122ff 100644 --- a/ext/pdo/pdo_dbh.stub.php +++ b/ext/pdo/pdo_dbh.stub.php @@ -4,7 +4,6 @@ class PDO { - /** @alias PDO::dbh_constructor */ public function __construct(string $dsn, ?string $username = null, ?string $passwd = null, ?array $options = null) {} /** @return bool */ diff --git a/ext/pdo/pdo_dbh_arginfo.h b/ext/pdo/pdo_dbh_arginfo.h index e82bf0c18e..1f9e7c33f4 100644 --- a/ext/pdo/pdo_dbh_arginfo.h +++ b/ext/pdo/pdo_dbh_arginfo.h @@ -52,7 +52,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_setAttribute, 0, 0, 2) ZEND_END_ARG_INFO() -ZEND_METHOD(PDO, dbh_constructor); +ZEND_METHOD(PDO, __construct); ZEND_METHOD(PDO, beginTransaction); ZEND_METHOD(PDO, commit); ZEND_METHOD(PDO, errorCode); @@ -70,7 +70,7 @@ ZEND_METHOD(PDO, setAttribute); static const zend_function_entry class_PDO_methods[] = { - ZEND_MALIAS(PDO, __construct, dbh_constructor, arginfo_class_PDO___construct, ZEND_ACC_PUBLIC) + ZEND_ME(PDO, __construct, arginfo_class_PDO___construct, ZEND_ACC_PUBLIC) ZEND_ME(PDO, beginTransaction, arginfo_class_PDO_beginTransaction, ZEND_ACC_PUBLIC) ZEND_ME(PDO, commit, arginfo_class_PDO_commit, ZEND_ACC_PUBLIC) ZEND_ME(PDO, errorCode, arginfo_class_PDO_errorCode, ZEND_ACC_PUBLIC) |