Skip to content

Commit b6b4a62

Browse files
grooverdancmb69
authored andcommitted
ext/mysqli tests "using password" optional in error messages
Closes GH-10035.
1 parent adc2382 commit b6b4a62

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ext/mysqli/tests/mysqli_connect_oo.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ require_once('skipifconnectfailure.inc');
149149
print "done!";
150150
?>
151151
--EXPECTF--
152-
Warning: mysqli::__construct(): (%s/%d): Access denied for user '%sunknown%s'@'%s' (using password: %s) in %s on line %d
152+
Warning: mysqli::__construct(): (%s/%d): Access denied for user '%sunknown%s'@'%s' %r(\(using password: \w+\) ){0,1}%rin %s on line %d
153153
mysqli object is not fully initialized
154154
mysqli object is not fully initialized
155155
... and now Exceptions
156-
Access denied for user '%s'@'%s' (using password: %s)
156+
Access denied for user '%s'@'%s'%r( \(using password: \w+\)){0,1}%r
157157
done!

ext/mysqli/tests/mysqli_real_connect.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ mysqli.allow_local_infile=1
153153
require_once("clean_table.inc");
154154
?>
155155
--EXPECTF--
156-
Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
156+
Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' %r(\(using password: \w+\) ){0,1}%rin %s on line %d
157157
object(mysqli)#%d (%d) {
158158
["client_info"]=>
159159
string(%d) "%s"

ext/mysqli/tests/mysqli_real_connect_pconn.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,5 @@ mysqli.max_persistent=10
152152
require_once("clean_table.inc");
153153
?>
154154
--EXPECTF--
155-
Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
155+
Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' %r(\(using password: \w+\) ){0,1}%rin %s on line %d
156156
done!

ext/mysqli/tests/mysqli_report.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,6 @@ Warning: mysqli_stmt_attr_set(): (%s/%d): Not implemented in %s on line %d
339339
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
340340

341341
Warning: mysqli_stmt_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
342-
[013] Access denied for user '%s'@'%s' (using password: YES)
343-
[016] Access denied for user '%s'@'%s' (using password: YES)
342+
[013] Access denied for user '%s'@'%s'%r( \(using password: \w+\)){0,1}%r
343+
[016] Access denied for user '%s'@'%s'%r( \(using password: \w+\)){0,1}%r
344344
done!

0 commit comments

Comments
 (0)