From 8775bead3acf436e2f5da6049ef21d64c77d9f82 Mon Sep 17 00:00:00 2001 From: Jon Allen Date: Mon, 29 Oct 2018 14:44:37 +0100 Subject: [PATCH 1/4] fix bug #77079 --- ext/odbc/php_odbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index be46caf3154..643feabf27f 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -1845,7 +1845,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) { @@ -1856,7 +1856,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) { From 91a11111606e4b5c0e8ecf7f7a7f69f5f8e23ef1 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 30 Oct 2018 00:22:03 +0100 Subject: [PATCH 2/4] [ci skip] Update NEWS --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index c801b72b4ea..50683524e61 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2018, PHP 7.1.25 +- ODBC: + . Fixed bug #77079 (odbc_fetch_object has incorrect type signature). + (Jon Allen) + - Opcache: . Fixed bug #77058 (Type inference in opcache causes side effects). (Nikita) From 69496a04ff5fc869a3a1f774db4dc7b73b9b104a Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 30 Oct 2018 00:23:20 +0100 Subject: [PATCH 3/4] [ci skip] Update NEWS --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 2afd173a85e..677fc21325b 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2018, PHP 7.2.13 +- ODBC: + . Fixed bug #77079 (odbc_fetch_object has incorrect type signature). + (Jon Allen) + - Opcache: . Fixed bug #77058 (Type inference in opcache causes side effects). (Nikita) From 17df3a194b965256447fd253c46f0aaca4d5fdbd Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 30 Oct 2018 00:24:07 +0100 Subject: [PATCH 4/4] [ci skip] Update NEWS --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index b0ce0d795c4..17dbea657db 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.3.0RC5 +- ODBC: + . Fixed bug #77079 (odbc_fetch_object has incorrect type signature). + (Jon Allen) + - Opcache: . Fixed bug #77058 (Type inference in opcache causes side effects). (Nikita)