1 files changed, 25 insertions, 40 deletions

diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt
index 9885c1d9d8..bf169003aa 100644
--- a/ext/mysqli/tests/mysqli_field_tell.phpt
+++ b/ext/mysqli/tests/mysqli_field_tell.phpt
@@ -8,51 +8,41 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-	require_once("connect.inc");
+    require_once("connect.inc");
 
-	$tmp    = NULL;
-	$link   = NULL;
+    require('table.inc');
+    if (!$res = mysqli_query($link, "SELECT id FROM test ORDER BY id LIMIT 1", MYSQLI_USE_RESULT)) {
+        printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    }
 
-	if (!is_null($tmp = @mysqli_field_tell()))
-		printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+    var_dump(mysqli_field_tell($res));
+    var_dump(mysqli_field_tell($res));
+    var_dump(mysqli_fetch_field($res));
+    var_dump(mysqli_fetch_field($res));
+    var_dump(mysqli_field_tell($res));
 
-	if (!is_null($tmp = @mysqli_field_tell($link)))
-		printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+    var_dump(mysqli_field_seek($res, 2));
+    var_dump(mysqli_field_tell($res));
 
-	require('table.inc');
-	if (!$res = mysqli_query($link, "SELECT id FROM test ORDER BY id LIMIT 1", MYSQLI_USE_RESULT)) {
-		printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-	}
+    var_dump(mysqli_field_seek($res, -1));
+    var_dump(mysqli_field_tell($res));
 
-	var_dump(mysqli_field_tell($res));
-	var_dump(mysqli_field_seek(1));
-	var_dump(mysqli_field_tell($res));
-	var_dump(mysqli_fetch_field($res));
-	var_dump(mysqli_fetch_field($res));
-	var_dump(mysqli_field_tell($res));
+    var_dump(mysqli_field_seek($res, 0));
+    var_dump(mysqli_field_tell($res));
 
-	if (!is_null($tmp = @mysqli_field_tell($res, 'too many arguments')))
-		printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
 
-	var_dump(mysqli_field_seek($res, 2));
-	var_dump(mysqli_field_tell($res));
+    mysqli_free_result($res);
 
-	var_dump(mysqli_field_seek($res, -1));
-	var_dump(mysqli_field_tell($res));
+    try {
+        mysqli_field_tell($res);
+    } catch (Error $exception) {
+        echo $exception->getMessage() . "\n";
+    }
 
-	var_dump(mysqli_field_seek($res, 0));
-	var_dump(mysqli_field_tell($res));
+    mysqli_close($link);
 
-
-
-	mysqli_free_result($res);
-
-	var_dump(mysqli_field_tell($res));
-
-	mysqli_close($link);
-
-	print "done!";
+    print "done!";
 ?>
 --CLEAN--
 <?php
@@ -60,9 +50,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 int(0)
-
-Warning: mysqli_field_seek() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
 int(0)
 object(stdClass)#%d (13) {
   ["name"]=>
@@ -104,7 +91,5 @@ bool(false)
 int(1)
 bool(true)
 int(0)
-
-Warning: mysqli_field_tell(): Couldn't fetch mysqli_result in %s on line %d
-bool(false)
+mysqli_result object is already closed
 done!