summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Villepinte <fabien.villepinte@gmail.com>2017-10-29 09:14:56 +0100
committerJoe Watkins <krakjoe@php.net>2017-10-30 06:55:00 +0000
commite6aea3dc78ca8ab1634163cdb82a1140b9b97eb4 (patch)
treeb78d7ea0f89e48d9950f3ea02b9e7e28684b2a52
parent123b1d79eb4d056b3b13c539968e9c128d20d313 (diff)
downloadphp-git-e6aea3dc78ca8ab1634163cdb82a1140b9b97eb4.tar.gz
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
-rw-r--r--NEWS3
-rw-r--r--ext/interbase/interbase.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 1dc5cf632e..6d579a378f 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,9 @@ PHP NEWS
. Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead
of destination). (andrewnester)
+- interbase:
+ . Fixed bug #75453 (Incorrect reflection for ibase_[p]connect). (villfa)
+
- Mysqli:
. Fixed bug #75434 (Wrong reflection for mysqli_fetch_all function). (Fabien
Villepinte)
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 50851b9cf0..ac870598ac 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -53,7 +53,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_ibase_errcode, 0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 0)
ZEND_ARG_INFO(0, database)
ZEND_ARG_INFO(0, username)
ZEND_ARG_INFO(0, password)
@@ -63,7 +63,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1)
ZEND_ARG_INFO(0, role)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 0)
ZEND_ARG_INFO(0, database)
ZEND_ARG_INFO(0, username)
ZEND_ARG_INFO(0, password)
@@ -1030,7 +1030,7 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
}
/* }}} */
-/* {{{ proto resource ibase_connect(string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]])
+/* {{{ proto resource ibase_connect([string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]]])
Open a connection to an InterBase database */
PHP_FUNCTION(ibase_connect)
{
@@ -1038,7 +1038,7 @@ PHP_FUNCTION(ibase_connect)
}
/* }}} */
-/* {{{ proto resource ibase_pconnect(string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]])
+/* {{{ proto resource ibase_pconnect([string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]]])
Open a persistent connection to an InterBase database */
PHP_FUNCTION(ibase_pconnect)
{