From 1efbab666ac04ff4bbdb5490877edb5a216f41fb Mon Sep 17 00:00:00 2001 From: David Puglielli Date: Fri, 17 Nov 2017 15:04:12 -0800 Subject: [PATCH 1/2] Fixed test issue with PHP 7.2 --- test/functional/sqlsrv/sqlsrv_empty_result_error.phpt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt b/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt index 7635e749..df41ee4c 100644 --- a/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt +++ b/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt @@ -31,8 +31,12 @@ $errorFuncSeq = 'getFuncSeqError'; function CheckError($expectedErrors) { $actualErrors = sqlsrv_errors(); + $sizeActualErrors = 0; + if (!is_null($actualErrors)) { + $sizeActualErrors = sizeof($actualErrors); + } - if (sizeof($actualErrors) != sizeof($expectedErrors)) { + if ($sizeActualErrors) != sizeof($expectedErrors)) { echo "Wrong size for error array\n"; print_r($actualErrors); return; From 873fe47b1dd68918956dd3f120c55f0c62e68084 Mon Sep 17 00:00:00 2001 From: David Puglielli Date: Fri, 17 Nov 2017 15:26:02 -0800 Subject: [PATCH 2/2] Fixed typo --- test/functional/sqlsrv/sqlsrv_empty_result_error.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt b/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt index df41ee4c..7f751324 100644 --- a/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt +++ b/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt @@ -36,7 +36,7 @@ function CheckError($expectedErrors) $sizeActualErrors = sizeof($actualErrors); } - if ($sizeActualErrors) != sizeof($expectedErrors)) { + if (($sizeActualErrors) != sizeof($expectedErrors)) { echo "Wrong size for error array\n"; print_r($actualErrors); return;