Address comments

Author: SakiTakamachi

ext/pdo_mysql/mysql_statement.c

@@ -27,6 +27,7 @@
 #include "pdo/php_pdo_driver.h"
 #include "php_pdo_mysql.h"
 #include "php_pdo_mysql_int.h"
+#include "zend_interfaces.h"
 
 #ifdef PDO_USE_MYSQLND
 #	define pdo_mysql_stmt_execute_prepared(stmt) pdo_mysql_stmt_execute_prepared_mysqlnd(stmt)
@@ -490,11 +491,15 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
 					case IS_DOUBLE:
 						mysqlnd_stmt_bind_one_param(S->stmt, param->paramno, parameter, MYSQL_TYPE_DOUBLE);
 						break;
-					default:
-						if (!try_convert_to_string(parameter)) {
-							PDO_DBG_RETURN(0);
+					case IS_OBJECT:
+						if(zend_class_implements_interface(Z_OBJCE_P(parameter), zend_ce_stringable)) {
+							mysqlnd_stmt_bind_one_param(S->stmt, param->paramno, parameter, MYSQL_TYPE_VAR_STRING);
+							break;
 						}
-						mysqlnd_stmt_bind_one_param(S->stmt, param->paramno, parameter, MYSQL_TYPE_VAR_STRING);
+						ZEND_FALLTHROUGH;
+					default:
+						pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a scalar value or null");
+						PDO_DBG_RETURN(0);
 				}
 
 				PDO_DBG_RETURN(1);
@@ -533,15 +538,19 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
 						b->buffer = &Z_DVAL_P(parameter);
 						PDO_DBG_RETURN(1);
 
-					default:
-						if (!try_convert_to_string(parameter)) {
-							PDO_DBG_RETURN(0);
+					case IS_OBJECT:
+						if(zend_class_implements_interface(Z_OBJCE_P(parameter), zend_ce_stringable)) {
+							b->buffer_type = MYSQL_TYPE_STRING;
+							b->buffer = Z_STRVAL_P(parameter);
+							b->buffer_length = Z_STRLEN_P(parameter);
+							*b->length = Z_STRLEN_P(parameter);
+							PDO_DBG_RETURN(1);
 						}
-						b->buffer_type = MYSQL_TYPE_STRING;
-						b->buffer = Z_STRVAL_P(parameter);
-						b->buffer_length = Z_STRLEN_P(parameter);
-						*b->length = Z_STRLEN_P(parameter);
-						PDO_DBG_RETURN(1);
+						ZEND_FALLTHROUGH;
+
+					default:
+						pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a scalar value or null");
+						PDO_DBG_RETURN(0);
 				}
 #endif /* PDO_USE_MYSQLND */
 		case PDO_PARAM_EVT_FREE:

ext/pdo_mysql/tests/gh13384.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GH-13384 Fixed GH-13167 Fixed the behavior when an inappropriate value was passed to `bindValue`.
+GH-13384 Fixed GH-13167 Fixed the behavior when an inappropriate value was passed to `bindValue` and `bindParam`.
 --EXTENSIONS--
 pdo_mysql
 --SKIPIF--
@@ -16,22 +16,53 @@ $db->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
 
 $db->exec('CREATE TABLE test_gh13384 (mode TINYINT)');
 
-$stmt = $db->prepare('INSERT INTO test_gh13384 (mode) VALUES (?)');
-$stmt->bindValue(1, new DateTime(), PDO::PARAM_INT);
+$stringableObject = new class () {
+    public function __toString(): string
+    {
+        return 'I am stringable object';
+    }
+};
 
-var_dump($stmt->execute());
-var_dump($db->errorInfo());
-var_dump($db->query('SELECT * FROM test_gh13384')->fetchAll());
+echo "Stringable object, bindValue:\n";
+try {
+    $stmt = $db->prepare('INSERT INTO test_gh13384 (mode) VALUES (?)');
+    $stmt->bindValue(1, $stringableObject, PDO::PARAM_INT);
+    $stmt->execute();
+} catch (Throwable $e) {
+    echo $e->getMessage()."\n\n";
+}
+
+echo "Normal object, bindValue:\n";
+try {
+    $stmt = $db->prepare('INSERT INTO test_gh13384 (mode) VALUES (?)');
+    $stmt->bindValue(1, new DateTime(), PDO::PARAM_INT);
+    $stmt->execute();
+} catch (Throwable $e) {
+    echo $e->getMessage()."\n\n";
+}
+
+echo "Array, bindParam:\n";
+try {
+    $stmt = $db->prepare('INSERT INTO test_gh13384 (mode) VALUES (?)');
+    $param = ['aaa'];
+    $stmt->bindParam(1, $param, PDO::PARAM_INT);
+    $stmt->execute();
+} catch (Throwable $e) {
+    echo $e->getMessage();
+}
 ?>
 --CLEAN--
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 $db = MySQLPDOTest::factory();
 $db->exec('DROP TABLE IF EXISTS test_gh13384');
 ?>
---EXPECTF--
-Fatal error: Uncaught Error: Object of class DateTime could not be converted to string in %s
-Stack trace:
-#0 %s: PDOStatement->execute()
-#1 {main}
-  thrown in %s
+--EXPECT--
+Stringable object, bindValue:
+SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'I am stringable object' for column 'mode' at row 1
+
+Normal object, bindValue:
+SQLSTATE[HY105]: Invalid parameter type: Expected a scalar value or null
+
+Array, bindParam:
+SQLSTATE[HY105]: Invalid parameter type: Expected a scalar value or null