Go with the mess

6 files changed, 13 insertions, 13 deletions

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 85e3f6691e..c5233a2941 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -226,8 +226,8 @@ function_entry sqlite_funcs_query[] = {
 	PHP_ME_MAPPING(current, sqlite_current, NULL)
 	PHP_ME_MAPPING(next, sqlite_next, NULL)
 	PHP_ME_MAPPING(prev, sqlite_prev, NULL)
-	PHP_ME_MAPPING(has_more, sqlite_has_more, NULL)
-	PHP_ME_MAPPING(has_prev, sqlite_has_prev, NULL)
+	PHP_ME_MAPPING(hasmore, sqlite_has_more, NULL)
+	PHP_ME_MAPPING(hasprev, sqlite_has_prev, NULL)
 	/* spl_sequence */
 	PHP_ME_MAPPING(rewind, sqlite_rewind, NULL)
 	/* additional */
@@ -248,7 +248,7 @@ function_entry sqlite_funcs_ub_query[] = {
 	/* spl_forward */
 	PHP_ME_MAPPING(current, sqlite_current, NULL)
 	PHP_ME_MAPPING(next, sqlite_next, NULL)
-	PHP_ME_MAPPING(has_more, sqlite_has_more, NULL)
+	PHP_ME_MAPPING(hasmore, sqlite_has_more, NULL)
 	{NULL, NULL, NULL}
 };
 
diff --git a/ext/sqlite/tests/sqlite_oo_010.phpt b/ext/sqlite/tests/sqlite_oo_010.phpt
index dd386adf36..c27d538d7d 100755
--- a/ext/sqlite/tests/sqlite_oo_010.phpt
+++ b/ext/sqlite/tests/sqlite_oo_010.phpt
@@ -22,7 +22,7 @@ foreach ($data as $str) {
 }
 
 $r = $db->unbuffered_query("SELECT a from strings", SQLITE_NUM);
-while ($row = $r->has_more()) {
+while ($row = $r->hasMore()) {
 	var_dump($r->current());
 	$r->next();
 }
diff --git a/ext/sqlite/tests/sqlite_oo_013.phpt b/ext/sqlite/tests/sqlite_oo_013.phpt
index e1bb392819..3aedecc6a8 100755
--- a/ext/sqlite/tests/sqlite_oo_013.phpt
+++ b/ext/sqlite/tests/sqlite_oo_013.phpt
@@ -22,7 +22,7 @@ foreach ($data as $str) {
 
 echo "====BUFFERED====\n";
 $r = $db->query("SELECT a, b from strings");
-while ($r->has_more()) {
+while ($r->hasMore()) {
 	var_dump($r->current(SQLITE_NUM));
 	var_dump($r->column(0));
 	var_dump($r->column(1));
@@ -32,7 +32,7 @@ while ($r->has_more()) {
 }
 echo "====UNBUFFERED====\n";
 $r = $db->unbuffered_query("SELECT a, b from strings");
-while ($r->has_more()) {
+while ($r->hasMore()) {
 	var_dump($r->column(0));
 	var_dump($r->column('b'));
 	var_dump($r->column(1));
diff --git a/ext/sqlite/tests/sqlite_oo_016.phpt b/ext/sqlite/tests/sqlite_oo_016.phpt
index 5b924c678f..a9b3e2760e 100755
--- a/ext/sqlite/tests/sqlite_oo_016.phpt
+++ b/ext/sqlite/tests/sqlite_oo_016.phpt
@@ -22,12 +22,12 @@ foreach ($data as $str) {
 
 echo "====BUFFERED====\n";
 $r = $db->query("SELECT a, b from strings");
-while ($r->has_more()) {
+while ($r->hasMore()) {
 	var_dump($r->fetch_single());
 }
 echo "====UNBUFFERED====\n";
 $r = $db->unbuffered_query("SELECT a, b from strings");
-while ($r->has_more()) {
+while ($r->hasMore()) {
 	var_dump($r->fetch_single());
 }
 echo "DONE!\n";
diff --git a/ext/sqlite/tests/sqlite_oo_020.phpt b/ext/sqlite/tests/sqlite_oo_020.phpt
index 457342bb1b..b2ddae7867 100755
--- a/ext/sqlite/tests/sqlite_oo_020.phpt
+++ b/ext/sqlite/tests/sqlite_oo_020.phpt
@@ -19,8 +19,8 @@ register_shutdown_function("cleanup");
 try {
 	$db = sqlite_factory();
 } catch(sqlite_exception $err) {
-	echo "Message: ".$err->getmessage()."\n";
-	echo "File: ".$err->getfile()."\n";
+	echo "Message: ".$err->getMessage()."\n";
+	echo "File: ".$err->getFile()."\n";
 }
 
 $db = sqlite_factory($dbname);
@@ -37,7 +37,7 @@ foreach ($data as $str) {
 }
 
 $r = $db->unbuffered_query("SELECT a, b from strings");
-while ($r->has_more()) {
+while ($r->hasMore()) {
 	var_dump($r->current(SQLITE_NUM));
 	$r->next();
 }
diff --git a/ext/sqlite/tests/sqlite_oo_024.phpt b/ext/sqlite/tests/sqlite_oo_024.phpt
index d6448c5bb8..f1f89d9acc 100755
--- a/ext/sqlite/tests/sqlite_oo_024.phpt
+++ b/ext/sqlite/tests/sqlite_oo_024.phpt
@@ -29,13 +29,13 @@ foreach ($data as $str) {
 
 echo "====class24====\n";
 $res = $db->query("SELECT a FROM strings", SQLITE_ASSOC);
-while ($res->has_more()) {
+while ($res->hasMore()) {
 	var_dump($res->fetch_object('class24'));
 }
 
 echo "====stdclass====\n";
 $res = $db->query("SELECT a FROM strings", SQLITE_ASSOC);
-while ($res->has_more()) {
+while ($res->hasMore()) {
 	var_dump($res->fetch_object());
 }