Fix class names

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 3a8d8ba39a4df3fa144adb58a82add10e1cefca4..97b998eca1c6b68c70191bf2b016dcea5f413230 100644 (file)
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -719,15 +719,15 @@ static int php_sqlite_authorizer(void *autharg, int access_type, const char *arg
 /* }}} */
 
 /* {{{ OO init/structure stuff */
-#define REGISTER_SQLITE_CLASS(name, parent) \
+#define REGISTER_SQLITE_CLASS(name, c_name, parent) \
        { \
                zend_class_entry ce; \
-               INIT_CLASS_ENTRY(ce, "sqlite_" # name, sqlite_funcs_ ## name); \
-               ce.create_object = sqlite_object_new_ ## name; \
-               sqlite_ce_ ## name = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
-               memcpy(&sqlite_object_handlers_ ## name, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
-               sqlite_object_handlers_ ## name.clone_obj = NULL; \
-               sqlite_ce_ ## name->ce_flags |= ZEND_ACC_FINAL_CLASS; \
+               INIT_CLASS_ENTRY(ce, "SQLite" # name, sqlite_funcs_ ## c_name); \
+               ce.create_object = sqlite_object_new_ ## c_name; \
+               sqlite_ce_ ## c_name = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
+               memcpy(&sqlite_object_handlers_ ## c_name, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
+               sqlite_object_handlers_ ## c_name.clone_obj = NULL; \
+               sqlite_ce_ ## c_name->ce_flags |= ZEND_ACC_FINAL_CLASS; \
        }
 
 zend_class_entry *sqlite_ce_db, *sqlite_ce_exception;
@@ -984,10 +984,10 @@ static int init_sqlite_globals(zend_sqlite_globals *g)
 
 PHP_MINIT_FUNCTION(sqlite)
 {
-       REGISTER_SQLITE_CLASS(db,        NULL);
-       REGISTER_SQLITE_CLASS(query,     NULL);
-       REGISTER_SQLITE_CLASS(ub_query,  NULL);
-       REGISTER_SQLITE_CLASS(exception, zend_exception_get_default());
+       REGISTER_SQLITE_CLASS(Database,   db,        NULL);
+       REGISTER_SQLITE_CLASS(Result,     query,     NULL);
+       REGISTER_SQLITE_CLASS(Unbuffered, ub_query,  NULL);
+       REGISTER_SQLITE_CLASS(Exception,  exception, zend_exception_get_default());
        sqlite_object_handlers_query.get_class_entry = sqlite_get_ce_query;
        sqlite_object_handlers_ub_query.get_class_entry = sqlite_get_ce_ub_query;
        

diff --git a/ext/sqlite/tests/blankdb_oo.inc b/ext/sqlite/tests/blankdb_oo.inc
index 04decbe83e3ccc3f0ed5bb2e9c8eab48931e0367..3bbf4fd0b3709b82c1a3bdfec10c833696ec78d7 100755 (executable)
--- 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 38865160f7afb76b7013862d2921f321c9fb6eff..672ddb17b663b593318169108ea2226579a79b90 100755 (executable)
--- 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 2db67bf52696768eeea36a4f2c2729a11904c616..00a568a2a882d0c9b6065a1fc85800351910c479 100755 (executable)
--- 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 e650b7143246a168be6b001ac424383cd35b7a93..4b2bd90592bf952ed596c61842f76cc6459e416f 100755 (executable)
--- 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 fc288b65b6cbd3ba9e7f4d4c1b717fbad87eaff9..a855101fbde43b8e82e61244581029dd70c59c43 100755 (executable)
--- 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 339e460e21524ae7905b75616b83bbf184590281..850e4dc9a3afa43d1afb72e6e8747c4877d93b6d 100755 (executable)
--- 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 7f4e2cdbccd8c3d280475ff91cb73fc536bc3df4..988904f774f98499ef2bc5a3b4e3a5904d4f40c0 100755 (executable)
--- 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"