Revert "Fix GH-20214: PDO::FETCH_DEFAULT unexpected behavior with PDOStatement::setFetchMode (#21434)"

iluuu1994 · iluuu1994 · commit 171b722edc19 · 2026-04-27T00:08:03.000+02:00
This reverts commit 7bd27e7.
diff --git a/NEWS b/NEWS
@@ -2,9 +2,6 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.4.22
 
-- PDO:
-  . Fixed bug GH-20214 (PDO::FETCH_DEFAULT unexpected behavior with
-    setFetchMode). (iliaal)
 
 07 May 2026, PHP 8.4.21
 
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
@@ -1733,10 +1733,6 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a
 
 	flags = mode & PDO_FETCH_FLAGS;
 
-	if ((mode & ~PDO_FETCH_FLAGS) == PDO_FETCH_USE_DEFAULT) {
-		mode = stmt->dbh->default_fetch_type | flags;
-	}
-
 	if (!pdo_stmt_verify_mode(stmt, mode, mode_arg_num, false)) {
 		return false;
 	}
diff --git a/ext/pdo/tests/gh20214.phpt b/ext/pdo/tests/gh20214.phpt

Original file line number	Diff line number	Diff line change
`@@ -1733,10 +1733,6 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a`
`1733`	`1733`
`1734`	`1734`	`flags = mode & PDO_FETCH_FLAGS;`
`1735`	`1735`
`1736`		`- if ((mode & ~PDO_FETCH_FLAGS) == PDO_FETCH_USE_DEFAULT) {`
`1737`		`- mode = stmt->dbh->default_fetch_type \| flags;`
`1738`		`- }`
`1739`		`-`
`1740`	`1736`	`if (!pdo_stmt_verify_mode(stmt, mode, mode_arg_num, false)) {`
`1741`	`1737`	`return false;`
`1742`	`1738`	`}`