Skip to content

Commit 609ed65

Browse files
committed
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
2 parents 0c09c45 + f9986d4 commit 609ed65

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

interbase.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ZEND_END_ARG_INFO()
5353
ZEND_BEGIN_ARG_INFO(arginfo_ibase_errcode, 0)
5454
ZEND_END_ARG_INFO()
5555

56-
ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1)
56+
ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 0)
5757
ZEND_ARG_INFO(0, database)
5858
ZEND_ARG_INFO(0, username)
5959
ZEND_ARG_INFO(0, password)
@@ -63,7 +63,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1)
6363
ZEND_ARG_INFO(0, role)
6464
ZEND_END_ARG_INFO()
6565

66-
ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 1)
66+
ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 0)
6767
ZEND_ARG_INFO(0, database)
6868
ZEND_ARG_INFO(0, username)
6969
ZEND_ARG_INFO(0, password)
@@ -1030,15 +1030,15 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
10301030
}
10311031
/* }}} */
10321032

1033-
/* {{{ proto resource ibase_connect(string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]])
1033+
/* {{{ proto resource ibase_connect([string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]]])
10341034
Open a connection to an InterBase database */
10351035
PHP_FUNCTION(ibase_connect)
10361036
{
10371037
_php_ibase_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
10381038
}
10391039
/* }}} */
10401040

1041-
/* {{{ proto resource ibase_pconnect(string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]])
1041+
/* {{{ proto resource ibase_pconnect([string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]]])
10421042
Open a persistent connection to an InterBase database */
10431043
PHP_FUNCTION(ibase_pconnect)
10441044
{

0 commit comments

Comments
 (0)