Merge branch 'PHP-7.1'

diff --cc ext/pdo_sqlite/sqlite_driver.c
index c5fd54cfb4a6ced6fd73495984aed4c2e4775ad6,71bac8580afe70794e1b17b9af14cb6bfcfbd765..1e3e071fef7db464c2e8c2f47ddf041cf277c09c
--- 1/ext/pdo_sqlite/sqlite_driver.c
--- 2/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;

diff --cc ext/sqlite3/sqlite3.c
Simple merge