Fix class names

7 files changed, 13 insertions, 13 deletions

diff --git a/ext/sqlite/tests/blankdb_oo.inc b/ext/sqlite/tests/blankdb_oo.inc
index 04decbe83e..3bbf4fd0b3 100755
--- a/ext/sqlite/tests/blankdb_oo.inc
+++ b/ext/sqlite/tests/blankdb_oo.inc
@@ -7,5 +7,5 @@ function cleanup() {
 	@unlink($dbname);
 }
 register_shutdown_function("cleanup");
-$db = new sqlite_db($dbname);
+$db = new SQLiteDatabase($dbname);
 ?>
diff --git a/ext/sqlite/tests/sqlite_oo_001.phpt b/ext/sqlite/tests/sqlite_oo_001.phpt
index 38865160f7..672ddb17b6 100755
--- a/ext/sqlite/tests/sqlite_oo_001.phpt
+++ b/ext/sqlite/tests/sqlite_oo_001.phpt
@@ -12,6 +12,6 @@ $db = NULL;
 echo "Done\n";
 ?>
 --EXPECTF--
-object(sqlite_db)#%d (0) {
+object(SQLiteDatabase)#%d (0) {
 }
 Done
diff --git a/ext/sqlite/tests/sqlite_oo_002.phpt b/ext/sqlite/tests/sqlite_oo_002.phpt
index 2db67bf526..00a568a2a8 100755
--- a/ext/sqlite/tests/sqlite_oo_002.phpt
+++ b/ext/sqlite/tests/sqlite_oo_002.phpt
@@ -17,13 +17,13 @@ var_dump($r);
 var_dump($r->fetch());
 ?>
 --EXPECTF--
-object(sqlite_db)#%d (0) {
+object(SQLiteDatabase)#%d (0) {
 }
-object(sqlite_query)#%d (0) {
+object(SQLiteResult)#%d (0) {
 }
-object(sqlite_query)#%d (0) {
+object(SQLiteResult)#%d (0) {
 }
-object(sqlite_query)#%d (0) {
+object(SQLiteResult)#%d (0) {
 }
 array(6) {
   [0]=>
diff --git a/ext/sqlite/tests/sqlite_oo_014.phpt b/ext/sqlite/tests/sqlite_oo_014.phpt
index e650b71432..4b2bd90592 100755
--- a/ext/sqlite/tests/sqlite_oo_014.phpt
+++ b/ext/sqlite/tests/sqlite_oo_014.phpt
@@ -59,7 +59,7 @@ array(3) {
   }
 }
 
-Notice: sqlite_ub_query::fetchAll(): One or more rowsets were already returned in %ssqlite_oo_014.php on line %d
+Notice: SQLiteUnbuffered::fetchAll(): One or more rowsets were already returned in %ssqlite_oo_014.php on line %d
 array(0) {
 }
 unbuffered with fetch_array
diff --git a/ext/sqlite/tests/sqlite_oo_020.phpt b/ext/sqlite/tests/sqlite_oo_020.phpt
index fc288b65b6..a855101fbd 100755
--- a/ext/sqlite/tests/sqlite_oo_020.phpt
+++ b/ext/sqlite/tests/sqlite_oo_020.phpt
@@ -18,7 +18,7 @@ register_shutdown_function("cleanup");
 
 try {
 	$db = sqlite_factory();
-} catch(sqlite_exception $err) {
+} catch(SQLiteException $err) {
 	echo "Message: ".$err->getMessage()."\n";
 	echo "File: ".$err->getFile()."\n";
 	//echo "Line: ".$err->getLine()."\n";
diff --git a/ext/sqlite/tests/sqlite_oo_021.phpt b/ext/sqlite/tests/sqlite_oo_021.phpt
index 339e460e21..850e4dc9a3 100755
--- a/ext/sqlite/tests/sqlite_oo_021.phpt
+++ b/ext/sqlite/tests/sqlite_oo_021.phpt
@@ -38,7 +38,7 @@ array(4) {
   string(1) "4"
 }
 
-Warning: sqlite_db::singleQuery(): no such table: test in %s on line %d
+Warning: SQLiteDatabase::singleQuery(): no such table: test in %s on line %d
 bool(false)
 NULL
 array(1) {
diff --git a/ext/sqlite/tests/sqlite_oo_022.phpt b/ext/sqlite/tests/sqlite_oo_022.phpt
index 7f4e2cdbcc..988904f774 100755
--- a/ext/sqlite/tests/sqlite_oo_022.phpt
+++ b/ext/sqlite/tests/sqlite_oo_022.phpt
@@ -38,7 +38,7 @@ echo "====DONE!====\n";
 --EXPECTF--
 ====SEEK:-1====
 
-Warning: sqlite_query::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d
+Warning: SQLiteResult::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d
 array(1) {
   [0]=>
   string(3) "one"
@@ -60,7 +60,7 @@ array(1) {
 }
 ====SEEK:3====
 
-Warning: sqlite_query::seek(): row 3 out of range in %ssqlite_oo_022.php on line %d
+Warning: SQLiteResult::seek(): row 3 out of range in %ssqlite_oo_022.php on line %d
 array(1) {
   [0]=>
   string(5) "three"
@@ -68,7 +68,7 @@ array(1) {
 ====AGAIN====
 ====SEEK:-1====
 
-Warning: sqlite_query::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d
+Warning: SQLiteResult::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d
 array(1) {
   [0]=>
   string(5) "three"
@@ -90,7 +90,7 @@ array(1) {
 }
 ====SEEK:3====
 
-Warning: sqlite_query::seek(): row 3 out of range in %ssqlite_oo_022.php on line %d
+Warning: SQLiteResult::seek(): row 3 out of range in %ssqlite_oo_022.php on line %d
 array(1) {
   [0]=>
   string(5) "three"