Merge branch 'PHP-8.4' into PHP-8.5

iluuu1994 · iluuu1994 · commit 1adfed2dab5c · 2026-04-27T00:10:04.000+02:00
* PHP-8.4: Revert "Fix GH-20214: PDO::FETCH_DEFAULT unexpected behavior with PDOStatement::setFetchMode (#21434)"
diff --git a/NEWS b/NEWS
@@ -2,9 +2,7 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.5.7
 
-- PDO:
-  . Fixed bug GH-20214 (PDO::FETCH_DEFAULT unexpected behavior with
-    setFetchMode). (iliaal)
+
 
 07 May 2026, PHP 8.5.6
 
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
@@ -1630,10 +1630,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_verify_fetch_mode(stmt->default_fetch_type, 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
`@@ -1630,10 +1630,6 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a`
`1630`	`1630`
`1631`	`1631`	`flags = mode & PDO_FETCH_FLAGS;`
`1632`	`1632`
`1633`		`- if ((mode & ~PDO_FETCH_FLAGS) == PDO_FETCH_USE_DEFAULT) {`
`1634`		`- mode = stmt->dbh->default_fetch_type \| flags;`
`1635`		`- }`
`1636`		`-`
`1637`	`1633`	`if (!pdo_verify_fetch_mode(stmt->default_fetch_type, mode, mode_arg_num, false)) {`
`1638`	`1634`	`return false;`
`1639`	`1635`	`}`