The constructor should also throw exceptions, make this semi useful now.

diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index c77c191dd0cecc89cd6e1a6b7bfaaeb0e7a5c65f..88f7c69b38b811b23383ae4638a44d95f6c70f84 100644 (file)
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -72,29 +72,38 @@ PHP_METHOD(sqlite3, open)
        char *filename, *encryption_key, *fullpath;
        int filename_len, encryption_key_len = 0;
        long flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
+       zend_error_handling error_handling;
+
        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
 
        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &filename, &filename_len, &flags, &encryption_key, &encryption_key_len)) {
+               zend_restore_error_handling(&error_handling TSRMLS_CC);
                return;
        }
 
+       zend_restore_error_handling(&error_handling TSRMLS_CC);
+
        if (db_obj->initialised) {
-               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Already initialised DB Object");
+               zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Already initialised DB Object", 0 TSRMLS_CC);
        }
 
        if (strncmp(filename, ":memory:", 8) != 0) {
                if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
-                       RETURN_FALSE;
+                       zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Unable to expand filepath", 0 TSRMLS_CC);
+                       return;
                }
 
                if (PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+                       zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "safe_mode prohibits opening %s", fullpath);
                        efree(fullpath);
-                       RETURN_FALSE;
+                       return;
                }
 
                if (php_check_open_basedir(fullpath TSRMLS_CC)) {
+                       zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "open_basedir prohibits opening %s", fullpath);
                        efree(fullpath);
-                       RETURN_FALSE;
+                       return;
                }
        } else {
                fullpath = estrdup(filename);
@@ -105,7 +114,7 @@ PHP_METHOD(sqlite3, open)
 #else
        if (sqlite3_open(fullpath, &(db_obj->db)) != SQLITE_OK) {
 #endif
-               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unable to open database: %s", sqlite3_errmsg(db_obj->db));
+               zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Unable to open database: %s", sqlite3_errmsg(db_obj->db));
                if (fullpath) {
                        efree(fullpath);
                }
@@ -117,6 +126,7 @@ PHP_METHOD(sqlite3, open)
 #if SQLITE_HAS_CODEC
        if (encryption_key_len > 0) {
                if (sqlite3_key(db_obj->db, encryption_key, encryption_key_len) != SQLITE_OK) {
+                       zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Unable to open database: %s", sqlite3_errmsg(db_obj->db));
                        return;
                }
        }
@@ -129,7 +139,6 @@ PHP_METHOD(sqlite3, open)
        if (fullpath) {
                efree(fullpath);
        }
-       RETURN_TRUE;
 }
 /* }}} */
 

diff --git a/ext/sqlite3/tests/sqlite3_15_open_error.phpt b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
index 2e5e8a9c0c750c824061fe400fb380b74dfe092b..49ddc23bb878dc32e3baa42ad6379ec1c46bdc77 100644 (file)
--- a/ext/sqlite3/tests/sqlite3_15_open_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
@@ -7,14 +7,17 @@ SQLite3::open error test
 $unreadable = dirname(__FILE__) . '/unreadable.db';
 touch($unreadable);
 chmod($unreadable,  0200);
-$db = new SQLite3($unreadable);
-
-var_dump($db);
+try {
+       $db = new SQLite3($unreadable);
+} catch (Exception $e) {
+       echo $e . "\n";
+}
 echo "Done\n";
 unlink($unreadable);
 ?>
 --EXPECTF--
-Notice: SQLite3::__construct(): Unable to open database: unable to open database file in %s/sqlite3_15_open_error.php on line %d
-object(SQLite3)#%d (0) {
-}
+exception 'Exception' with message 'Unable to open database: unable to open database file' in %s/sqlite3_15_open_error.php:%d
+Stack trace:
+#0 %s/sqlite3_15_open_error.php(%d): SQLite3->__construct('%s')
+#1 {main}
 Done

diff --git a/ext/sqlite3/tests/sqlite3_21_security.phpt b/ext/sqlite3/tests/sqlite3_21_security.phpt
index f0b8d5aeb832e17c1ef9294b3bd343e3a42338f1..1a4c6a6e15edbf11d041075d93ecce61729c9bbc 100644 (file)
--- a/ext/sqlite3/tests/sqlite3_21_security.phpt
+++ b/ext/sqlite3/tests/sqlite3_21_security.phpt
@@ -16,8 +16,11 @@ var_dump($db->close());
 unlink($directory . $file);
 
 echo "Above test directory\n";
-$db = new SQLite3('../bad' . $file);
-var_dump($db);
+try {
+       $db = new SQLite3('../bad' . $file);
+} catch (Exception $e) {
+       echo $e . "\n";
+}
 
 echo "Done\n";
 ?>
@@ -28,7 +31,9 @@ object(SQLite3)#%d (0) {
 bool(true)
 Above test directory
 
-Warning: SQLite3::__construct(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d
-object(SQLite3)#%d (0) {
-}
+Warning: SQLite3::__construct(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s/sqlite3_21_security.php on line %d
+exception 'Exception' with message 'open_basedir prohibits opening %s' in %s/sqlite3_21_security.php:%d
+Stack trace:
+#0 %s/sqlite3_21_security.php(%d): SQLite3->__construct('%s')
+#1 {main}
 Done