ext/mysqli: Remove bool type coercions in tests

Author: Girgias

ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt

@@ -20,7 +20,7 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
     require_once 'connect.inc';
     require_once 'table.inc';
 
-    function try_control_string($link, $control_string, $trace_file, $offset) {
+    function try_control_string($link, $control_string, $trace_file, $offset): string {
 
         @unlink($trace_file);
         if (true !== ($tmp = @mysqli_debug($control_string))) {
@@ -29,7 +29,7 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
                 $control_string,
                 gettype($tmp),
                 $tmp);
-            return false;
+            return '';
         }
 
         if (!$res = mysqli_query($link, 'SELECT * FROM test')) {
@@ -38,7 +38,7 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
                 $control_string,
                 mysqli_errno($link),
                 mysqli_error($link));
-            return false;
+            return '';
         }
         while (mysqli_fetch_assoc($res))
             ;
@@ -51,7 +51,7 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
                 $control_string,
                 gettype($tmp),
                 $tmp);
-            return false;
+            return '';
         }
 
         return trim(substr(file_get_contents($trace_file), 0, 100024));

ext/mysqli/tests/mysqli_prepare_no_object.phpt

@@ -8,29 +8,20 @@ require_once 'skipifconnectfailure.inc';
 ?>
 --FILE--
 <?php
-    require 'table.inc';
+require 'table.inc';
+if (false !== ($tmp = mysqli_prepare($link, '')))
+    printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, true));
+printf("a) [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-    if (false !== ($tmp = mysqli_prepare($link, false)))
-        printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, true));
-    printf("a) [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+mysqli_close($link);
 
-    if (false !== ($tmp = mysqli_prepare($link, '')))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, true));
-    printf("b) [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
-    mysqli_close($link);
+if (false !== ($tmp = $mysqli->prepare('')))
+    printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, true));
+printf("b) [%d] %s\n", $mysqli->errno, $mysqli->error);
 
-    $mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
-
-    if (false !== ($tmp = $mysqli->prepare(false)))
-        printf("[004] Expecting boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, true));
-    printf("c) [%d] %s\n", $mysqli->errno, $mysqli->error);
-
-    if (false !== ($tmp = $mysqli->prepare('')))
-        printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, true));
-    printf("c) [%d] %s\n", $mysqli->errno, $mysqli->error);
-
-    print "done!";
+print "done!";
 ?>
 --CLEAN--
 <?php
@@ -39,6 +30,4 @@ require_once 'clean_table.inc';
 --EXPECT--
 a) [1065] Query was empty
 b) [1065] Query was empty
-c) [1065] Query was empty
-c) [1065] Query was empty
 done!