Merge branch 'PHP-7.3'

petk · petk · commit 4828fb7b6b84 · 2018-10-30T00:24:20.000+01:00
* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  fix bug #77079
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -1838,7 +1838,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
 /* }}} */
 
 
-/* {{{ proto object odbc_fetch_object(int result [, int rownumber])
+/* {{{ proto object odbc_fetch_object(resource result [, int rownumber])
    Fetch a result row as an object */
 PHP_FUNCTION(odbc_fetch_object)
 {
@@ -1849,7 +1849,7 @@ PHP_FUNCTION(odbc_fetch_object)
 }
 /* }}} */
 
-/* {{{ proto array odbc_fetch_array(int result [, int rownumber])
+/* {{{ proto array odbc_fetch_array(resource result [, int rownumber])
    Fetch a result row as an associative array */
 PHP_FUNCTION(odbc_fetch_array)
 {

Original file line number	Diff line number	Diff line change
`@@ -1838,7 +1838,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)`
`1838`	`1838`	`/* }}} */`
`1839`	`1839`
`1840`	`1840`
`1841`		`-/* {{{ proto object odbc_fetch_object(int result [, int rownumber])`
	`1841`	`+/* {{{ proto object odbc_fetch_object(resource result [, int rownumber])`
`1842`	`1842`	`Fetch a result row as an object */`
`1843`	`1843`	`PHP_FUNCTION(odbc_fetch_object)`
`1844`	`1844`	`{`
`@@ -1849,7 +1849,7 @@ PHP_FUNCTION(odbc_fetch_object)`
`1849`	`1849`	`}`
`1850`	`1850`	`/* }}} */`
`1851`	`1851`
`1852`		`-/* {{{ proto array odbc_fetch_array(int result [, int rownumber])`
	`1852`	`+/* {{{ proto array odbc_fetch_array(resource result [, int rownumber])`
`1853`	`1853`	`Fetch a result row as an associative array */`
`1854`	`1854`	`PHP_FUNCTION(odbc_fetch_array)`
`1855`	`1855`	`{`