From afe52eadf7e09d05d66545c755efa364d17bde77 Mon Sep 17 00:00:00 2001
From: Tom Van Looy <tom@ctors.net>
Date: Fri, 15 Nov 2019 19:54:23 +0100
Subject: [PATCH 1/2] Add ext/pdo stubs

---
 ext/pdo/pdo.stub.php  | 240 ++++++++++++++++++++++++++++++++++++++++++
 ext/pdo/pdo_arginfo.h | 125 ++++++++++++++++++++++
 ext/pdo/pdo_dbh.c     |  71 ++++---------
 ext/pdo/pdo_stmt.c    | 111 ++++---------------
 4 files changed, 404 insertions(+), 143 deletions(-)
 create mode 100644 ext/pdo/pdo.stub.php
 create mode 100644 ext/pdo/pdo_arginfo.h

diff --git a/ext/pdo/pdo.stub.php b/ext/pdo/pdo.stub.php
new file mode 100644
index 0000000000000..245c77e701da4
--- /dev/null
+++ b/ext/pdo/pdo.stub.php
@@ -0,0 +1,240 @@
+<?php
+
+class PDO
+{
+	public function __construct(string $dsn, ?string $username = null, ?string $passwd = null, ?array $options = null);
+
+	/**
+	 * @param string $statement
+	 * @param array $options
+	 *
+	 * @return PDOStatement|false
+	 */
+	public function prepare(string $statement, array $options = []);
+
+	/**
+	 * @return bool
+	 */
+	public function beginTransaction();
+
+	/**
+	 * @return bool
+	 */
+	public function commit();
+
+	/**
+	 * @return bool
+	 */
+	public function rollBack();
+
+	/**
+	 * @return bool
+	 */
+	public function inTransaction();
+
+	/**
+	 * @param int $attribute
+	 * @param mixed $value
+	 *
+	 * @return bool
+	 */
+	public function setAttribute(int $attribute, $value);
+
+	/**
+	 * @param string $query
+	 *
+	 * @return int|false
+	 */
+	public function exec(string $query);
+
+	/**
+	 * @param string $sql
+	 *
+	 * @return object
+	 */
+	public function query(string $sql);
+
+	/**
+	 * @param ?string $seqname = null
+	 *
+	 * @return int|false
+	 */
+	public function lastInsertId(?string $seqname = null);
+
+	/**
+	 * @return string|null
+	 */
+	public function errorCode();
+
+	/**
+	 * @return array
+	 */
+	public function errorInfo();
+
+	/**
+	 * @param int $attribute
+	 *
+	 * @return mixed
+	 */
+	public function getAttribute(int $attribute);
+
+	/**
+	 * @param string $string
+	 * @param int $paramtype
+	 *
+	 * @return string|false
+	 */
+	public function quote(string $string, int $paramtype = 0);
+
+	/**
+	 * @return array
+	 */
+	public static function getAvailableDrivers();
+}
+
+class PDOException
+{
+}
+
+class PDOStatement
+{
+	/**
+	 * @param array $bound_input_params
+	 *
+	 * @return bool
+	 */
+	public function execute(?array $bound_input_params = null);
+
+	/**
+	 * @param ?int $how = PDO_FETCH_BOTH
+	 * @param ?int $orientation
+	 * @param ?int $offset
+	 *
+	 * @return mixed
+	 */
+	public function fetch(int $how = PDO_FETCH_BOTH, int $orientation = 0, int $offset = 0);
+
+    /**
+	 * @param int|string $paramno
+	 * @param mixed &$param
+	 * @param int $type
+	 * @param int $maxlen
+	 * @param ?mixed $driverdata
+	 *
+	 * @return bool
+	 */
+	public function bindParam($paramno, &$param, $type = 0, $maxlen = 0, $driverdata = null);
+
+	/**
+	 * @param int|string $paramno
+	 * @param mixed &$param
+	 * @param int $type
+	 * @param int $maxlen
+	 * @param ?mixed $driverdata
+	 *
+	 * @return bool
+	 */
+	public function bindColumn($paramno, &$param, $type = 0, $maxlen = 0, $driverdata = null);
+
+	/**
+	 * @param int|string $paramno
+	 * @param mixed $param
+	 * @param int $type
+	 *
+	 * @return bool
+	 */
+	public function bindValue($paramno, $param, int $type = 0);
+
+    /**
+     * @return int
+     */
+	public function rowCount();
+
+	/**
+	 * @param int $column_number
+	 *
+	 * @return string|false
+	 */
+	public function fetchColumn(int $column_number = 0);
+
+	/**
+	 * @param int $how
+	 * @param string $class_name
+	 * @param ?array $ctor_args
+	 *
+	 * @return array|false
+	 */
+	public function fetchAll($how = PDO_FETCH_BOTH, $class_name = '', $ctor_args = null);
+
+	/**
+	 * @param string $class_name
+	 * @param ?array $ctor_args
+	 *
+	 * @return mixed
+	 */
+	public function fetchObject(string $class_name = '', ?array $ctor_args = null);
+
+	/**
+	 * @return string|null
+	 */
+	public function errorCode();
+
+	/**
+	 * @return array
+	 */
+	public function errorInfo();
+
+	/**
+	 * @param int $attribute
+	 * @param mixed $value
+	 *
+	 * @return bool
+	 */
+	public function setAttribute(int $attribute, mixed $value);
+
+	/**
+	 * @param int $attribute
+	 *
+	 * @return mixed
+	 */
+	public function getAttribute(int $attribute);
+
+	/**
+	 * @return int
+	 */
+	public function columnCount();
+
+	/**
+	 * @param int $column
+	 *
+	 * @return array|false
+	 */
+	public function getColumnMeta(int $column);
+
+	/**
+	 * @param int $mode
+	 * @param ?mixed $params
+	 *
+	 * @return bool
+	 */
+	public function setFetchMode($mode, $params = null);
+
+	/**
+	 * @return bool
+	 */
+	public function nextRowset();
+
+	/**
+	 * @return bool
+	 */
+	public function closeCursor();
+
+	/**
+	 * @return void|false
+	 */
+	public function debugDumpParams();
+}
+
+class PDORow
+{
+}
diff --git a/ext/pdo/pdo_arginfo.h b/ext/pdo/pdo_arginfo.h
new file mode 100644
index 0000000000000..fee761385fc5d
--- /dev/null
+++ b/ext/pdo/pdo_arginfo.h
@@ -0,0 +1,125 @@
+/* This is a generated file, edit the .stub.php file instead. */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, dsn, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, username, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, passwd, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_prepare, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_beginTransaction, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_PDO_commit arginfo_class_PDO_beginTransaction
+
+#define arginfo_class_PDO_rollBack arginfo_class_PDO_beginTransaction
+
+#define arginfo_class_PDO_inTransaction arginfo_class_PDO_beginTransaction
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_setAttribute, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
+	ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_exec, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_query, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, sql, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_lastInsertId, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO(0, seqname, IS_STRING, 1)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_PDO_errorCode arginfo_class_PDO_beginTransaction
+
+#define arginfo_class_PDO_errorInfo arginfo_class_PDO_beginTransaction
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_getAttribute, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_quote, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, paramtype, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_PDO_getAvailableDrivers arginfo_class_PDO_beginTransaction
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_execute, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO(0, bound_input_params, IS_ARRAY, 1)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_fetch, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO(0, how, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, orientation, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_bindParam, 0, 0, 2)
+	ZEND_ARG_INFO(0, paramno)
+	ZEND_ARG_INFO(1, param)
+	ZEND_ARG_INFO(0, type)
+	ZEND_ARG_INFO(0, maxlen)
+	ZEND_ARG_INFO(0, driverdata)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_PDOStatement_bindColumn arginfo_class_PDOStatement_bindParam
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_bindValue, 0, 0, 2)
+	ZEND_ARG_INFO(0, paramno)
+	ZEND_ARG_INFO(0, param)
+	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_PDOStatement_rowCount arginfo_class_PDO_beginTransaction
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_fetchColumn, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO(0, column_number, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_fetchAll, 0, 0, 0)
+	ZEND_ARG_INFO(0, how)
+	ZEND_ARG_INFO(0, class_name)
+	ZEND_ARG_INFO(0, ctor_args)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_fetchObject, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, ctor_args, IS_ARRAY, 1)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_PDOStatement_errorCode arginfo_class_PDO_beginTransaction
+
+#define arginfo_class_PDOStatement_errorInfo arginfo_class_PDO_beginTransaction
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_setAttribute, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
+	ZEND_ARG_OBJ_INFO(0, value, mixed, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_PDOStatement_getAttribute arginfo_class_PDO_getAttribute
+
+#define arginfo_class_PDOStatement_columnCount arginfo_class_PDO_beginTransaction
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_getColumnMeta, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, column, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_setFetchMode, 0, 0, 1)
+	ZEND_ARG_INFO(0, mode)
+	ZEND_ARG_INFO(0, params)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_PDOStatement_nextRowset arginfo_class_PDO_beginTransaction
+
+#define arginfo_class_PDOStatement_closeCursor arginfo_class_PDO_beginTransaction
+
+#define arginfo_class_PDOStatement_debugDumpParams arginfo_class_PDO_beginTransaction
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 28cca1e11b1ff..5e7c91968f9a8 100644
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -33,6 +33,8 @@
 #include "zend_hash.h"
 #include "zend_interfaces.h"
 
+#include "pdo_arginfo.h"
+
 static int pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value);
 
 void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *sqlstate, const char *supp) /* {{{ */
@@ -989,7 +991,7 @@ static PHP_METHOD(PDO, errorCode)
 }
 /* }}} */
 
-/* {{{ proto int PDO::errorInfo()
+/* {{{ proto array PDO::errorInfo()
    Fetch extended error information associated with the last operation on the database handle */
 static PHP_METHOD(PDO, errorInfo)
 {
@@ -1171,61 +1173,24 @@ static PHP_METHOD(PDO, getAvailableDrivers)
 }
 /* }}} */
 
-/* {{{ arginfo */
-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)
-	ZEND_ARG_INFO(0, options) /* array */
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_prepare, 0, 0, 1)
-	ZEND_ARG_INFO(0, statement)
-	ZEND_ARG_INFO(0, options) /* array */
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_pdo_setattribute, 0)
-	ZEND_ARG_INFO(0, attribute)
-	ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_pdo_getattribute, 0)
-	ZEND_ARG_INFO(0, attribute)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_pdo_exec, 0)
-	ZEND_ARG_INFO(0, query)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_lastinsertid, 0, 0, 0)
-	ZEND_ARG_INFO(0, seqname)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_quote, 0, 0, 1)
-	ZEND_ARG_INFO(0, string)
-	ZEND_ARG_INFO(0, paramtype)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_pdo__void, 0)
-ZEND_END_ARG_INFO()
 /* }}} */
 
 const zend_function_entry pdo_dbh_functions[] = /* {{{ */ {
-	ZEND_MALIAS(PDO, __construct, dbh_constructor,	arginfo_pdo___construct,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, prepare, 				arginfo_pdo_prepare,		ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, beginTransaction,       arginfo_pdo__void,         ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, commit,                 arginfo_pdo__void,         ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, rollBack,               arginfo_pdo__void,         ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, inTransaction,          arginfo_pdo__void,         ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, setAttribute,	arginfo_pdo_setattribute,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, exec,			arginfo_pdo_exec,		ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, query,			NULL,					ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, lastInsertId,	arginfo_pdo_lastinsertid,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, errorCode,              arginfo_pdo__void,         ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, errorInfo,              arginfo_pdo__void,         ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, getAttribute,	arginfo_pdo_getattribute,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, quote,			arginfo_pdo_quote,		ZEND_ACC_PUBLIC)
-	PHP_ME(PDO, getAvailableDrivers,    arginfo_pdo__void,         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	ZEND_MALIAS(PDO, __construct, dbh_constructor, arginfo_class_PDO___construct, ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, prepare, 			arginfo_class_PDO_prepare, 			ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, beginTransaction, 	arginfo_class_PDO_beginTransaction, ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, commit, 			arginfo_class_PDO_commit, 			ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, rollBack, 			arginfo_class_PDO_rollBack, 		ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, inTransaction, 		arginfo_class_PDO_inTransaction, 	ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, setAttribute, 		arginfo_class_PDO_setAttribute, 	ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, exec, 				arginfo_class_PDO_exec, 			ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, query, 				arginfo_class_PDO_query, 			ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, lastInsertId, 		arginfo_class_PDO_lastInsertId, 	ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, errorCode, 			arginfo_class_PDO_errorCode, 		ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, errorInfo, 			arginfo_class_PDO_errorInfo, 		ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, getAttribute, 		arginfo_class_PDO_getAttribute, 	ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, quote, 				arginfo_class_PDO_quote, 			ZEND_ACC_PUBLIC)
+	PHP_ME(PDO, getAvailableDrivers, arginfo_class_PDO_getAvailableDrivers, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_FE_END
 };
 /* }}} */
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 94caae7078cbc..bfd1ba7d5a61b 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -33,76 +33,7 @@
 #include "zend_interfaces.h"
 #include "php_memory_streams.h"
 
-/* {{{ arginfo */
-ZEND_BEGIN_ARG_INFO(arginfo_pdostatement__void, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_execute, 0, 0, 0)
-	ZEND_ARG_INFO(0, bound_input_params) /* array */
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetch, 0, 0, 0)
-	ZEND_ARG_INFO(0, how)
-	ZEND_ARG_INFO(0, orientation)
-	ZEND_ARG_INFO(0, offset)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchobject, 0, 0, 0)
-	ZEND_ARG_INFO(0, class_name)
-	ZEND_ARG_INFO(0, ctor_args) /* array */
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchcolumn, 0, 0, 0)
-	ZEND_ARG_INFO(0, column_number)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchall, 0, 0, 0)
-	ZEND_ARG_INFO(0, how)
-	ZEND_ARG_INFO(0, class_name)
-	ZEND_ARG_INFO(0, ctor_args) /* array */
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindvalue, 0, 0, 2)
-	ZEND_ARG_INFO(0, paramno)
-	ZEND_ARG_INFO(0, param)
-	ZEND_ARG_INFO(0, type)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindparam, 0, 0, 2)
-	ZEND_ARG_INFO(0, paramno)
-	ZEND_ARG_INFO(1, param)
-	ZEND_ARG_INFO(0, type)
-	ZEND_ARG_INFO(0, maxlen)
-	ZEND_ARG_INFO(0, driverdata)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindcolumn, 0, 0, 2)
-	ZEND_ARG_INFO(0, column)
-	ZEND_ARG_INFO(1, param)
-	ZEND_ARG_INFO(0, type)
-	ZEND_ARG_INFO(0, maxlen)
-	ZEND_ARG_INFO(0, driverdata)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_pdostatement_setattribute, 0)
-	ZEND_ARG_INFO(0, attribute)
-	ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_pdostatement_getattribute, 0)
-	ZEND_ARG_INFO(0, attribute)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_pdostatement_getcolumnmeta, 0)
-	ZEND_ARG_INFO(0, column)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_setfetchmode, 0, 0, 1)
-	ZEND_ARG_INFO(0, mode)
-	ZEND_ARG_INFO(0, param)
-	ZEND_ARG_INFO(0, params)
-ZEND_END_ARG_INFO()
-/* }}} */
+#include "pdo_arginfo.h"
 
 #define PHP_STMT_GET_OBJ	\
   pdo_stmt_t *stmt = Z_PDO_STMT_P(ZEND_THIS);	\
@@ -1562,7 +1493,7 @@ static int register_bound_param(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt,
 	return 1;
 } /* }}} */
 
-/* {{{ proto bool PDOStatement::bindValue(mixed $paramno, mixed $param [, int $type ])
+/* {{{ proto bool PDOStatement::bindValue(int|string $paramno, mixed $param [, int $type ])
    bind an input parameter to the value of a PHP variable.  $paramno is the 1-based position of the placeholder in the SQL statement (but can be the parameter name for drivers that support named placeholders).  It should be called prior to execute(). */
 static PHP_METHOD(PDOStatement, bindValue)
 {
@@ -2153,25 +2084,25 @@ static PHP_METHOD(PDOStatement, debugDumpParams)
 /* }}} */
 
 const zend_function_entry pdo_dbstmt_functions[] = {
-	PHP_ME(PDOStatement, execute,		arginfo_pdostatement_execute,		ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, fetch,			arginfo_pdostatement_fetch,			ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, bindParam,		arginfo_pdostatement_bindparam,		ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, bindColumn,	arginfo_pdostatement_bindcolumn,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, bindValue,		arginfo_pdostatement_bindvalue,		ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, rowCount,		arginfo_pdostatement__void,			ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, fetchColumn,	arginfo_pdostatement_fetchcolumn,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, fetchAll,		arginfo_pdostatement_fetchall,		ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, fetchObject,	arginfo_pdostatement_fetchobject,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, errorCode,		arginfo_pdostatement__void,			ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, errorInfo,		arginfo_pdostatement__void,			ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, setAttribute,	arginfo_pdostatement_setattribute,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, getAttribute,	arginfo_pdostatement_getattribute,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, columnCount,	arginfo_pdostatement__void,			ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, getColumnMeta,	arginfo_pdostatement_getcolumnmeta,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, setFetchMode,	arginfo_pdostatement_setfetchmode,	ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, nextRowset,	arginfo_pdostatement__void,			ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, closeCursor,	arginfo_pdostatement__void,			ZEND_ACC_PUBLIC)
-	PHP_ME(PDOStatement, debugDumpParams, arginfo_pdostatement__void,		ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, execute,		arginfo_class_PDOStatement_execute,				ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, fetch,			arginfo_class_PDOStatement_fetch,				ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, bindParam,		arginfo_class_PDOStatement_bindParam,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, bindColumn,	arginfo_class_PDOStatement_bindColumn,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, bindValue,		arginfo_class_PDOStatement_bindValue,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, rowCount,		arginfo_class_PDOStatement_rowCount,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, fetchColumn,	arginfo_class_PDOStatement_fetchColumn,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, fetchAll,		arginfo_class_PDOStatement_fetchAll,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, fetchObject,	arginfo_class_PDOStatement_fetchObject,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, errorCode,		arginfo_class_PDOStatement_errorCode,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, errorInfo,		arginfo_class_PDOStatement_errorInfo,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, setAttribute,	arginfo_class_PDOStatement_setAttribute,		ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, getAttribute,	arginfo_class_PDOStatement_getAttribute,		ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, columnCount,	arginfo_class_PDOStatement_columnCount,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, getColumnMeta,	arginfo_class_PDOStatement_getColumnMeta,		ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, setFetchMode,	arginfo_class_PDOStatement_setFetchMode,		ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, nextRowset,	arginfo_class_PDOStatement_nextRowset,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, closeCursor,	arginfo_class_PDOStatement_closeCursor,			ZEND_ACC_PUBLIC)
+	PHP_ME(PDOStatement, debugDumpParams, arginfo_class_PDOStatement_debugDumpParams,	ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 

From 0283f077ee58ce1f894418bc995717a2651f4474 Mon Sep 17 00:00:00 2001
From: Tom Van Looy <tom@ctors.net>
Date: Sun, 17 Nov 2019 22:29:08 +0100
Subject: [PATCH 2/2] Fix: failing test in Zend/tests/bug71428.2.php

---
 ext/pdo/pdo.stub.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/pdo/pdo.stub.php b/ext/pdo/pdo.stub.php
index 245c77e701da4..509db89e1abf3 100644
--- a/ext/pdo/pdo.stub.php
+++ b/ext/pdo/pdo.stub.php
@@ -112,7 +112,7 @@ public function execute(?array $bound_input_params = null);
 	 *
 	 * @return mixed
 	 */
-	public function fetch(int $how = PDO_FETCH_BOTH, int $orientation = 0, int $offset = 0);
+	public function fetch($how = PDO_FETCH_BOTH, $orientation = 0, $offset = 0);
 
     /**
 	 * @param int|string $paramno