summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMáté Kocsis <kocsismate@woohoolabs.com>2021-03-25 19:32:21 +0100
committerMáté Kocsis <kocsismate@woohoolabs.com>2021-03-25 19:32:21 +0100
commitaa45eedef0ded065f2f6ec33250747ad50558527 (patch)
tree5d81bd4ea4ba30adf091c168cc71f72e773ef720
parent22fc52248348763f0d31249ce930489c80a891bb (diff)
parentd7ae64627f1aade996c27914bc86dc2f504f4e82 (diff)
downloadphp-git-aa45eedef0ded065f2f6ec33250747ad50558527.tar.gz
Merge branch 'PHP-8.0'
-rw-r--r--ext/pdo/pdo_stmt.stub.php2
-rw-r--r--ext/pdo/pdo_stmt_arginfo.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo/pdo_stmt.stub.php b/ext/pdo/pdo_stmt.stub.php
index 18e79e56b9..3a873b307e 100644
--- a/ext/pdo/pdo_stmt.stub.php
+++ b/ext/pdo/pdo_stmt.stub.php
@@ -7,7 +7,7 @@ class PDOStatement implements IteratorAggregate
public string $queryString;
/** @return bool */
- public function bindColumn(string|int $column, mixed &$var, int $type = 0, int $maxLength = 0, mixed $driverOptions = null) {}
+ public function bindColumn(string|int $column, mixed &$var, int $type = PDO::PARAM_STR, int $maxLength = 0, mixed $driverOptions = null) {}
/** @return bool */
public function bindParam(string|int $param, mixed &$var, int $type = PDO::PARAM_STR, int $maxLength = 0, mixed $driverOptions = null) {}
diff --git a/ext/pdo/pdo_stmt_arginfo.h b/ext/pdo/pdo_stmt_arginfo.h
index 282938f52a..cd3e0549b4 100644
--- a/ext/pdo/pdo_stmt_arginfo.h
+++ b/ext/pdo/pdo_stmt_arginfo.h
@@ -1,10 +1,10 @@
/* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1b8043ec5e3e621819c85828daf9316136fef62e */
+ * Stub hash: 3bde9f58b85bc33ff6e4414b7802f42e10e4eab0 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_bindColumn, 0, 0, 2)
ZEND_ARG_TYPE_MASK(0, column, MAY_BE_STRING|MAY_BE_LONG, NULL)
ZEND_ARG_TYPE_INFO(1, var, IS_MIXED, 0)
- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "0")
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "PDO::PARAM_STR")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, maxLength, IS_LONG, 0, "0")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, driverOptions, IS_MIXED, 0, "null")
ZEND_END_ARG_INFO()