Merge branch 'PHP-8.2' into PHP-8.3

ndossche · ndossche · commit c3f6579f932d · 2023-12-22T15:07:10.000+01:00
* PHP-8.2: Fix GH-12969: Fixed PDO::getAttribute() to get PDO::ATTR_STRINGIFY_FETCHES
diff --git a/NEWS b/NEWS
@@ -38,6 +38,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-12987 (openssl_csr_sign might leak new cert on error).
     (Jakub Zelenka)
 
+- PDO:
+  . Fix GH-12969 (Fixed PDO::getAttribute() to get PDO::ATTR_STRINGIFY_FETCHES).
+    (SakiTakamachi)
+
 - PDO_ODBC:
   . Fixed bug GH-12767 (Unable to turn on autocommit mode with setAttribute()).
     (SakiTakamachi)
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
@@ -930,8 +930,13 @@ PHP_METHOD(PDO, getAttribute)
 				add_next_index_zval(return_value, &dbh->def_stmt_ctor_args);
 			}
 			return;
+
 		case PDO_ATTR_DEFAULT_FETCH_MODE:
 			RETURN_LONG(dbh->default_fetch_type);
+
+		case PDO_ATTR_STRINGIFY_FETCHES:
+			RETURN_BOOL(dbh->stringify);
+
 		default:
 			break;
 	}
diff --git a/ext/pdo_mysql/tests/bug68371.phpt b/ext/pdo_mysql/tests/bug68371.phpt
@@ -96,6 +96,6 @@ array(1) {
 ERR
 ERR
 string(5) "mysql"
-ERR
+bool(false)
 ERR
 int(4)
diff --git a/ext/pdo_pgsql/tests/bug68371.phpt b/ext/pdo_pgsql/tests/bug68371.phpt
@@ -95,6 +95,6 @@ array(1) {
 ERR
 ERR
 string(5) "pgsql"
-ERR
+bool(true)
 ERR
 int(4)

Original file line number	Diff line number	Diff line change
`@@ -930,8 +930,13 @@ PHP_METHOD(PDO, getAttribute)`
`930`	`930`	`add_next_index_zval(return_value, &dbh->def_stmt_ctor_args);`
`931`	`931`	`}`
`932`	`932`	`return;`
	`933`	`+`
`933`	`934`	`case PDO_ATTR_DEFAULT_FETCH_MODE:`
`934`	`935`	`RETURN_LONG(dbh->default_fetch_type);`
	`936`	`+`
	`937`	`+ case PDO_ATTR_STRINGIFY_FETCHES:`
	`938`	`+ RETURN_BOOL(dbh->stringify);`
	`939`	`+`
`935`	`940`	`default:`
`936`	`941`	`break;`
`937`	`942`	`}`