Good to fix something, but don't forget to update tests

2 files changed, 52 insertions, 39 deletions

diff --git a/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt b/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt
index d0940a7561..530b4647c4 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt
@@ -68,6 +68,11 @@ require_once('skipifconnectfailure.inc');
 			@$mysqli->sqlstate, gettype(@$mysqli->sqlstate),
 			@mysqli_sqlstate($mysqli), gettype(@mysqli_sqlstate($mysqli)));
 
+		assert(@mysqli_stat($mysqli) === @$mysqli->sstat);
+		printf("mysqli->stat = '%s'/%s ('%s'/%s)\n",
+			@$mysqli->stat, gettype(@$mysqli->stat),
+			@mysqli_stat($mysqli), gettype(@mysqli_stat($mysqli)));
+
 		assert(@mysqli_get_host_info($mysqli) === @$mysqli->host_info);
 		printf("mysqli->host_info = '%s'/%s ('%s'/%s)\n",
 			@$mysqli->host_info, gettype(@$mysqli->host_info),
@@ -146,9 +151,9 @@ Without RS
 Class variables:
 affected_rows = 'NULL'
 client_info = 'NULL'
-client_version = '%s'
-connect_errno = '%s'
-connect_error = ''%s'
+client_version = '%d'
+connect_errno = '%d'
+connect_error = '%s'
 errno = 'NULL'
 error = 'NULL'
 field_count = 'NULL'
@@ -159,14 +164,15 @@ protocol_version = 'NULL'
 server_info = 'NULL'
 server_version = 'NULL'
 sqlstate = 'NULL'
+stat = 'NULL'
 thread_id = 'NULL'
 warning_count = 'NULL'
 
 Object variables:
 affected_rows = 'NULL'
 client_info = 'NULL'
-client_version = '%s'
-connect_errno = '%s'
+client_version = '%d'
+connect_errno = '%d'
 connect_error = '%s'
 errno = 'NULL'
 error = 'NULL'
@@ -176,6 +182,7 @@ info = 'NULL'
 insert_id = 'NULL'
 server_info = 'NULL'
 server_version = 'NULL'
+stat = 'NULL'
 sqlstate = 'NULL'
 protocol_version = 'NULL'
 thread_id = 'NULL'
@@ -185,17 +192,18 @@ Magic, magic properties:
 mysqli->affected_rows = ''/NULL (''/NULL)
 
 Warning: assert(): Assertion failed in %s on line %d
-mysqli->client_info = ''/NULL ('%s'/%s)
-mysqli->client_version =  '%s'/integer ('%s'/integer)
+mysqli->client_info = ''/NULL ('%s'/string)
+mysqli->client_version =  '%d'/integer ('%d'/integer)
 mysqli->errno = ''/NULL (''/NULL)
 mysqli->error = ''/NULL (''/NULL)
 mysqli->field_count = ''/NULL (''/NULL)
 mysqli->insert_id = ''/NULL (''/NULL)
 mysqli->sqlstate = ''/NULL (''/NULL)
+mysqli->stat = ''/NULL (''/NULL)
 mysqli->host_info = ''/NULL (''/NULL)
 mysqli->info = ''/NULL (''/NULL)
 
-Warning: assert(): Assertion failed in %s on line %d
+Warning: assert(): Assertion failed in %s on line 78
 mysqli->thread_id = ''/NULL (''/NULL)
 mysqli->protocol_version = ''/NULL (''/NULL)
 mysqli->server_info = ''/NULL (''/NULL)
@@ -208,15 +216,15 @@ setting mysqli->unknown, @mysqli_unknown = '13'
 setting mysqli->unknown, @mysqli_unknown = 'friday'
 
 Access hidden properties for MYSLQI_STATUS_INITIALIZED (TODO documentation):
-mysqli->connect_error = '%s'/%s)
-mysqli->connect_errno = '%s'/integer ('%s'/integer)
+mysqli->connect_error = '%s'/string ('%s'/string)
+mysqli->connect_errno = '%d'/integer ('%d'/integer)
 With RS
 
 Class variables:
 affected_rows = 'NULL'
 client_info = 'NULL'
-client_version = '%s'
-connect_errno = '%s'
+client_version = '%d'
+connect_errno = '%d'
 connect_error = '%s'
 errno = 'NULL'
 error = 'NULL'
@@ -228,14 +236,15 @@ protocol_version = 'NULL'
 server_info = 'NULL'
 server_version = 'NULL'
 sqlstate = 'NULL'
+stat = 'NULL'
 thread_id = 'NULL'
 warning_count = 'NULL'
 
 Object variables:
 affected_rows = 'NULL'
 client_info = 'NULL'
-client_version = '%s'
-connect_errno = '%s'
+client_version = '%d'
+connect_errno = '%d'
 connect_error = '%s'
 errno = 'NULL'
 error = 'NULL'
@@ -245,6 +254,7 @@ info = 'NULL'
 insert_id = 'NULL'
 server_info = 'NULL'
 server_version = 'NULL'
+stat = 'NULL'
 sqlstate = 'NULL'
 protocol_version = 'NULL'
 thread_id = 'NULL'
@@ -253,14 +263,15 @@ warning_count = 'NULL'
 Magic, magic properties:
 mysqli->affected_rows = ''/NULL (''/NULL)
 
-Warning: assert(): Assertion failed in %s on line %d
-mysqli->client_info = ''/NULL ('%s'/%s)
-mysqli->client_version =  '%s'/integer ('%s'/integer)
+Warning: assert(): Assertion failed in %s on line %s
+mysqli->client_info = ''/NULL ('%s'/string)
+mysqli->client_version =  '%d'/integer ('%d'/integer)
 mysqli->errno = ''/NULL (''/NULL)
 mysqli->error = ''/NULL (''/NULL)
 mysqli->field_count = ''/NULL (''/NULL)
 mysqli->insert_id = ''/NULL (''/NULL)
 mysqli->sqlstate = ''/NULL (''/NULL)
+mysqli->stat = ''/NULL (''/NULL)
 mysqli->host_info = ''/NULL (''/NULL)
 mysqli->info = ''/NULL (''/NULL)
 
@@ -277,6 +288,6 @@ setting mysqli->unknown, @mysqli_unknown = '13'
 setting mysqli->unknown, @mysqli_unknown = 'friday'
 
 Access hidden properties for MYSLQI_STATUS_INITIALIZED (TODO documentation):
-mysqli->connect_error = '%s'/%s)
-mysqli->connect_errno = '%s'/integer ('%s'/integer)
+mysqli->connect_error = '%s'/string ('%s'/string)
+mysqli->connect_errno = '%d'/integer ('%d'/integer)
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_real_connect.phpt b/ext/mysqli/tests/mysqli_real_connect.phpt
index 2c371328b9..b9ba98693f 100644
--- a/ext/mysqli/tests/mysqli_real_connect.phpt
+++ b/ext/mysqli/tests/mysqli_real_connect.phpt
@@ -176,40 +176,42 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 Warning: mysqli_real_connect(): (%d/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
-object(mysqli)#%d (%d) {
-  [%u|b%"affected_rows"]=>
+object(mysqli)#%d (18) {
+  ["affected_rows"]=>
   NULL
-  [%u|b%"client_info"]=>
+  ["client_info"]=>
   %s
-  [%u|b%"client_version"]=>
+  ["client_version"]=>
   int(%d)
-  [%u|b%"connect_errno"]=>
-  int(%d)
-  [%u|b%"connect_error"]=>
-  NULL
-  [%u|b%"errno"]=>
+  ["connect_errno"]=>
+  int(0)
+  ["connect_error"]=>
   %s
-  [%u|b%"error"]=>
+  ["errno"]=>
   %s
-  [%u|b%"field_count"]=>
+  ["error"]=>
+  %s
+  ["field_count"]=>
   NULL
-  [%u|b%"host_info"]=>
+  ["host_info"]=>
+  %s
+  ["info"]=>
   NULL
-  [%u|b%"info"]=>
+  ["insert_id"]=>
   NULL
-  [%u|b%"insert_id"]=>
+  ["server_info"]=>
   NULL
-  [%u|b%"server_info"]=>
+  ["server_version"]=>
   NULL
-  [%u|b%"server_version"]=>
+  ["stat"]=>
   NULL
-  [%u|b%"sqlstate"]=>
+  ["sqlstate"]=>
   NULL
-  [%u|b%"protocol_version"]=>
+  ["protocol_version"]=>
   NULL
-  [%u|b%"thread_id"]=>
+  ["thread_id"]=>
   NULL
-  [%u|b%"warning_count"]=>
+  ["warning_count"]=>
   NULL
 }