Merge branch 'PHP-8.3'

nielsdos · nielsdos · commit 810999ae31c5 · 2024-07-22T18:33:41.000+02:00
* PHP-8.3:
  Fix bogus fallthrough path in firebird_handle_get_attribute()
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
@@ -1185,8 +1185,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
`@@ -1185,8 +1185,7 @@ static int pdo_firebird_get_attribute(pdo_dbh_t dbh, zend_long attr, zval val)`
`1185`	`1185`	`ZVAL_STRING(val, tmp);`
`1186`	`1186`	`return 1;`
`1187`	`1187`	`}`
`1188`		`- /* TODO Check this is correct? */`
`1189`		`- ZEND_FALLTHROUGH;`
	`1188`	`+ return -1;`
`1190`	`1189`
`1191`	`1190`	`case PDO_ATTR_FETCH_TABLE_NAMES:`
`1192`	`1191`	`ZVAL_BOOL(val, H->fetch_table_names);`