diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-01-28 13:34:33 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-01-28 13:34:33 +0100 |
| commit | 18c2d4500622d71e5754eb60abbaa1e46998b110 (patch) | |
| tree | d62aa049bec6f3fc91383d53b6fe1c2286d692dd | |
| parent | 07f3bac6caca5cb1605cb18ab819bcd8c0fa4291 (diff) | |
| parent | e8bf18bd9f78a38316c7e0eca183e0591d9e1cb4 (diff) | |
| download | php-git-18c2d4500622d71e5754eb60abbaa1e46998b110.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | ext/pdo/pdo_dbh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 3ede0ec20b..d17867d1f9 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -196,7 +196,7 @@ static char *dsn_from_uri(char *uri, char *buf, size_t buflen TSRMLS_DC) /* {{{ } /* }}} */ -/* {{{ proto void PDO::__construct(string dsn, string username, string passwd [, array options]) +/* {{{ proto void PDO::__construct(string dsn[, string username[, string passwd [, array options]]]) */ static PHP_METHOD(PDO, dbh_constructor) { @@ -1226,7 +1226,7 @@ static PHP_METHOD(PDO, getAvailableDrivers) /* }}} */ /* {{{ arginfo */ -ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo___construct, 0, 0, 3) +ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo___construct, 0, 0, 1) ZEND_ARG_INFO(0, dsn) ZEND_ARG_INFO(0, username) ZEND_ARG_INFO(0, passwd) |