Merge branch 'PHP-8.4'

nielsdos · nielsdos · commit f1c4736f676d · 2024-09-28T13:20:40.000+02:00
* PHP-8.4:
  Fix bogus fallthrough path in firebird_handle_get_attribute(), again
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
@@ -1250,8 +1250,7 @@ static int pdo_firebird_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
 				ZVAL_STRING(val, tmp);
 				return 1;
 			}
-			/* TODO Check this is correct? */
-			ZEND_FALLTHROUGH;
+			return -1;
 
 		case PDO_ATTR_FETCH_TABLE_NAMES:
 			ZVAL_BOOL(val, H->fetch_table_names);

Original file line number	Diff line number	Diff line change
`@@ -1250,8 +1250,7 @@ static int pdo_firebird_get_attribute(pdo_dbh_t dbh, zend_long attr, zval val)`
`1250`	`1250`	`ZVAL_STRING(val, tmp);`
`1251`	`1251`	`return 1;`
`1252`	`1252`	`}`
`1253`		`- /* TODO Check this is correct? */`
`1254`		`- ZEND_FALLTHROUGH;`
	`1253`	`+ return -1;`
`1255`	`1254`
`1256`	`1255`	`case PDO_ATTR_FETCH_TABLE_NAMES:`
`1257`	`1256`	`ZVAL_BOOL(val, H->fetch_table_names);`