Changed the wording of the error message

"cannot be used in MYSQLI_USE_RESULT mode" sounds more correct than "cannot be used with MYSQLI_USE_RESULT"

Closes GH-6137.

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 88e6e91cd151aac46e7f0a93f84bce8a713b78a1..e949053af0a40a71674ee26a32e91b3ce43544b3 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -740,9 +740,9 @@ PHP_FUNCTION(mysqli_data_seek)
 
        if (mysqli_result_is_unbuffered(result)) {
                if (getThis()) {
-                       zend_throw_error(NULL, "mysqli_result::data_seek() cannot be used with MYSQLI_USE_RESULT");
+                       zend_throw_error(NULL, "mysqli_result::data_seek() cannot be used in MYSQLI_USE_RESULT mode");
                } else {
-                       zend_throw_error(NULL, "mysqli_data_seek() cannot be used with MYSQLI_USE_RESULT");
+                       zend_throw_error(NULL, "mysqli_data_seek() cannot be used in MYSQLI_USE_RESULT mode");
                }
                RETURN_THROWS();
        }
@@ -1626,7 +1626,7 @@ PHP_FUNCTION(mysqli_num_rows)
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
 
        if (mysqli_result_is_unbuffered_and_not_everything_is_fetched(result)) {
-               zend_throw_error(NULL, "mysqli_num_rows() cannot be used with MYSQLI_USE_RESULT");
+               zend_throw_error(NULL, "mysqli_num_rows() cannot be used in MYSQLI_USE_RESULT mode");
                RETURN_THROWS();
        }
 

diff --git a/ext/mysqli/tests/bug55582.phpt b/ext/mysqli/tests/bug55582.phpt
index 817f7eecfe557cfab9476e2af1c8bf836cbf48a5..e66b4f14cfb5ebb42a5954b78a1b6454954e8019 100644 (file)
--- a/ext/mysqli/tests/bug55582.phpt
+++ b/ext/mysqli/tests/bug55582.phpt
@@ -34,12 +34,12 @@ require_once("connect.inc");
 ?>
 --EXPECT--
 bool(true)
-mysqli_num_rows() cannot be used with MYSQLI_USE_RESULT
+mysqli_num_rows() cannot be used in MYSQLI_USE_RESULT mode
 array(1) {
   [1]=>
   string(1) "1"
 }
-mysqli_num_rows() cannot be used with MYSQLI_USE_RESULT
+mysqli_num_rows() cannot be used in MYSQLI_USE_RESULT mode
 NULL
 int(1)
 done

diff --git a/ext/mysqli/tests/mysqli_data_seek.phpt b/ext/mysqli/tests/mysqli_data_seek.phpt
index 2b477af3fd4b12a7b6ed698b24cd0910595c0d45..d467d3cf1a767277d5f7fdc52602081f53153a4a 100644 (file)
--- a/ext/mysqli/tests/mysqli_data_seek.phpt
+++ b/ext/mysqli/tests/mysqli_data_seek.phpt
@@ -66,6 +66,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECT--
 mysqli_data_seek(): Argument #2 ($offset) must be greater than or equal to 0
-mysqli_data_seek() cannot be used with MYSQLI_USE_RESULT
+mysqli_data_seek() cannot be used in MYSQLI_USE_RESULT mode
 mysqli_result object is already closed
 done!

diff --git a/ext/mysqli/tests/mysqli_data_seek_oo.phpt b/ext/mysqli/tests/mysqli_data_seek_oo.phpt
index ccbf86542ac5960e68057a80b9b7aa7b3043249c..e945199d1b7b178765f569594a4bc191fec428be 100644 (file)
--- a/ext/mysqli/tests/mysqli_data_seek_oo.phpt
+++ b/ext/mysqli/tests/mysqli_data_seek_oo.phpt
@@ -78,6 +78,6 @@ require_once('skipifconnectfailure.inc');
 --EXPECT--
 mysqli_result object is already closed
 mysqli_result::data_seek(): Argument #1 ($offset) must be greater than or equal to 0
-mysqli_result::data_seek() cannot be used with MYSQLI_USE_RESULT
+mysqli_result::data_seek() cannot be used in MYSQLI_USE_RESULT mode
 mysqli_result object is already closed
 done!

diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt
index 4d09c256823a767b3f71618ca5d6e9ac95fa0ea1..16b3aacd8096f23a169495a3449c321ba6620c82 100644 (file)
--- a/ext/mysqli/tests/mysqli_num_rows.phpt
+++ b/ext/mysqli/tests/mysqli_num_rows.phpt
@@ -80,5 +80,5 @@ mysqli_result object is already closed
 mysqli_result object is already closed
 mysqli_result object is already closed
 run_tests.php don't fool me with your 'ungreedy' expression '.+?'!
-mysqli_num_rows() cannot be used with MYSQLI_USE_RESULT
+mysqli_num_rows() cannot be used in MYSQLI_USE_RESULT mode
 done!

diff --git a/ext/mysqli/tests/mysqli_use_result.phpt b/ext/mysqli/tests/mysqli_use_result.phpt
index c309d3e3910b58ac587f173b47aa51f767c4342f..a6d432d1fb44394fb8b9672d5d2db4821659c7ef 100644 (file)
--- a/ext/mysqli/tests/mysqli_use_result.phpt
+++ b/ext/mysqli/tests/mysqli_use_result.phpt
@@ -56,6 +56,6 @@ require_once('skipifconnectfailure.inc');
        require_once("clean_table.inc");
 ?>
 --EXPECT--
-mysqli_data_seek() cannot be used with MYSQLI_USE_RESULT
+mysqli_data_seek() cannot be used in MYSQLI_USE_RESULT mode
 mysqli object is already closed
 done!