Skip to content

Commit 4baf6a6

Browse files
committed
Fix error message and add UPGRADING entry
1 parent 8f1c430 commit 4baf6a6

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

UPGRADING

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -874,6 +874,8 @@ PHP 8.4 UPGRADE NOTES
874874
- Mysqli:
875875
. The unused and undocumented constant MYSQLI_SET_CHARSET_DIR
876876
has been removed.
877+
. The MYSQLI_STMT_ATTR_PREFETCH_ROWS constant has been removed.
878+
The feature is unavailable with mysqlnd.
877879

878880
- OpenSSL:
879881
. The OpenSSL extension now requires at least OpenSSL 1.1.1.

ext/mysqli/mysqli_api.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1752,8 +1752,8 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
17521752
mode_p = &mode;
17531753
break;
17541754
default:
1755-
zend_argument_value_error(ERROR_ARG_POS(2), "must be one of "
1756-
"MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH or STMT_ATTR_CURSOR_TYPE");
1755+
zend_argument_value_error(ERROR_ARG_POS(2), "must be either "
1756+
"MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH or MYSQLI_STMT_ATTR_CURSOR_TYPE");
17571757
RETURN_THROWS();
17581758
}
17591759

@@ -1783,8 +1783,8 @@ PHP_FUNCTION(mysqli_stmt_attr_get)
17831783
if ((rc = mysql_stmt_attr_get(stmt->stmt, attr, &value))) {
17841784
/* Success corresponds to 0 return value and a non-zero value
17851785
* should only happen if the attr/option is unknown */
1786-
zend_argument_value_error(ERROR_ARG_POS(2), "must be one of "
1787-
"MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH or STMT_ATTR_CURSOR_TYPE");
1786+
zend_argument_value_error(ERROR_ARG_POS(2), "must be either "
1787+
"MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH or MYSQLI_STMT_ATTR_CURSOR_TYPE");
17881788
RETURN_THROWS();
17891789
}
17901790

ext/mysqli/tests/mysqli_stmt_attr_get.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require_once 'skipifconnectfailure.inc';
5050
require_once 'clean_table.inc';
5151
?>
5252
--EXPECT--
53-
mysqli_stmt_attr_get(): Argument #2 ($attribute) must be one of MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH or STMT_ATTR_CURSOR_TYPE
53+
mysqli_stmt_attr_get(): Argument #2 ($attribute) must be either MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH or MYSQLI_STMT_ATTR_CURSOR_TYPE
5454
mysqli_stmt object is already closed
5555
mysqli_stmt object is already closed
5656
done!

ext/mysqli/tests/mysqli_stmt_attr_set.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ require_once 'skipifconnectfailure.inc';
169169
?>
170170
--EXPECT--
171171
Error: mysqli_stmt object is not fully initialized
172-
mysqli_stmt_attr_set(): Argument #2 ($attribute) must be one of MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH or STMT_ATTR_CURSOR_TYPE
172+
mysqli_stmt_attr_set(): Argument #2 ($attribute) must be either MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH or MYSQLI_STMT_ATTR_CURSOR_TYPE
173173
mysqli_stmt::attr_set(): Argument #2 ($value) must be 0 or 1 for attribute MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH
174174
bool(true)
175175
mysqli_stmt::attr_set(): Argument #2 ($value) must be one of the MYSQLI_CURSOR_TYPE_* constants for attribute MYSQLI_STMT_ATTR_CURSOR_TYPE

0 commit comments

Comments
 (0)