From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 12 Mar 2017 16:04:02 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~276
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e31342ef843f98523722b2d37ea23190bf2781af;p=php

Merge branch 'PHP-7.1'
---

e31342ef843f98523722b2d37ea23190bf2781af
diff --cc ext/pdo_sqlite/sqlite_driver.c
index c5fd54cfb4,71bac8580a..1e3e071fef
--- a/ext/pdo_sqlite/sqlite_driver.c
+++ b/ext/pdo_sqlite/sqlite_driver.c
@@@ -519,12 -520,10 +520,13 @@@ static PHP_METHOD(SQLite, sqliteCreateF
  	pdo_sqlite_db_handle *H;
  	int ret;
  
- 	ZEND_PARSE_PARAMETERS_START(2, 3)
 -	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sz|ll",
 -			&func_name, &func_name_len, &callback, &argc, &flags)) {
 -		RETURN_FALSE;
 -	}
++	ZEND_PARSE_PARAMETERS_START(2, 4)
 +		Z_PARAM_STRING(func_name, func_name_len)
 +		Z_PARAM_ZVAL_DEREF(callback)
 +		Z_PARAM_OPTIONAL
 +		Z_PARAM_LONG(argc)
++		Z_PARAM_LONG(flags)
 +	ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
  
  	dbh = Z_PDO_DBH_P(getThis());
  	PDO_CONSTRUCT_CHECK;