SQLite3::escapeString can be static as it doesn't rely on an instance of SQLite

diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index 5028ad77ee68e36aa6ebb89cae32b0da87c34bd6..3e8a24a5363377e201f724f660c93bb566716077 100644 (file)
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -1507,7 +1507,7 @@ static zend_function_entry php_sqlite3_class_methods[] = {
        PHP_ME(sqlite3,         lastErrorMsg,           arginfo_sqlite3_lasterrormsg, ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3,         loadExtension,          arginfo_sqlite3_loadextension, ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3,         changes,                        arginfo_sqlite3_changes, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3,         escapeString,           arginfo_sqlite3_escapestring, ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3,         escapeString,           arginfo_sqlite3_escapestring, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
        PHP_ME(sqlite3,         prepare,                        arginfo_sqlite3_prepare, ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3,         query,                          arginfo_sqlite3_query, ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3,         querySingle,            arginfo_sqlite3_querysingle, ZEND_ACC_PUBLIC)

diff --git a/ext/sqlite3/tests/sqlite3_23_escape_string.phpt b/ext/sqlite3/tests/sqlite3_23_escape_string.phpt
index 79475fb50d3cec1c0e8f4d59be36f8bf497ae9b5..3cc2d2f22904e03d558e8a1ba0269754db077815 100644 (file)
--- a/ext/sqlite3/tests/sqlite3_23_escape_string.phpt
+++ b/ext/sqlite3/tests/sqlite3_23_escape_string.phpt
@@ -12,7 +12,7 @@ echo "Creating Table\n";
 var_dump($db->exec('CREATE TABLE test (time INTEGER, id STRING)'));
 
 echo "INSERT into table\n";
-var_dump($db->exec("INSERT INTO test (time, id) VALUES (" . TIMENOW . ", '" . $db->escapeString("test''%") . "')"));
+var_dump($db->exec("INSERT INTO test (time, id) VALUES (" . TIMENOW . ", '" . SQLite3::escapeString("test''%") . "')"));
 var_dump($db->exec("INSERT INTO test (time, id) VALUES (" . TIMENOW . ", 'b')"));
 
 echo "SELECTING results\n";