5 files changed, 11 insertions, 11 deletions
diff --git a/ext/sqlite/tests/sqlite_010.phpt b/ext/sqlite/tests/sqlite_010.phpt
index 9f696067b5..152fde4cf0 100755
--- a/ext/sqlite/tests/sqlite_010.phpt
+++ b/ext/sqlite/tests/sqlite_010.phpt
@@ -22,17 +22,17 @@ foreach ($data as $str) {
 }
 
 $r = sqlite_unbuffered_query("SELECT a from strings", $db);
-while (sqlite_has_more($r)) {
+while (sqlite_valid($r)) {
 	var_dump(sqlite_current($r, SQLITE_NUM));
 	sqlite_next($r);
 }
 $r = sqlite_query("SELECT a from strings", $db);
-while (sqlite_has_more($r)) {
+while (sqlite_valid($r)) {
 	var_dump(sqlite_current($r, SQLITE_NUM));
 	sqlite_next($r);
 }
 sqlite_rewind($r);
-while (sqlite_has_more($r)) {
+while (sqlite_valid($r)) {
 	var_dump(sqlite_current($r, SQLITE_NUM));
 	sqlite_next($r);
 }
diff --git a/ext/sqlite/tests/sqlite_013.phpt b/ext/sqlite/tests/sqlite_013.phpt
index 2a5e44ccf3..95b047a75c 100755
--- a/ext/sqlite/tests/sqlite_013.phpt
+++ b/ext/sqlite/tests/sqlite_013.phpt
@@ -22,7 +22,7 @@ foreach ($data as $str) {
 
 echo "====BUFFERED====\n";
 $r = sqlite_query("SELECT a, b from strings", $db);
-while (sqlite_has_more($r)) {
+while (sqlite_valid($r)) {
 	var_dump(sqlite_current($r, SQLITE_NUM));
 	var_dump(sqlite_column($r, 0));
 	var_dump(sqlite_column($r, 1));
@@ -32,7 +32,7 @@ while (sqlite_has_more($r)) {
 }
 echo "====UNBUFFERED====\n";
 $r = sqlite_unbuffered_query("SELECT a, b from strings", $db);
-while (sqlite_has_more($r)) {
+while (sqlite_valid($r)) {
 	var_dump(sqlite_column($r, 0));
 	var_dump(sqlite_column($r, 'b'));
 	var_dump(sqlite_column($r, 1));
diff --git a/ext/sqlite/tests/sqlite_016.phpt b/ext/sqlite/tests/sqlite_016.phpt
index 6f9a9c327c..9ca9de135f 100755
--- a/ext/sqlite/tests/sqlite_016.phpt
+++ b/ext/sqlite/tests/sqlite_016.phpt
@@ -22,12 +22,12 @@ foreach ($data as $str) {
 
 echo "====BUFFERED====\n";
 $r = sqlite_query("SELECT a, b from strings", $db);
-while (sqlite_has_more($r)) {
+while (sqlite_valid($r)) {
 	var_dump(sqlite_fetch_single($r));
 }
 echo "====UNBUFFERED====\n";
 $r = sqlite_unbuffered_query("SELECT a, b from strings", $db);
-while (sqlite_has_more($r)) {
+while (sqlite_valid($r)) {
 	var_dump(sqlite_fetch_single($r));
 }
 
diff --git a/ext/sqlite/tests/sqlite_023.phpt b/ext/sqlite/tests/sqlite_023.phpt
index 3f175104d6..fbb8dc8da8 100644
--- a/ext/sqlite/tests/sqlite_023.phpt
+++ b/ext/sqlite/tests/sqlite_023.phpt
@@ -24,7 +24,7 @@ foreach ($data as $str) {
 $r = sqlite_query("SELECT a FROM strings", $db, SQLITE_NUM);
 
 echo "====TRAVERSE====\n";
-for(sqlite_rewind($r); sqlite_has_more($r); sqlite_next($r)) {
+for(sqlite_rewind($r); sqlite_valid($r); sqlite_next($r)) {
   var_dump(sqlite_current($r));
 
 }
@@ -39,7 +39,7 @@ echo "====UNBUFFERED====\n";
 $r = sqlite_unbuffered_query("SELECT a FROM strings", $db, SQLITE_NUM);
 
 echo "====TRAVERSE====\n";
-for(sqlite_rewind($r); sqlite_has_more($r); sqlite_next($r)) {
+for(sqlite_rewind($r); sqlite_valid($r); sqlite_next($r)) {
   var_dump(sqlite_current($r));
 
 }
diff --git a/ext/sqlite/tests/sqlite_024.phpt b/ext/sqlite/tests/sqlite_024.phpt
index bf3dfc2a1a..b7198c0155 100755
--- a/ext/sqlite/tests/sqlite_024.phpt
+++ b/ext/sqlite/tests/sqlite_024.phpt
@@ -29,13 +29,13 @@ foreach ($data as $str) {
 
 echo "====class24====\n";
 $res = sqlite_query($db, "SELECT a FROM strings", SQLITE_ASSOC);
-while (sqlite_has_more($res)) {
+while (sqlite_valid($res)) {
 	var_dump(sqlite_fetch_object($res, 'class24'));
 }
 
 echo "====stdclass====\n";
 $res = sqlite_query($db, "SELECT a FROM strings", SQLITE_ASSOC);
-while (sqlite_has_more($res)) {
+while (sqlite_valid($res)) {
 	var_dump(sqlite_fetch_object($res));
 }