From: Sergei Morozov Date: Sun, 29 Oct 2017 19:16:56 +0000 (-0700) Subject: [Bug 75448] In case of failure, mysqli::prepare() returns NULL instead of FALSE X-Git-Tag: php-7.3.0alpha1~464 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c393e95025347eaa688c38f723308031c028559;p=php [Bug 75448] In case of failure, mysqli::prepare() returns NULL instead of FALSE --- diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index f494694302..160ec551e0 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -32,7 +32,7 @@ #define CHECK_STATUS(value) \ if (!obj->ptr || ((MYSQLI_RESOURCE *)obj->ptr)->status < value ) { \ php_error_docref(NULL, E_WARNING, "Property access is not allowed yet"); \ - ZVAL_NULL(retval); \ + ZVAL_FALSE(retval); \ return retval; \ } \ @@ -40,7 +40,7 @@ MYSQL *p; \ if (!obj->ptr || !(MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr) { \ php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", ZSTR_VAL(obj->zo.ce->name));\ - ZVAL_NULL(retval);\ + ZVAL_FALSE(retval);\ return retval; \ } else { \ CHECK_STATUS(statusval);\ diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 3a96ccbe79..e788796f1c 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -256,12 +256,12 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul mysqli_object *intern = Z_MYSQLI_P(__id); \ if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {\ php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", ZSTR_VAL(intern->zo.ce->name));\ - RETURN_NULL();\ + RETURN_FALSE;\ }\ __ptr = (__type)my_res->ptr; \ if (__check && my_res->status < __check) { \ php_error_docref(NULL, E_WARNING, "invalid object or resource %s\n", ZSTR_VAL(intern->zo.ce->name)); \ - RETURN_NULL();\ + RETURN_FALSE;\ }\ } diff --git a/ext/mysqli/tests/bug28817.phpt b/ext/mysqli/tests/bug28817.phpt index 254c0e50de..5a5e924476 100644 --- a/ext/mysqli/tests/bug28817.phpt +++ b/ext/mysqli/tests/bug28817.phpt @@ -38,5 +38,5 @@ array(2) { [1]=> %s(3) "bar" } -NULL -bool(true) \ No newline at end of file +bool(false) +bool(true) diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt index 43edfd7d50..7c36d806bc 100644 --- a/ext/mysqli/tests/bug34810.phpt +++ b/ext/mysqli/tests/bug34810.phpt @@ -105,7 +105,7 @@ object(mysqli)#%d (%d) { } object(mysqli)#%d (%d) { ["affected_rows"]=> - NULL + bool(false) ["client_info"]=> string(%d) "%s" ["client_version"]=> @@ -119,28 +119,28 @@ object(mysqli)#%d (%d) { ["error"]=> string(0) "" ["error_list"]=> - NULL + bool(false) ["field_count"]=> - NULL + bool(false) ["host_info"]=> - NULL + bool(false) ["info"]=> - NULL + bool(false) ["insert_id"]=> - NULL + bool(false) ["server_info"]=> - NULL + bool(false) ["server_version"]=> - NULL + bool(false) ["stat"]=> NULL ["sqlstate"]=> - NULL + bool(false) ["protocol_version"]=> - NULL + bool(false) ["thread_id"]=> - NULL + bool(false) ["warning_count"]=> - NULL + bool(false) } Done diff --git a/ext/mysqli/tests/bug36802.phpt b/ext/mysqli/tests/bug36802.phpt index 3694a26db3..65e6d9a8ce 100644 --- a/ext/mysqli/tests/bug36802.phpt +++ b/ext/mysqli/tests/bug36802.phpt @@ -17,7 +17,7 @@ Bug #36802 (crashes with with mysqli_set_charset()) if (method_exists($mysql, 'set_charset')) { $x[0] = @$mysql->set_charset('utf8'); } else { - $x[0] = NULL; + $x[0] = false; } $x[1] = @$mysql->query("SELECT 'foo' FROM DUAL"); @@ -31,9 +31,9 @@ Bug #36802 (crashes with with mysqli_set_charset()) --EXPECT-- array(4) { [0]=> - NULL + bool(false) [1]=> - NULL + bool(false) [2]=> bool(true) [3]=> diff --git a/ext/mysqli/tests/bug75448.phpt b/ext/mysqli/tests/bug75448.phpt new file mode 100644 index 0000000000..d4b1b05f51 --- /dev/null +++ b/ext/mysqli/tests/bug75448.phpt @@ -0,0 +1,19 @@ +--TEST-- +mysqli_prepare() called on a closed connection should return FALSE (bug #75448) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: mysqli_prepare(): Couldn't fetch mysqli in %s on line %d +bool(false) diff --git a/ext/mysqli/tests/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt index 958b83cb3c..a08f897ef9 100644 --- a/ext/mysqli/tests/mysqli_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows.phpt @@ -122,8 +122,8 @@ mysqli_affected_rows() mysqli_close($link); - if (NULL !== ($tmp = @mysqli_affected_rows($link))) - printf("[033] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_affected_rows($link))) + printf("[033] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -132,4 +132,4 @@ mysqli_affected_rows() require_once("clean_table.inc"); ?> --EXPECTF-- -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt index 6da026bc5a..2b9b549cb4 100644 --- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt @@ -11,8 +11,8 @@ mysqli->affected_rows require_once("connect.inc"); $mysqli = new mysqli(); - if (NULL !== ($tmp = @$mysqli->affected_rows)) - printf("[000a] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$mysqli->affected_rows)) + printf("[000a] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) { printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", @@ -101,8 +101,8 @@ mysqli->affected_rows $mysqli->close(); - if (NULL !== ($tmp = @$mysqli->affected_rows)) - printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$mysqli->affected_rows)) + printf("[026] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -111,4 +111,4 @@ mysqli->affected_rows require_once("clean_table.inc"); ?> --EXPECTF-- -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt index a93d89f101..fdbedc5fb6 100644 --- a/ext/mysqli/tests/mysqli_autocommit.phpt +++ b/ext/mysqli/tests/mysqli_autocommit.phpt @@ -134,8 +134,8 @@ mysqli_autocommit() mysqli_close($link); - if (NULL !== ($tmp = @mysqli_autocommit($link, false))) - printf("[033] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_autocommit($link, false))) + printf("[033] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt index 3a5a25779d..5f61915e20 100644 --- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt +++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt @@ -124,8 +124,8 @@ mysqli->autocommit() $mysqli->close(); - if (NULL !== ($tmp = @$mysqli->autocommit( false))) - printf("[030] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$mysqli->autocommit( false))) + printf("[030] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -134,4 +134,4 @@ mysqli->autocommit() require_once("clean_table.inc"); ?> --EXPECTF-- -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt index 09009a1368..a7ae1d6690 100644 --- a/ext/mysqli/tests/mysqli_change_user.phpt +++ b/ext/mysqli/tests/mysqli_change_user.phpt @@ -105,8 +105,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = @mysqli_change_user($link, $user, $passwd, $db))) - printf("[018] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_change_user($link, $user, $passwd, $db))) + printf("[018] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[019] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt index 722facab00..8d21b561e0 100644 --- a/ext/mysqli/tests/mysqli_character_set_name.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name.phpt @@ -62,8 +62,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = @mysqli_character_set_name($link))) - printf("[013] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_character_set_name($link))) + printf("[013] Expecting false, got %s/%s\n", gettype($tmp), $tmp); /* Make sure that the function alias exists */ if (!is_null($tmp = @mysqli_character_set_name())) @@ -72,4 +72,4 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt index 7b71940e59..1a81bdcb39 100644 --- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt @@ -57,14 +57,14 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias] $mysqli->close(); - if (NULL !== ($tmp = @$mysqli->character_set_name())) - printf("[013] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$mysqli->character_set_name())) + printf("[013] Expecting false, got %s/%s\n", gettype($tmp), $tmp); /* Make sure that the function alias exists */ - if (!is_null($tmp = @$mysqli->character_set_name())) - printf("[014] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$mysqli->character_set_name())) + printf("[014] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> --EXPECTF-- -done! \ No newline at end of file +done! 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 7e36c6571e..fe6808e8c0 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt @@ -144,67 +144,67 @@ require_once('skipifconnectfailure.inc'); Without RS Class variables: -affected_rows = 'NULL' -client_info = 'NULL' +affected_rows = 'false' +client_info = 'false' client_version = '%s' connect_errno = '%s' connect_error = ''%s' -errno = 'NULL' -error = 'NULL' -error_list = 'NULL' -field_count = 'NULL' -host_info = 'NULL' -info = 'NULL' -insert_id = 'NULL' -protocol_version = 'NULL' -server_info = 'NULL' -server_version = 'NULL' -sqlstate = 'NULL' -stat = 'NULL' -thread_id = 'NULL' -warning_count = 'NULL' +errno = 'false' +error = 'false' +error_list = 'false' +field_count = 'false' +host_info = 'false' +info = 'false' +insert_id = 'false' +protocol_version = 'false' +server_info = 'false' +server_version = 'false' +sqlstate = 'false' +stat = 'false' +thread_id = 'false' +warning_count = 'false' Object variables: -affected_rows = 'NULL' -client_info = 'NULL' +affected_rows = 'false' +client_info = 'false' client_version = '%s' connect_errno = '%s' connect_error = '%s' -errno = 'NULL' -error = 'NULL' -error_list = 'NULL' -field_count = 'NULL' -host_info = 'NULL' -info = 'NULL' -insert_id = 'NULL' -server_info = 'NULL' -server_version = 'NULL' -stat = 'NULL' -sqlstate = 'NULL' -protocol_version = 'NULL' -thread_id = 'NULL' -warning_count = 'NULL' +errno = 'false' +error = 'false' +error_list = 'false' +field_count = 'false' +host_info = 'false' +info = 'false' +insert_id = 'false' +server_info = 'false' +server_version = 'false' +stat = 'false' +sqlstate = 'false' +protocol_version = 'false' +thread_id = 'false' +warning_count = 'false' Magic, magic properties: -mysqli->affected_rows = ''/NULL (''/NULL) +mysqli->affected_rows = ''/boolean (''/boolean) Warning: assert(): assert(@mysqli_get_client_info() === @$mysqli->client_info) failed in %s on line %d -mysqli->client_info = ''/NULL ('%s'/%s) +mysqli->client_info = ''/boolean ('%s'/%s) mysqli->client_version = '%s'/integer ('%s'/integer) -mysqli->errno = ''/NULL (''/NULL) -mysqli->error = ''/NULL (''/NULL) -mysqli->field_count = ''/NULL (''/NULL) -mysqli->insert_id = ''/NULL (''/NULL) -mysqli->sqlstate = ''/NULL (''/NULL) -mysqli->host_info = ''/NULL (''/NULL) -mysqli->info = ''/NULL (''/NULL) +mysqli->errno = ''/boolean (''/boolean) +mysqli->error = ''/boolean (''/boolean) +mysqli->field_count = ''/boolean (''/boolean) +mysqli->insert_id = ''/boolean (''/boolean) +mysqli->sqlstate = ''/boolean (''/boolean) +mysqli->host_info = ''/boolean (''/boolean) +mysqli->info = ''/boolean (''/boolean) Warning: assert(): assert(@mysqli_thread_id($mysqli) > @$mysqli->thread_id) failed in %s on line %d -mysqli->thread_id = ''/NULL (''/NULL) -mysqli->protocol_version = ''/NULL (''/NULL) -mysqli->server_info = ''/NULL (''/NULL) -mysqli->server_version = ''/NULL (''/NULL) -mysqli->warning_count = ''/NULL (''/NULL) +mysqli->thread_id = ''/boolean (''/boolean) +mysqli->protocol_version = ''/boolean (''/boolean) +mysqli->server_info = ''/boolean (''/boolean) +mysqli->server_version = ''/boolean (''/boolean) +mysqli->warning_count = ''/boolean (''/boolean) Access to undefined properties: mysqli->unknown = '' @@ -217,67 +217,67 @@ mysqli->connect_errno = '%s'/integer ('%s'/integer) With RS Class variables: -affected_rows = 'NULL' -client_info = 'NULL' +affected_rows = 'false' +client_info = 'false' client_version = '%s' connect_errno = '%s' connect_error = '%s' -errno = 'NULL' -error = 'NULL' -error_list = 'NULL' -field_count = 'NULL' -host_info = 'NULL' -info = 'NULL' -insert_id = 'NULL' -protocol_version = 'NULL' -server_info = 'NULL' -server_version = 'NULL' -sqlstate = 'NULL' -stat = 'NULL' -thread_id = 'NULL' -warning_count = 'NULL' +errno = 'false' +error = 'false' +error_list = 'false' +field_count = 'false' +host_info = 'false' +info = 'false' +insert_id = 'false' +protocol_version = 'false' +server_info = 'false' +server_version = 'false' +sqlstate = 'false' +stat = 'false' +thread_id = 'false' +warning_count = 'false' Object variables: -affected_rows = 'NULL' -client_info = 'NULL' +affected_rows = 'false' +client_info = 'false' client_version = '%s' connect_errno = '%s' connect_error = '%s' -errno = 'NULL' -error = 'NULL' -error_list = 'NULL' -field_count = 'NULL' -host_info = 'NULL' -info = 'NULL' -insert_id = 'NULL' -server_info = 'NULL' -server_version = 'NULL' -stat = 'NULL' -sqlstate = 'NULL' -protocol_version = 'NULL' -thread_id = 'NULL' -warning_count = 'NULL' +errno = 'false' +error = 'false' +error_list = 'false' +field_count = 'false' +host_info = 'false' +info = 'false' +insert_id = 'false' +server_info = 'false' +server_version = 'false' +stat = 'false' +sqlstate = 'false' +protocol_version = 'false' +thread_id = 'false' +warning_count = 'false' Magic, magic properties: -mysqli->affected_rows = ''/NULL (''/NULL) +mysqli->affected_rows = ''/boolean (''/boolean) Warning: assert(): assert(@mysqli_get_client_info() === @$mysqli->client_info) failed in %s on line %d -mysqli->client_info = ''/NULL ('%s'/%s) +mysqli->client_info = ''/boolean ('%s'/%s) mysqli->client_version = '%s'/integer ('%s'/integer) -mysqli->errno = ''/NULL (''/NULL) -mysqli->error = ''/NULL (''/NULL) -mysqli->field_count = ''/NULL (''/NULL) -mysqli->insert_id = ''/NULL (''/NULL) -mysqli->sqlstate = ''/NULL (''/NULL) -mysqli->host_info = ''/NULL (''/NULL) -mysqli->info = ''/NULL (''/NULL) +mysqli->errno = ''/boolean (''/boolean) +mysqli->error = ''/boolean (''/boolean) +mysqli->field_count = ''/boolean (''/boolean) +mysqli->insert_id = ''/boolean (''/boolean) +mysqli->sqlstate = ''/boolean (''/boolean) +mysqli->host_info = ''/boolean (''/boolean) +mysqli->info = ''/boolean (''/boolean) Warning: assert(): assert(@mysqli_thread_id($mysqli) > @$mysqli->thread_id) failed in %s on line %d -mysqli->thread_id = ''/NULL (''/NULL) -mysqli->protocol_version = ''/NULL (''/NULL) -mysqli->server_info = ''/NULL (''/NULL) -mysqli->server_version = ''/NULL (''/NULL) -mysqli->warning_count = ''/NULL (''/NULL) +mysqli->thread_id = ''/boolean (''/boolean) +mysqli->protocol_version = ''/boolean (''/boolean) +mysqli->server_info = ''/boolean (''/boolean) +mysqli->server_version = ''/boolean (''/boolean) +mysqli->warning_count = ''/boolean (''/boolean) Access to undefined properties: mysqli->unknown = '' @@ -287,4 +287,4 @@ 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) -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_close.phpt b/ext/mysqli/tests/mysqli_close.phpt index c6ac92dd60..937137564e 100644 --- a/ext/mysqli/tests/mysqli_close.phpt +++ b/ext/mysqli/tests/mysqli_close.phpt @@ -31,10 +31,10 @@ require_once('skipifconnectfailure.inc'); if (true !== $tmp) printf("[005] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp); - if (!is_null($tmp = @mysqli_query($link, "SELECT 1"))) - printf("[006] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_query($link, "SELECT 1"))) + printf("[006] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> --EXPECTF-- -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_close_oo.phpt b/ext/mysqli/tests/mysqli_close_oo.phpt index be67f779a8..49189bbab1 100644 --- a/ext/mysqli/tests/mysqli_close_oo.phpt +++ b/ext/mysqli/tests/mysqli_close_oo.phpt @@ -24,13 +24,13 @@ require_once('skipifconnectfailure.inc'); if (true !== $tmp) printf("[003] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp); - if (!is_null($tmp = @$mysqli->close())) - printf("[004] Expecting NULL got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$mysqli->close())) + printf("[004] Expecting false got %s/%s\n", gettype($tmp), $tmp); - if (!is_null($tmp = @$mysqli->query("SELECT 1"))) - printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$mysqli->query("SELECT 1"))) + printf("[005] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> --EXPECTF-- -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt index d20ba5dd23..ea64ae8065 100644 --- a/ext/mysqli/tests/mysqli_commit.phpt +++ b/ext/mysqli/tests/mysqli_commit.phpt @@ -64,8 +64,8 @@ if (!have_innodb($link)) mysqli_close($link); - if (NULL !== ($tmp = @mysqli_commit($link))) - printf("[014] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_commit($link))) + printf("[014] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -74,4 +74,4 @@ if (!have_innodb($link)) require_once("clean_table.inc"); ?> --EXPECTF-- -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_commit_oo.phpt b/ext/mysqli/tests/mysqli_commit_oo.phpt index 77bcf412e7..021f089064 100644 --- a/ext/mysqli/tests/mysqli_commit_oo.phpt +++ b/ext/mysqli/tests/mysqli_commit_oo.phpt @@ -21,8 +21,8 @@ if (!have_innodb($link)) $link = NULL; $mysqli = new mysqli(); - if (!is_null($tmp = @$mysqli->commit())) { - printf("[013] Expecting NULL got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$mysqli->commit())) { + printf("[013] Expecting false got %s/%s\n", gettype($tmp), $tmp); } if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) { @@ -90,8 +90,8 @@ if (!have_innodb($link)) $mysqli->close(); - if (NULL !== ($tmp = @$mysqli->commit())) { - printf("[017] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$mysqli->commit())) { + printf("[017] Expecting false, got %s/%s\n", gettype($tmp), $tmp); } print "done!"; @@ -106,4 +106,4 @@ Warning: mysqli::commit(): Transaction name truncated. Must be only [0-9A-Za-z\- Warning: mysqli::commit(): Transaction name truncated. Must be only [0-9A-Za-z\-_=]+ in %s on line %d Warning: mysqli::commit(): Transaction name truncated. Must be only [0-9A-Za-z\-_=]+ in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_connect_oo.phpt b/ext/mysqli/tests/mysqli_connect_oo.phpt index 32dfac0eb2..15520d42b5 100644 --- a/ext/mysqli/tests/mysqli_connect_oo.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo.phpt @@ -1,9 +1,9 @@ --TEST-- new mysqli() --SKIPIF-- - --FILE-- @@ -59,7 +59,7 @@ require_once('skipifconnectfailure.inc'); // We had long discussions on this and found that the ext/mysqli API as // such is broken. As we can't fix it, we document how it has behaved from // the first day on. And that's: no connection. - if (NULL !== ($tmp = @$mysqli->query('SELECT 1'))) { + if (false !== ($tmp = @$mysqli->query('SELECT 1'))) { printf("[013] There shall be no connection!\n"); $mysqli->close(); } @@ -75,7 +75,7 @@ require_once('skipifconnectfailure.inc'); // We had long discussions on this and found that the ext/mysqli API as // such is broken. As we can't fix it, we document how it has behaved from // the first day on. And that's: no connection. - if (NULL !== ($tmp = @$mysqli->query('SELECT 1'))) { + if (false !== ($tmp = @$mysqli->query('SELECT 1'))) { printf("[011] There shall be no connection!\n"); $mysqli->close(); } @@ -150,4 +150,4 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli::__construct(): (%s/%d): Access denied for user '%sunknown%s'@'%s' (using password: %s) in %s on line %d ... and now Exceptions Access denied for user '%s'@'%s' (using password: %s) -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_data_seek.phpt b/ext/mysqli/tests/mysqli_data_seek.phpt index 9e2d65047b..9bc3b12f73 100644 --- a/ext/mysqli/tests/mysqli_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_data_seek.phpt @@ -56,8 +56,8 @@ require_once('skipifconnectfailure.inc'); mysqli_free_result($res); - if (NULL !== ($tmp = mysqli_data_seek($res, 1))) - printf("[013] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_data_seek($res, 1))) + printf("[013] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); @@ -71,4 +71,4 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d Warning: mysqli_data_seek(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_data_seek_oo.phpt b/ext/mysqli/tests/mysqli_data_seek_oo.phpt index 0858218a46..7fb14f0956 100644 --- a/ext/mysqli/tests/mysqli_data_seek_oo.phpt +++ b/ext/mysqli/tests/mysqli_data_seek_oo.phpt @@ -20,8 +20,8 @@ require_once('skipifconnectfailure.inc'); $host, $user, $db, $port, $socket); $res = new mysqli_result($mysqli); - if (NULL !== ($tmp = @$res->data_seek(0))) - printf("[002] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$res->data_seek(0))) + printf("[002] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!$res = $mysqli->query('SELECT * FROM test ORDER BY id LIMIT 4', MYSQLI_STORE_RESULT)) printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -65,8 +65,8 @@ require_once('skipifconnectfailure.inc'); $res->free_result(); - if (NULL !== ($tmp = $res->data_seek(1))) - printf("[015] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = $res->data_seek(1))) + printf("[015] Expecting false, got %s/%s\n", gettype($tmp), $tmp); $mysqli->close(); @@ -80,4 +80,4 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_result::data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d Warning: mysqli_result::data_seek(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_dump_debug_info.phpt b/ext/mysqli/tests/mysqli_dump_debug_info.phpt index bd87ddf0c8..b3fbde7fd9 100644 --- a/ext/mysqli/tests/mysqli_dump_debug_info.phpt +++ b/ext/mysqli/tests/mysqli_dump_debug_info.phpt @@ -32,8 +32,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = mysqli_dump_debug_info($link))) - printf("[005] Expecting NULL, got %s/%s\n", + if (false !== ($tmp = mysqli_dump_debug_info($link))) + printf("[005] Expecting NULL, got %s/%s, [%d] %s\n", gettype($tmp), $tmp, mysqli_errno($link), mysqli_error($link)); @@ -41,4 +41,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_dump_debug_info(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt index 82edef5619..a0b5365432 100644 --- a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt +++ b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt @@ -26,8 +26,8 @@ require_once('skipifconnectfailure.inc'); $mysqli->close(); - if (NULL !== ($tmp = $mysqli->dump_debug_info())) - printf("[004] Expecting NULL, got %s/%s, [%d] %s\n", + if (false !== ($tmp = $mysqli->dump_debug_info())) + printf("[004] Expecting false, got %s/%s, [%d] %s\n", gettype($tmp), $tmp, $mysqli->errno, $mysqli->error); @@ -35,4 +35,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli::dump_debug_info(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_errno.phpt b/ext/mysqli/tests/mysqli_errno.phpt index 0e9f0496af..0a9c245341 100644 --- a/ext/mysqli/tests/mysqli_errno.phpt +++ b/ext/mysqli/tests/mysqli_errno.phpt @@ -48,5 +48,5 @@ int(0) int(%d) Warning: mysqli_errno(): Couldn't fetch mysqli in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_errno_oo.phpt b/ext/mysqli/tests/mysqli_errno_oo.phpt index 5d5ea25089..f2fa2529a1 100644 --- a/ext/mysqli/tests/mysqli_errno_oo.phpt +++ b/ext/mysqli/tests/mysqli_errno_oo.phpt @@ -45,5 +45,5 @@ int(0) int(%d) Warning: main(): Couldn't fetch mysqli in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_error.phpt b/ext/mysqli/tests/mysqli_error.phpt index 5e70d59d41..fd61f0f5d2 100644 --- a/ext/mysqli/tests/mysqli_error.phpt +++ b/ext/mysqli/tests/mysqli_error.phpt @@ -45,5 +45,5 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_error(): Couldn't fetch mysqli in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_error_oo.phpt b/ext/mysqli/tests/mysqli_error_oo.phpt index 1f0589679d..d05fd6f383 100644 --- a/ext/mysqli/tests/mysqli_error_oo.phpt +++ b/ext/mysqli/tests/mysqli_error_oo.phpt @@ -42,5 +42,5 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: main(): Couldn't fetch mysqli in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt index e6bf1c9bc7..f4d8da9110 100644 --- a/ext/mysqli/tests/mysqli_error_unicode.phpt +++ b/ext/mysqli/tests/mysqli_error_unicode.phpt @@ -45,5 +45,5 @@ require_once('skipifconnectfailure.inc'); string(%d) "Table 'няма_такава_таблица' doesn't exist" Warning: mysqli_error(): Couldn't fetch mysqli in %s on line %d -NULL +bool(false) done! diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt index dce785af51..f9a7ee3770 100644 --- a/ext/mysqli/tests/mysqli_fetch_all.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all.phpt @@ -296,8 +296,8 @@ if (!function_exists('mysqli_fetch_all')) mysqli_close($link); - if (null !== ($tmp = mysqli_fetch_array($res, MYSQLI_ASSOC))) - printf("[015] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_fetch_array($res, MYSQLI_ASSOC))) + printf("[015] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[016] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", @@ -457,4 +457,4 @@ array(1) { Warning: mysqli_fetch_all(): Mode can be only MYSQLI_FETCH_NUM, MYSQLI_FETCH_ASSOC or MYSQLI_FETCH_BOTH in %s on line %d Warning: mysqli_fetch_array(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt index 450c67ecd9..9dac357ae1 100644 --- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt @@ -298,8 +298,8 @@ if (!function_exists('mysqli_fetch_all')) mysqli_close($link); - if (null !== ($tmp = $res->fetch_array(MYSQLI_ASSOC))) - printf("[015] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = $res->fetch_array(MYSQLI_ASSOC))) + printf("[015] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -437,4 +437,4 @@ array(1) { Warning: mysqli_result::fetch_all(): Mode can be only MYSQLI_FETCH_NUM, MYSQLI_FETCH_ASSOC or MYSQLI_FETCH_BOTH in %s on line %d Warning: mysqli_result::fetch_array(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt index e232898c7b..e9dd1602b5 100644 --- a/ext/mysqli/tests/mysqli_fetch_array.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array.phpt @@ -287,8 +287,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (null !== ($tmp = mysqli_fetch_array($res, MYSQLI_ASSOC))) - printf("[015] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_fetch_array($res, MYSQLI_ASSOC))) + printf("[015] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -371,4 +371,4 @@ Warning: mysqli_fetch_array(): The result type should be either MYSQLI_NUM, MYSQ Warning: mysqli_fetch_array(): The result type should be either MYSQLI_NUM, MYSQLI_ASSOC or MYSQLI_BOTH in %s on line %d Warning: mysqli_fetch_array(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt index 0fb1a72e93..b0e2234960 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt @@ -271,8 +271,8 @@ require_once('skipifconnectfailure.inc'); $mysqli->close(); - if (null !== ($tmp = $res->fetch_array(MYSQLI_ASSOC))) - printf("[015] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = $res->fetch_array(MYSQLI_ASSOC))) + printf("[015] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -359,4 +359,4 @@ Warning: mysqli_result::fetch_array(): The result type should be either MYSQLI_N Warning: mysqli_result::fetch_array(): The result type should be either MYSQLI_NUM, MYSQLI_ASSOC or MYSQLI_BOTH in %s on line %d Warning: mysqli_result::fetch_array(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt index 0d721fd5c6..6b98b5f51c 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt @@ -60,8 +60,8 @@ require_once('skipifconnectfailure.inc'); mysqli_free_result($res); - if (NULL !== ($tmp = mysqli_fetch_assoc($res))) - printf("[008] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_fetch_assoc($res))) + printf("[008] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); @@ -116,4 +116,4 @@ array(15) { } Warning: mysqli_fetch_assoc(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt index 026252b504..e4f6465176 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt @@ -16,8 +16,8 @@ require_once('skipifconnectfailure.inc'); // Note: no SQL type tests, internally the same function gets used as for mysqli_fetch_array() which does a lot of SQL type test $mysqli = new mysqli(); $res = @new mysqli_result($mysqli); - if (!is_null($tmp = @$res->fetch_assoc())) - printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$res->fetch_assoc())) + printf("[001] Expecting false, got %s/%s\n", gettype($tmp), $tmp); require('table.inc'); if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) @@ -47,8 +47,8 @@ require_once('skipifconnectfailure.inc'); $res->free_result(); - if (NULL !== ($tmp = $res->fetch_assoc())) - printf("[008] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = $res->fetch_assoc())) + printf("[008] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); @@ -83,4 +83,4 @@ array(5) { } Warning: mysqli_result::fetch_assoc(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt index f1d6db0599..684795a48e 100644 --- a/ext/mysqli/tests/mysqli_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field.phpt @@ -58,8 +58,8 @@ require_once('skipifconnectfailure.inc'); mysqli_free_result($res); // Read http://bugs.php.net/bug.php?id=42344 on defaults! - if (NULL !== ($tmp = mysqli_fetch_field($res))) - printf("[006] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_fetch_field($res))) + printf("[006] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt index d17eb7506f..be883ef625 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt @@ -34,8 +34,8 @@ require_once('skipifconnectfailure.inc'); mysqli_free_result($res); - if (NULL !== ($tmp = mysqli_fetch_field_direct($res, 0))) - printf("Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_fetch_field_direct($res, 0))) + printf("[005] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; @@ -80,4 +80,4 @@ Warning: mysqli_fetch_field_direct(): Field offset is invalid for resultset in % bool(false) Warning: mysqli_fetch_field_direct(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt index 4ac84d580a..c240050e17 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt @@ -43,8 +43,8 @@ require_once('skipifconnectfailure.inc'); $res->free_result(); - if (NULL !== ($tmp = $res->fetch_field_direct(0))) - printf("[007] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = $res->fetch_field_direct(0))) + printf("[007] Expecting false, got %s/%s\n", gettype($tmp), $tmp); $mysqli->close(); print "done!"; @@ -89,4 +89,4 @@ Warning: mysqli_result::fetch_field_direct(): Field offset is invalid for result bool(false) Warning: mysqli_result::fetch_field_direct(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt index 039d2b4e31..2293c9581a 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt @@ -16,8 +16,8 @@ require_once('skipifconnectfailure.inc'); // Note: no SQL type tests, internally the same function gets used as for mysqli_fetch_array() which does a lot of SQL type test $mysqli = new mysqli(); $res = @new mysqli_result($mysqli); - if (!is_null($tmp = @$res->fetch_field())) - printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$res->fetch_field())) + printf("[001] Expecting false, got %s/%s\n", gettype($tmp), $tmp); require('table.inc'); if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) @@ -59,8 +59,8 @@ require_once('skipifconnectfailure.inc'); $res->free_result(); - if (NULL !== ($tmp = $res->fetch_field())) - printf("[007] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = $res->fetch_field())) + printf("[007] Expecting false, got %s/%s\n", gettype($tmp), $tmp); $mysqli->close(); print "done!"; diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt index 854af23302..c79555c3a1 100644 --- a/ext/mysqli/tests/mysqli_fetch_fields.phpt +++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt @@ -55,8 +55,8 @@ require_once('skipifconnectfailure.inc'); mysqli_free_result($res); - if (NULL !== ($tmp = mysqli_fetch_fields($res))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_fetch_fields($res))) + printf("[006] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; diff --git a/ext/mysqli/tests/mysqli_fetch_lengths.phpt b/ext/mysqli/tests/mysqli_fetch_lengths.phpt index 6d0b698ee7..85921f800d 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths.phpt @@ -53,5 +53,5 @@ array(2) { bool(false) Warning: mysqli_fetch_lengths(): Couldn't fetch mysqli_result in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt index 7523621a34..c352bea8a0 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt @@ -46,5 +46,5 @@ array(2) { NULL Warning: main(): Property access is not allowed yet in %s on line %d -NULL +bool(false) done! diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt index dff91531ce..09ea19161a 100644 --- a/ext/mysqli/tests/mysqli_fetch_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object.phpt @@ -67,7 +67,7 @@ require_once('skipifconnectfailure.inc'); } } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; - } + } try { $obj = mysqli_fetch_object($res, 'mysqli_fetch_object_construct', array('a')); @@ -77,7 +77,7 @@ require_once('skipifconnectfailure.inc'); } } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; - } + } $obj = mysqli_fetch_object($res, 'mysqli_fetch_object_construct', array('a', 'b')); if (($obj->ID !== "5") || ($obj->label !== "e") || ($obj->a !== 'a') || ($obj->b !== 'b') || (get_class($obj) != 'mysqli_fetch_object_construct')) { @@ -152,7 +152,7 @@ Exception: Too few arguments to function mysqli_fetch_object_construct::__constr NULL NULL [E_WARNING] mysqli_fetch_object(): Couldn't fetch mysqli_result in %s on line %d -NULL +bool(false) [0] Argument 3 passed to mysqli_fetch_object() must be of the type array, string given in %s on line %d Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt index 8fac044139..d8c8cc70fd 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt @@ -16,8 +16,8 @@ require_once('skipifconnectfailure.inc'); $mysqli = new mysqli(); $res = @new mysqli_result($mysqli); - if (!is_null($tmp = @$res->fetch_object())) - printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @$res->fetch_object())) + printf("[001] Expecting false, got %s/%s\n", gettype($tmp), $tmp); require('table.inc'); if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) @@ -140,6 +140,6 @@ Exception: Too few arguments to function mysqli_fetch_object_construct::__constr NULL NULL [E_WARNING] mysqli_fetch_object(): Couldn't fetch mysqli_result in %s on line %d -NULL +bool(false) Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt index 59f6cbae3b..7ca1b9a132 100644 --- a/ext/mysqli/tests/mysqli_fetch_row.phpt +++ b/ext/mysqli/tests/mysqli_fetch_row.phpt @@ -55,5 +55,5 @@ array(3) { NULL Warning: mysqli_fetch_row(): Couldn't fetch mysqli_result in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_field_count.phpt b/ext/mysqli/tests/mysqli_field_count.phpt index 9a778c94cb..d6581c6699 100644 --- a/ext/mysqli/tests/mysqli_field_count.phpt +++ b/ext/mysqli/tests/mysqli_field_count.phpt @@ -59,5 +59,5 @@ int(0) int(3) Warning: mysqli_field_count(): Couldn't fetch mysqli in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt index 37b872302f..c34cf3f647 100644 --- a/ext/mysqli/tests/mysqli_field_seek.phpt +++ b/ext/mysqli/tests/mysqli_field_seek.phpt @@ -251,5 +251,5 @@ object(stdClass)#%d (13) { } Warning: mysqli_field_seek(): Couldn't fetch mysqli_result in %s on line %d -NULL +bool(false) done! diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt index 0a89e45914..9885c1d9d8 100644 --- a/ext/mysqli/tests/mysqli_field_tell.phpt +++ b/ext/mysqli/tests/mysqli_field_tell.phpt @@ -106,5 +106,5 @@ bool(true) int(0) Warning: mysqli_field_tell(): Couldn't fetch mysqli_result in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_free_result.phpt b/ext/mysqli/tests/mysqli_free_result.phpt index 0186fe4147..6cd7778319 100644 --- a/ext/mysqli/tests/mysqli_free_result.phpt +++ b/ext/mysqli/tests/mysqli_free_result.phpt @@ -60,7 +60,7 @@ NULL b Warning: mysqli_free_result(): Couldn't fetch mysqli_result in %s on line %d -NULL +bool(false) c bool(false) %s(0) "" diff --git a/ext/mysqli/tests/mysqli_get_charset.phpt b/ext/mysqli/tests/mysqli_get_charset.phpt index 8f81b3342e..537809dd70 100644 --- a/ext/mysqli/tests/mysqli_get_charset.phpt +++ b/ext/mysqli/tests/mysqli_get_charset.phpt @@ -101,8 +101,8 @@ if (!function_exists('mysqli_get_charset')) mysqli_close($link); - if (NULL !== ($tmp = mysqli_get_charset($link))) - printf("[023] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_get_charset($link))) + printf("[023] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> diff --git a/ext/mysqli/tests/mysqli_insert_id.phpt b/ext/mysqli/tests/mysqli_insert_id.phpt index 549d71d156..7d4c0e085c 100644 --- a/ext/mysqli/tests/mysqli_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_insert_id.phpt @@ -136,5 +136,5 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_insert_id(): Couldn't fetch mysqli in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt index 4657c8c2f2..4ce6a19c79 100644 --- a/ext/mysqli/tests/mysqli_more_results.phpt +++ b/ext/mysqli/tests/mysqli_more_results.phpt @@ -82,5 +82,5 @@ Strict Standards: mysqli_next_result(): There is no next result set. Please, cal Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d Warning: mysqli_more_results(): Couldn't fetch mysqli in %s on line %d -NULL +bool(false) done! diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt index 7cc84a0bf9..7e4a797158 100644 --- a/ext/mysqli/tests/mysqli_multi_query.phpt +++ b/ext/mysqli/tests/mysqli_multi_query.phpt @@ -130,5 +130,5 @@ Strict Standards: mysqli_next_result(): There is no next result set. Please, cal [010] 7 Warning: mysqli_multi_query(): Couldn't fetch mysqli in %s on line %d -NULL +bool(false) done! diff --git a/ext/mysqli/tests/mysqli_next_result.phpt b/ext/mysqli/tests/mysqli_next_result.phpt index 37265696a4..e01f507c20 100644 --- a/ext/mysqli/tests/mysqli_next_result.phpt +++ b/ext/mysqli/tests/mysqli_next_result.phpt @@ -84,5 +84,5 @@ Strict Standards: mysqli_next_result(): There is no next result set. Please, cal Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d Warning: mysqli_next_result(): Couldn't fetch mysqli in %s on line %d -NULL +bool(false) done! diff --git a/ext/mysqli/tests/mysqli_num_fields.phpt b/ext/mysqli/tests/mysqli_num_fields.phpt index 4c2510af45..f891b309c2 100644 --- a/ext/mysqli/tests/mysqli_num_fields.phpt +++ b/ext/mysqli/tests/mysqli_num_fields.phpt @@ -35,8 +35,8 @@ require_once('skipifconnectfailure.inc'); mysqli_free_result($res); - if ($test_free && (NULL !== ($tmp = mysqli_num_fields($res)))) - printf("[%03d] Expecting NULL, got %s/%s\n", $offset + 2, gettype($tmp), $tmp); + if ($test_free && (false !== ($tmp = mysqli_num_fields($res)))) + printf("[%03d] Expecting false, got %s/%s\n", $offset + 2, gettype($tmp), $tmp); } func_test_mysqli_num_fields($link, "SELECT 1 AS a", 1, 5); @@ -54,4 +54,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_num_fields(): Couldn't fetch mysqli_result in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt index d5f513ad51..c6e646e4c3 100644 --- a/ext/mysqli/tests/mysqli_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_num_rows.phpt @@ -35,8 +35,8 @@ require_once('skipifconnectfailure.inc'); mysqli_free_result($res); - if ($test_free && (NULL !== ($tmp = mysqli_num_rows($res)))) - printf("[%03d] Expecting NULL, got %s/%s\n", $offset + 2, gettype($tmp), $tmp); + if ($test_free && (false !== ($tmp = mysqli_num_rows($res)))) + printf("[%03d] Expecting false, got %s/%s\n", $offset + 2, gettype($tmp), $tmp); } @@ -86,4 +86,4 @@ Warning: mysqli_num_rows(): Couldn't fetch mysqli_result in %s on line %d run_tests.php don't fool me with your 'ungreedy' expression '.+?'! Warning: mysqli_num_rows(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_options.phpt b/ext/mysqli/tests/mysqli_options.phpt index 5daaa597fa..6d5247943b 100644 --- a/ext/mysqli/tests/mysqli_options.phpt +++ b/ext/mysqli/tests/mysqli_options.phpt @@ -58,7 +58,6 @@ require_once('skipifconnectfailure.inc'); var_dump("MYSQLI_OPT_LOCAL_INFILE", mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, 1)); var_dump("MYSQLI_INIT_COMMAND", mysqli_options($link, MYSQLI_INIT_COMMAND, array('SET AUTOCOMMIT=0', 'SET AUTOCOMMIT=1'))); - if (!$link2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[006] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -104,7 +103,7 @@ require_once('skipifconnectfailure.inc'); /* mysqli_real_connect() */ var_dump("MYSQLI_CLIENT_SSL", mysqli_options($link, MYSQLI_CLIENT_SSL, 'not a mysqli_option')); - + mysqli_close($link); echo "Link closed"; @@ -139,5 +138,5 @@ bool(false) Link closed Warning: mysqli_options(): Couldn't fetch mysqli in %s line %d %s(19) "MYSQLI_INIT_COMMAND" -NULL +bool(false) done! diff --git a/ext/mysqli/tests/mysqli_ping.phpt b/ext/mysqli/tests/mysqli_ping.phpt index d9a134c0e9..6ddb29efef 100644 --- a/ext/mysqli/tests/mysqli_ping.phpt +++ b/ext/mysqli/tests/mysqli_ping.phpt @@ -34,8 +34,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (!is_null($tmp = mysqli_ping($link))) - printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_ping($link))) + printf("[005] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -44,4 +44,4 @@ bool(true) bool(true) Warning: mysqli_ping(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt index 4b1988b631..bfa703bb01 100644 --- a/ext/mysqli/tests/mysqli_query.phpt +++ b/ext/mysqli/tests/mysqli_query.phpt @@ -107,8 +107,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = mysqli_query($link, "SELECT id FROM test"))) - printf("[011] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_query($link, "SELECT id FROM test"))) + printf("[011] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -138,4 +138,4 @@ array(1) { string(1) "a" Warning: mysqli_query(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt index a7540c5426..819a849d94 100644 --- a/ext/mysqli/tests/mysqli_query_unicode.phpt +++ b/ext/mysqli/tests/mysqli_query_unicode.phpt @@ -87,8 +87,8 @@ mysqli_close($link); mysqli_close($link); - if (NULL !== ($tmp = mysqli_query($link, "SELECT id FROM test"))) - printf("[014] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_query($link, "SELECT id FROM test"))) + printf("[014] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> diff --git a/ext/mysqli/tests/mysqli_real_connect.phpt b/ext/mysqli/tests/mysqli_real_connect.phpt index a678399838..dcc7ad5715 100644 --- a/ext/mysqli/tests/mysqli_real_connect.phpt +++ b/ext/mysqli/tests/mysqli_real_connect.phpt @@ -165,8 +165,8 @@ require_once('skipifconnectfailure.inc'); @mysqli_close($link); } - if (NULL !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))) - printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))) + printf("[026] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -178,7 +178,7 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d object(mysqli)#%d (%d) { ["affected_rows"]=> - NULL + bool(false) ["client_info"]=> %s ["client_version"]=> @@ -192,29 +192,29 @@ object(mysqli)#%d (%d) { ["error"]=> %s ["error_list"]=> - NULL + bool(false) ["field_count"]=> - NULL + bool(false) ["host_info"]=> - NULL + bool(false) ["info"]=> - NULL + bool(false) ["insert_id"]=> - NULL + bool(false) ["server_info"]=> - NULL + bool(false) ["server_version"]=> - NULL + bool(false) ["stat"]=> - NULL + bool(false) ["sqlstate"]=> - NULL + bool(false) ["protocol_version"]=> - NULL + bool(false) ["thread_id"]=> - NULL + bool(false) ["warning_count"]=> - NULL + bool(false) } Warning: mysqli_real_connect(): Couldn't fetch mysqli in %s on line %d diff --git a/ext/mysqli/tests/mysqli_real_escape_string.phpt b/ext/mysqli/tests/mysqli_real_escape_string.phpt index 6c372581e0..05588cac63 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string.phpt @@ -44,8 +44,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = mysqli_real_escape_string($link, 'foo'))) - printf("[010] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_real_escape_string($link, 'foo'))) + printf("[010] Expecting false, got %s/%s\n", gettype($tmp), $tmp); /* Make sure that the function alias exists */ if (NULL !== ($tmp = @mysqli_escape_string())) @@ -55,4 +55,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_real_escape_string(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt index 72d171f9e5..b3465ad2b1 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt @@ -74,8 +74,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = mysqli_real_escape_string($link, 'foo'))) - printf("[018] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_real_escape_string($link, 'foo'))) + printf("[018] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -85,4 +85,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_real_escape_string(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_real_query.phpt b/ext/mysqli/tests/mysqli_real_query.phpt index efc3eaa29f..9b99435d42 100644 --- a/ext/mysqli/tests/mysqli_real_query.phpt +++ b/ext/mysqli/tests/mysqli_real_query.phpt @@ -84,8 +84,8 @@ ver_param;')) { mysqli_close($link); - if (NULL !== ($tmp = mysqli_real_query($link, "SELECT id FROM test"))) - printf("[011] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_real_query($link, "SELECT id FROM test"))) + printf("[011] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -110,4 +110,4 @@ array(1) { } Warning: mysqli_real_query(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt index e565e184ee..33e5a1f1da 100644 --- a/ext/mysqli/tests/mysqli_result_references.phpt +++ b/ext/mysqli/tests/mysqli_result_references.phpt @@ -135,11 +135,11 @@ array(7) refcount(2){ ["field_count"]=> NULL ["lengths"]=> - NULL + bool(false) ["num_rows"]=> NULL ["type"]=> - NULL + bool(false) } } array(1) refcount(2){ diff --git a/ext/mysqli/tests/mysqli_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt index be49000315..8f2a13b96c 100644 --- a/ext/mysqli/tests/mysqli_rollback.phpt +++ b/ext/mysqli/tests/mysqli_rollback.phpt @@ -63,8 +63,8 @@ mysqli_rollback() mysqli_close($link); - if (!is_null($tmp = mysqli_rollback($link))) - printf("[014] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_rollback($link))) + printf("[014] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!\n"; ?> @@ -74,4 +74,4 @@ mysqli_rollback() ?> --EXPECTF-- Warning: mysqli_rollback(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_select_db.phpt b/ext/mysqli/tests/mysqli_select_db.phpt index f58a19bea3..041b7fbb22 100644 --- a/ext/mysqli/tests/mysqli_select_db.phpt +++ b/ext/mysqli/tests/mysqli_select_db.phpt @@ -67,7 +67,7 @@ require_once('skipifconnectfailure.inc'); $current_db = $row['dbname']; - mysqli_report(MYSQLI_REPORT_OFF); + mysqli_report(MYSQLI_REPORT_OFF); mysqli_select_db($link, 'I can not imagine that this database exists'); mysqli_report(MYSQLI_REPORT_ERROR); @@ -91,7 +91,7 @@ require_once('skipifconnectfailure.inc'); if (strtolower($row['dbname']) != strtolower($current_db)) printf("[017] Current DB should not change if set fails\n"); - + if (!$res = $link->query("SELECT id FROM test WHERE id = 1")) printf("[018] [%d] %s\n"); @@ -100,8 +100,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = mysqli_select_db($link, $db))) - printf("[017] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_select_db($link, $db))) + printf("[019] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!\n"; ?> @@ -109,4 +109,4 @@ require_once('skipifconnectfailure.inc'); --EXPECTF-- Warning: mysqli_select_db(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt index ed534fa71e..df90333867 100644 --- a/ext/mysqli/tests/mysqli_set_charset.phpt +++ b/ext/mysqli/tests/mysqli_set_charset.phpt @@ -116,8 +116,8 @@ if ((($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin1"', MYSQLI_STOR mysqli_close($link); - if (NULL !== ($tmp = mysqli_set_charset($link, $new_charset))) - printf("[016] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_set_charset($link, $new_charset))) + printf("[019] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> diff --git a/ext/mysqli/tests/mysqli_set_opt.phpt b/ext/mysqli/tests/mysqli_set_opt.phpt index 7c96d5980d..757b8490b7 100644 --- a/ext/mysqli/tests/mysqli_set_opt.phpt +++ b/ext/mysqli/tests/mysqli_set_opt.phpt @@ -65,5 +65,5 @@ bool(true) bool(false) Warning: mysqli_set_opt(): Couldn't fetch mysqli in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_sqlstate.phpt b/ext/mysqli/tests/mysqli_sqlstate.phpt index 56580cda46..b36291872e 100644 --- a/ext/mysqli/tests/mysqli_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_sqlstate.phpt @@ -46,5 +46,5 @@ NULL %s(5) "00000" Warning: mysqli_sqlstate(): Couldn't fetch mysqli in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_stat.phpt b/ext/mysqli/tests/mysqli_stat.phpt index f1cd56ccd1..2507a4c8f8 100644 --- a/ext/mysqli/tests/mysqli_stat.phpt +++ b/ext/mysqli/tests/mysqli_stat.phpt @@ -30,11 +30,11 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (!is_null($tmp = mysqli_stat($link))) - printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stat($link))) + printf("[005] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> --EXPECTF-- Warning: mysqli_stat(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt index 7fc32f7e61..1e08f0dec3 100644 --- a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt @@ -234,8 +234,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (!is_null($tmp = mysqli_stmt_affected_rows($stmt))) - printf("[047] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_affected_rows($stmt))) + printf("[047] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt index a4eb4d0f35..d58885e986 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt @@ -53,8 +53,8 @@ require_once('skipifconnectfailure.inc'); $stmt->close(); foreach ($valid_attr as $k => $attr) { - if (!is_null($tmp = @mysqli_stmt_attr_get($stmt, $attr))) { - printf("[007] Expecting NULL/NULL, got %s/%s for attribute %s/%s\n", + if (false !== ($tmp = @mysqli_stmt_attr_get($stmt, $attr))) { + printf("[007] Expecting false, got %s/%s for attribute %s/%s\n", gettype($tmp), $tmp, $k, $attr); } } diff --git a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt index c2ddd21198..5b53a06222 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt @@ -41,8 +41,8 @@ require_once('skipifconnectfailure.inc'); $stmt = mysqli_stmt_init($link); - if (!is_null($tmp = @mysqli_stmt_attr_set($stmt, 0, 0))) - printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_stmt_attr_set($stmt, 0, 0))) + printf("[005] Expecting false, got %s/%s\n", gettype($tmp), $tmp); $stmt->prepare("SELECT * FROM test"); diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt index 52e9d4b24b..dcd05e5f68 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt @@ -35,8 +35,8 @@ require_once('skipifconnectfailure.inc'); $label = null; $foo = null; - if (!is_null($tmp = mysqli_stmt_bind_result($stmt, $id))) - printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_bind_result($stmt, $id))) + printf("[003] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 1")) printf("[004] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); diff --git a/ext/mysqli/tests/mysqli_stmt_close.phpt b/ext/mysqli/tests/mysqli_stmt_close.phpt index 64e76e54ce..6ea64e815a 100644 --- a/ext/mysqli/tests/mysqli_stmt_close.phpt +++ b/ext/mysqli/tests/mysqli_stmt_close.phpt @@ -25,8 +25,8 @@ require_once('skipifconnectfailure.inc'); printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); // Yes, amazing, eh? AFAIK a work around of a constructor bug... - if (!is_null($tmp = mysqli_stmt_close($stmt))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_close($stmt))) + printf("[004] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test")) printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -34,8 +34,8 @@ require_once('skipifconnectfailure.inc'); if (true !== ($tmp = mysqli_stmt_close($stmt))) printf("[006] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp); - if (!is_null($tmp = mysqli_stmt_close($stmt))) - printf("[007] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_close($stmt))) + printf("[007] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!$stmt = mysqli_stmt_init($link)) printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -88,4 +88,4 @@ Warning: mysqli_stmt_close(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_close(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt index a1cebeae80..f9224eef62 100644 --- a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt @@ -24,8 +24,8 @@ require_once('skipifconnectfailure.inc'); if (!$stmt = mysqli_stmt_init($link)) printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - if (!is_null($tmp = mysqli_stmt_data_seek($stmt, 1))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_data_seek($stmt, 1))) + printf("[004] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "SELECT id FROM test ORDER BY id")) printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -75,8 +75,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_data_seek($stmt, 0))) - printf("[017] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_data_seek($stmt, 0))) + printf("[017] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; @@ -96,4 +96,4 @@ Warning: mysqli_stmt_data_seek(): Offset must be positive in %s on line %d int(1) Warning: mysqli_stmt_data_seek(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_errno.phpt b/ext/mysqli/tests/mysqli_stmt_errno.phpt index 070f2514a2..d98a98b87a 100644 --- a/ext/mysqli/tests/mysqli_stmt_errno.phpt +++ b/ext/mysqli/tests/mysqli_stmt_errno.phpt @@ -53,8 +53,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_errno($stmt))) - printf("[011] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_errno($stmt))) + printf("[011] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; @@ -65,4 +65,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_stmt_errno(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_error.phpt b/ext/mysqli/tests/mysqli_stmt_error.phpt index e18aa07f32..ad8efef602 100644 --- a/ext/mysqli/tests/mysqli_stmt_error.phpt +++ b/ext/mysqli/tests/mysqli_stmt_error.phpt @@ -53,8 +53,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_error($stmt))) - printf("[011] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_error($stmt))) + printf("[011] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; @@ -65,4 +65,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_stmt_error(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_execute.phpt b/ext/mysqli/tests/mysqli_stmt_execute.phpt index 85ae80c51e..d97111a6fd 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute.phpt @@ -31,15 +31,15 @@ if (mysqli_get_server_version($link) <= 40100) { printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); // stmt object status test - if (NULL !== ($tmp = mysqli_stmt_execute($stmt))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_execute($stmt))) + printf("[004] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (mysqli_stmt_prepare($stmt, "SELECT i_do_not_exist_believe_me FROM test ORDER BY id")) printf("[005] Statement should have failed!\n"); // stmt object status test - if (NULL !== ($tmp = mysqli_stmt_execute($stmt))) - printf("[006] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_execute($stmt))) + printf("[006] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "SELECT id FROM test ORDER BY id LIMIT 1")) printf("[007] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -126,8 +126,8 @@ if (mysqli_get_server_version($link) <= 40100) { mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_execute($stmt))) - printf("[028] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_execute($stmt))) + printf("[028] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; @@ -147,4 +147,4 @@ bool(true) [027] Expecting boolean/false, got boolean/1 Warning: mysqli_stmt_execute(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_fetch.phpt b/ext/mysqli/tests/mysqli_stmt_fetch.phpt index 7598ffeb1b..4b41c9213d 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch.phpt @@ -30,8 +30,8 @@ require_once('skipifconnectfailure.inc'); printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); // stmt object status test - if (NULL !== ($tmp = mysqli_stmt_fetch($stmt))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_fetch($stmt))) + printf("[004] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2")) printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -73,8 +73,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_fetch($stmt))) - printf("[016] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_fetch($stmt))) + printf("[016] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); @@ -95,4 +95,4 @@ Warning: mysqli_stmt_fetch(): invalid object or resource mysqli_stmt [014] [%d] Commands out of sync; you can't run this command now Warning: mysqli_stmt_fetch(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_field_count.phpt index 7dfd3a400c..847fe04a3b 100644 --- a/ext/mysqli/tests/mysqli_stmt_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_field_count.phpt @@ -22,13 +22,14 @@ require_once('skipifconnectfailure.inc'); require('table.inc'); $stmt = mysqli_stmt_init($link); - if (!is_null($tmp = mysqli_stmt_field_count($stmt))) - printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_field_count($stmt))) + printf("[003] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (mysqli_stmt_prepare($stmt, '')) printf("[004] Prepare should fail for an empty statement\n"); - if (!is_null($tmp = mysqli_stmt_field_count($stmt))) - printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + + if (false !== ($tmp = mysqli_stmt_field_count($stmt))) + printf("[005] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, 'SELECT 1')) printf("[006] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -74,8 +75,9 @@ require_once('skipifconnectfailure.inc'); if (mysqli_stmt_prepare($stmt, 'SELECT id FROM test')) printf("[020] Prepare should fail, statement has been closed\n"); - if (!is_null($tmp = mysqli_stmt_field_count($stmt))) - printf("[011] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + + if (false !== ($tmp = mysqli_stmt_field_count($stmt))) + printf("[021] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); @@ -97,4 +99,4 @@ Warning: mysqli_stmt_bind_param(): Number of variables doesn't match number of p Warning: mysqli_stmt_prepare(): Couldn't fetch mysqli_stmt in %s on line %d Warning: mysqli_stmt_field_count(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_free_result.phpt b/ext/mysqli/tests/mysqli_stmt_free_result.phpt index 08b33b7959..292905ab63 100644 --- a/ext/mysqli/tests/mysqli_stmt_free_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_free_result.phpt @@ -30,8 +30,8 @@ require_once('skipifconnectfailure.inc'); printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); // stmt object status test - if (NULL !== ($tmp = mysqli_stmt_free_result($stmt))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_free_result($stmt))) + printf("[004] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id")) printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -67,8 +67,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_free_result($stmt))) - printf("[015] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_free_result($stmt))) + printf("[015] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); @@ -83,4 +83,4 @@ Warning: mysqli_stmt_free_result(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_free_result(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt index 58d7c2fa72..e8f2843920 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt @@ -33,8 +33,8 @@ if (!function_exists('mysqli_stmt_get_result')) printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); // stmt object status test - if (NULL !== ($tmp = mysqli_stmt_fetch($stmt))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), var_export($tmp, 1)); + if (false !== ($tmp = mysqli_stmt_fetch($stmt))) + printf("[004] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1)); if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2")) printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -58,8 +58,8 @@ if (!function_exists('mysqli_stmt_get_result')) printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); // stmt object status test - if (NULL !== ($tmp = mysqli_stmt_fetch($stmt))) - printf("[011] Expecting NULL, got %s/%s\n", gettype($tmp), var_export($tmp, 1)); + if (false !== ($tmp = mysqli_stmt_fetch($stmt))) + printf("[011] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1)); if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2")) printf("[012] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -81,8 +81,8 @@ if (!function_exists('mysqli_stmt_get_result')) printf("[017] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); // stmt object status test - if (NULL !== ($tmp = mysqli_stmt_get_result($stmt))) - printf("[018] Expecting NULL, got %s/%s\n", gettype($tmp), var_export($tmp, 1)); + if (false !== ($tmp = mysqli_stmt_get_result($stmt))) + printf("[018] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1)); if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2")) printf("[019] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -148,8 +148,8 @@ if (!function_exists('mysqli_stmt_get_result')) mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_fetch($stmt))) - printf("[042] Expecting NULL, got %s/%s\n", gettype($tmp), var_export($tmp, 1)); + if (false !== ($tmp = mysqli_stmt_fetch($stmt))) + printf("[042] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1)); mysqli_close($link); @@ -184,4 +184,4 @@ array(2) { } Warning: mysqli_stmt_fetch(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt index 48f7ed8f30..00ed7adee4 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt @@ -144,8 +144,8 @@ if (!function_exists('mysqli_stmt_get_result')) mysqli_stmt_close($stmt); mysqli_close($link); - if (NULL !== ($res = mysqli_stmt_get_result($stmt))) { - printf("[022] Expecting NULL got %s/%s\n", + if (false !== ($res = mysqli_stmt_get_result($stmt))) { + printf("[026] Expecting false got %s/%s\n", gettype($res), $res); } @@ -173,4 +173,4 @@ NULL [017] [2014] Commands out of sync; you can't run this command now Warning: mysqli_stmt_get_result(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt index 879e87f0d8..febc659167 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt @@ -227,11 +227,11 @@ _null _label_concat Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d -NULL +bool(false) Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d -NULL +bool(false) Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt index 826d225bae..51198523c9 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt @@ -97,19 +97,19 @@ if (!function_exists('mysqli_stmt_get_result')) mysqli_free_result($res); - if (NULL !== ($tmp = mysqli_data_seek($res, 0))) - printf("[017] Expecting NULL got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_data_seek($res, 0))) + printf("[017] Expecting false got %s/%s\n", gettype($tmp), $tmp); - if (NULL !== ($row = $res->fetch_array(MYSQLI_NUM))) - printf("[018] Expecting NULL got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($row = $res->fetch_array(MYSQLI_NUM))) + printf("[018] Expecting false got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); - if (NULL !== ($tmp = mysqli_data_seek($res, 0))) - printf("[019] Expecting NULL got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_data_seek($res, 0))) + printf("[019] Expecting false got %s/%s\n", gettype($tmp), $tmp); - if (NULL !== ($row = $res->fetch_array(MYSQLI_NUM))) - printf("[020] Expecting NULL got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($row = $res->fetch_array(MYSQLI_NUM))) + printf("[020] Expecting false got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> diff --git a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt index 69755865e9..1ebe6d051f 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt @@ -40,8 +40,8 @@ mysqli_query($link, "DROP TABLE IF EXISTS test"); if (!$stmt = mysqli_stmt_init($link)) printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - if (NULL !== ($tmp = mysqli_stmt_get_warnings($stmt))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_get_warnings($stmt))) + printf("[004] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "SET sql_mode=''") || !mysqli_stmt_execute($stmt)) printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -92,8 +92,8 @@ mysqli_query($link, "DROP TABLE IF EXISTS test"); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_get_warnings($stmt))) - printf("[018] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_get_warnings($stmt))) + printf("[018] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; @@ -107,4 +107,4 @@ Warning: mysqli_stmt_get_warnings(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_get_warnings(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_init.phpt b/ext/mysqli/tests/mysqli_stmt_init.phpt index 4f09719c87..b82a855dd2 100644 --- a/ext/mysqli/tests/mysqli_stmt_init.phpt +++ b/ext/mysqli/tests/mysqli_stmt_init.phpt @@ -39,8 +39,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = mysqli_stmt_init($link))) - printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_init($link))) + printf("[005] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -55,4 +55,4 @@ Warning: mysqli_stmt_close(): invalid object or resource mysqli_stmt Warning: mysqli_stmt_init() expects parameter 1 to be mysqli, object given in %s on line %d Warning: mysqli_stmt_init(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt index c7a5affd9d..e3ef9a25ec 100644 --- a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt @@ -23,8 +23,8 @@ require_once('skipifconnectfailure.inc'); require('table.inc'); $stmt = mysqli_stmt_init($link); - if (NULL !== ($tmp = @mysqli_stmt_insert_id($stmt))) - printf("[003] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_stmt_insert_id($stmt))) + printf("[003] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 1") || !mysqli_stmt_execute($stmt)) { @@ -73,5 +73,5 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_stmt_insert_id(): Couldn't fetch mysqli_stmt in %s on line %d -NULL -done! \ No newline at end of file +bool(false) +done! diff --git a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt index a1f5e89c7a..5355b3deb7 100644 --- a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt @@ -101,8 +101,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_num_rows($stmt))) - printf("[056] Expecting NULL, got %s/%s\n"); + if (false !== ($tmp = mysqli_stmt_num_rows($stmt))) + printf("[056] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; @@ -115,4 +115,4 @@ require_once('skipifconnectfailure.inc'); run_tests.php don't fool me with your 'ungreedy' expression '.+?'! Warning: mysqli_stmt_num_rows(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt index 3526956898..e847d165f6 100644 --- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt @@ -24,8 +24,8 @@ require_once('skipifconnectfailure.inc'); if (!$stmt = mysqli_stmt_init($link)) printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - if (NULL !== ($tmp = mysqli_stmt_param_count($stmt))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_param_count($stmt))) + printf("[004] Expecting false, got %s/%s\n", gettype($tmp), $tmp); function func_test_mysqli_stmt_param_count($stmt, $query, $expected, $offset) { @@ -48,8 +48,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_param_count($stmt))) - printf("[40] Expecting NULL, got %s/%s\n"); + if (false !== ($tmp = mysqli_stmt_param_count($stmt))) + printf("[40] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); @@ -69,4 +69,4 @@ Warning: mysqli_stmt_param_count(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_param_count(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_prepare.phpt index 3eb576aec3..d0e38075d9 100644 --- a/ext/mysqli/tests/mysqli_stmt_prepare.phpt +++ b/ext/mysqli/tests/mysqli_stmt_prepare.phpt @@ -41,8 +41,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_prepare($stmt, "SELECT id FROM test"))) - printf("[007] Expecting NULL, got %s/%s\n"); + if (false !== ($tmp = mysqli_stmt_prepare($stmt, "SELECT id FROM test"))) + printf("[007] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; diff --git a/ext/mysqli/tests/mysqli_stmt_reset.phpt b/ext/mysqli/tests/mysqli_stmt_reset.phpt index d731da2f5e..b7ec4e3ed7 100644 --- a/ext/mysqli/tests/mysqli_stmt_reset.phpt +++ b/ext/mysqli/tests/mysqli_stmt_reset.phpt @@ -30,8 +30,8 @@ require_once('skipifconnectfailure.inc'); if (!$stmt = mysqli_stmt_init($link)) printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - if (NULL !== ($tmp = mysqli_stmt_reset($stmt))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_reset($stmt))) + printf("[004] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (true !== ($tmp = mysqli_stmt_prepare($stmt, 'SELECT id FROM test'))) printf("[005] Expecting boolean/true, got %s/%s, [%d] %s\n", @@ -93,8 +93,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_reset($stmt))) - printf("[021] Expecting NULL, got %s/%s\n"); + if (false !== ($tmp = mysqli_stmt_reset($stmt))) + printf("[021] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; @@ -109,4 +109,4 @@ Warning: mysqli_stmt_reset(): invalid object or resource mysqli_stmt int(1) Warning: mysqli_stmt_reset(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt index 5fd76a2628..c53101a096 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt @@ -24,8 +24,8 @@ require_once('skipifconnectfailure.inc'); if (!$stmt = mysqli_stmt_init($link)) printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - if (NULL !== ($tmp = mysqli_stmt_result_metadata($stmt))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_result_metadata($stmt))) + printf("[004] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test")) printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -82,8 +82,8 @@ require_once('skipifconnectfailure.inc'); mysqli_free_result($res); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_result_metadata($stmt))) - printf("[017] Expecting NULL, got %s/%s\n"); + if (false !== ($tmp = mysqli_stmt_result_metadata($stmt))) + printf("[017] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); /* Check that the function alias exists. It's a deprecated function, but we have not announce the removal so far, therefore we need to check for it */ @@ -131,4 +131,4 @@ object(stdClass)#5 (13) { } Warning: mysqli_stmt_result_metadata(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt index 5ea35df240..1784106162 100644 --- a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt @@ -27,8 +27,8 @@ require_once('skipifconnectfailure.inc'); if (!$stmt = mysqli_stmt_init($link)) printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - if (NULL !== ($tmp = mysqli_stmt_sqlstate($stmt))) - printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_stmt_sqlstate($stmt))) + printf("[005] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "SELECT id FROM test")) printf("[006] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); @@ -45,8 +45,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); - if (NULL !== ($tmp = mysqli_stmt_sqlstate($stmt))) - printf("[010] Expecting NULL, got %s/%s\n"); + if (false !== ($tmp = mysqli_stmt_sqlstate($stmt))) + printf("[010] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); print "done!"; @@ -60,4 +60,4 @@ Warning: mysqli_stmt_sqlstate(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_sqlstate(): Couldn't fetch mysqli_stmt in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt index a6411ca937..aa292a9198 100644 --- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt @@ -21,15 +21,15 @@ require_once('skipifconnectfailure.inc'); require('table.inc'); - if (!is_null($tmp = @mysqli_stmt_store_result(new mysqli_stmt()))) - printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_stmt_store_result(new mysqli_stmt()))) + printf("[003] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!$stmt = mysqli_stmt_init($link)) printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); // stmt object status test - if (NULL !== ($tmp = @mysqli_stmt_store_result($stmt))) - printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_stmt_store_result($stmt))) + printf("[005] Expecting false, got %s/%s\n", gettype($tmp), $tmp); if (!mysqli_stmt_prepare($stmt, "INSERT INTO test(id, label) VALUES (100, 'z')") || !mysqli_stmt_execute($stmt)) @@ -75,8 +75,8 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); mysqli_stmt_close($stmt_buf); - if (NULL !== ($tmp = @mysqli_stmt_store_result($stmt))) - printf("[017] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_stmt_store_result($stmt))) + printf("[017] Expecting false, got %s/%s\n", gettype($tmp), $tmp); mysqli_close($link); mysqli_close($link_buf); @@ -87,4 +87,4 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_store_result.phpt b/ext/mysqli/tests/mysqli_store_result.phpt index c61c124daf..b87d147e38 100644 --- a/ext/mysqli/tests/mysqli_store_result.phpt +++ b/ext/mysqli/tests/mysqli_store_result.phpt @@ -50,8 +50,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = mysqli_store_result($link))) - printf("[010] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_store_result($link))) + printf("[010] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -61,4 +61,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_store_result(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_thread_id.phpt b/ext/mysqli/tests/mysqli_thread_id.phpt index 3a7e1ae5da..4a71d60f41 100644 --- a/ext/mysqli/tests/mysqli_thread_id.phpt +++ b/ext/mysqli/tests/mysqli_thread_id.phpt @@ -30,8 +30,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = mysqli_thread_id($link))) - printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_thread_id($link))) + printf("[005] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -41,4 +41,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_thread_id(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_use_result.phpt b/ext/mysqli/tests/mysqli_use_result.phpt index 25d16926a8..190cafa5d5 100644 --- a/ext/mysqli/tests/mysqli_use_result.phpt +++ b/ext/mysqli/tests/mysqli_use_result.phpt @@ -50,8 +50,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = mysqli_use_result($link))) - printf("[010] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_use_result($link))) + printf("[010] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -63,4 +63,4 @@ require_once('skipifconnectfailure.inc'); Warning: mysqli_data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d Warning: mysqli_use_result(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_warning_count.phpt b/ext/mysqli/tests/mysqli_warning_count.phpt index cff9c02b1f..9d59f26e52 100644 --- a/ext/mysqli/tests/mysqli_warning_count.phpt +++ b/ext/mysqli/tests/mysqli_warning_count.phpt @@ -38,8 +38,8 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (NULL !== ($tmp = mysqli_warning_count($link))) - printf("[010] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + if (false !== ($tmp = mysqli_warning_count($link))) + printf("[010] Expecting false, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> @@ -49,4 +49,4 @@ require_once('skipifconnectfailure.inc'); ?> --EXPECTF-- Warning: mysqli_warning_count(): Couldn't fetch mysqli in %s on line %d -done! \ No newline at end of file +done!