review

Author: nielsdos

ext/pdo_sqlite/pdo_sqlite.c

@@ -379,7 +379,7 @@ static int php_sqlite_collation_callback(void *context, int string1_len, const v
 	if (!Z_ISUNDEF(retval)) {
 		if (Z_TYPE(retval) != IS_LONG) {
 			zend_string *func_name = get_active_function_or_method_name();
-			zend_type_error("%s(): Return value of the callback must be of type int, %s returned",
+			zend_type_error("%s(): Return value of the collation callback must be of type int, %s returned",
 				ZSTR_VAL(func_name), zend_zval_value_name(&retval));
 			zend_string_release(func_name);
 			return FAILURE;

ext/pdo_sqlite/sqlite_driver.c

@@ -824,12 +824,18 @@ static int authorizer(void *autharg, int access_type, const char *arg1, const ch
 		ZEND_ASSERT(EG(exception));
 	} else {
 		if (Z_TYPE(retval) != IS_LONG) {
-			zend_throw_exception_ex(php_pdo_get_exception(), 0, "The authorizer callback returned an invalid type: expected int");
+			zend_string *func_name = get_active_function_or_method_name();
+			zend_type_error("%s(): Return value of the authorizer callback must be of type int, %s returned",
+				ZSTR_VAL(func_name), zend_zval_value_name(&retval));
+			zend_string_release(func_name);
 		} else {
 			authreturn = Z_LVAL(retval);
 
 			if (authreturn != SQLITE_OK && authreturn != SQLITE_IGNORE && authreturn != SQLITE_DENY) {
-				zend_throw_exception_ex(php_pdo_get_exception(), 0, "The authorizer callback returned an invalid value: %d", authreturn);
+				zend_string *func_name = get_active_function_or_method_name();
+				zend_value_error("%s(): Return value of the authorizer callback must be one of Pdo\\Sqlite::OK, Pdo\\Sqlite::DENY, or Pdo\\Sqlite::IGNORE",
+					ZSTR_VAL(func_name));
+				zend_string_release(func_name);
 				authreturn = SQLITE_DENY;
 			}
 		}

ext/pdo_sqlite/tests/subclasses/pdosqlite_setauthorizer.phpt

@@ -50,7 +50,7 @@ $db->setAuthorizer(function () {
 
 try {
     var_dump($db->query('SELECT 1;'));
-} catch (\Exception $e) {
+} catch (\Error $e) {
     echo $e->getMessage() . "\n";
 }
 
@@ -60,7 +60,7 @@ $db->setAuthorizer(function () {
 
 try {
     var_dump($db->query('SELECT 1;'));
-} catch (\Exception $e) {
+} catch (\Error $e) {
     echo $e->getMessage() . "\n";
 }
 
@@ -97,5 +97,5 @@ string(28) "sqlite_master,rootpage,main,"
 string(4) "READ"
 string(28) "sqlite_master,rootpage,main,"
 int(1)
-The authorizer callback returned an invalid type: expected int
-The authorizer callback returned an invalid value: 4200
+PDO::query(): Return value of the authorizer callback must be of type int, string returned
+PDO::query(): Return value of the authorizer callback must be one of Pdo\Sqlite::OK, Pdo\Sqlite::DENY, or Pdo\Sqlite::IGNORE