Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  ext/pdo: Keep statement class when ATTR_STATEMENT_CLASS is rejected

# Conflicts:
#	ext/pdo/pdo_dbh.c

Author: iliaal

NEWS

@@ -101,6 +101,10 @@ PHP                                                                        NEWS
     that is not in the result set. (Ilia Alshanetsky)
   . Fixed bug GH-23962 (Destroying a persistent PDO instance rolls back a
     transaction still in use by another instance). (Lazizbek Ergashev)
+  . Fixed PDO::setAttribute() installing a PDO::ATTR_STATEMENT_CLASS class
+    whose constructor arguments it rejects. (Ilia Alshanetsky)
+  . Fixed PDO::ATTR_STATEMENT_CLASS constructor_args type errors reporting
+    "array given" regardless of the value passed. (Ilia Alshanetsky)
 
 - PDO_Firebird:
   . Fixed bug GH-23758 (PDO_Firebird returns null for non-null empty BLOBs).

ext/pdo/pdo_dbh.c

@@ -638,7 +638,7 @@ PHP_METHOD(PDO, prepare)
 		if ((item = zend_hash_index_find(Z_ARRVAL_P(value), 1)) != NULL) {
 			if (Z_TYPE_P(item) != IS_ARRAY) {
 				zend_type_error("PDO::ATTR_STATEMENT_CLASS constructor_args must be of type ?array, %s given",
-					zend_zval_value_name(value));
+					zend_zval_value_name(item));
 				RETURN_THROWS();
 			}
 			ZVAL_COPY_VALUE(&ctor_args, item);
@@ -931,17 +931,18 @@ static bool pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value, u
 				zend_argument_type_error(value_arg_num, "User-supplied statement class cannot have a public constructor");
 				return false;
 			}
+			item = zend_hash_index_find(Z_ARRVAL_P(value), 1);
+			if (item != NULL && Z_TYPE_P(item) != IS_ARRAY) {
+				zend_argument_type_error(value_arg_num, "PDO::ATTR_STATEMENT_CLASS constructor_args must be of type ?array, %s given",
+					zend_zval_value_name(item));
+				return false;
+			}
 			dbh->def_stmt_ce = pce;
 			if (!Z_ISUNDEF(dbh->def_stmt_ctor_args)) {
 				zval_ptr_dtor(&dbh->def_stmt_ctor_args);
 				ZVAL_UNDEF(&dbh->def_stmt_ctor_args);
 			}
-			if ((item = zend_hash_index_find(Z_ARRVAL_P(value), 1)) != NULL) {
-				if (Z_TYPE_P(item) != IS_ARRAY) {
-					zend_argument_type_error(value_arg_num, "PDO::ATTR_STATEMENT_CLASS constructor_args must be of type ?array, %s given",
-						zend_zval_value_name(value));
-					return false;
-				}
+			if (item != NULL) {
 				ZVAL_COPY(&dbh->def_stmt_ctor_args, item);
 			}
 			return true;

ext/pdo/tests/pdo_030.phpt

@@ -75,6 +75,17 @@ echo "===QUERY===\n";
 var_dump($db->getAttribute(PDO::ATTR_STATEMENT_CLASS));
 $db->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('PDOStatementx', array($db)));
 var_dump($db->getAttribute(PDO::ATTR_STATEMENT_CLASS));
+try {
+    $db->setAttribute(PDO::ATTR_STATEMENT_CLASS, [PDOStatement::class, 'invalid-args']);
+} catch (TypeError $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+var_dump($db->getAttribute(PDO::ATTR_STATEMENT_CLASS));
+try {
+    $db->prepare('SELECT * FROM test030', [PDO::ATTR_STATEMENT_CLASS => [PDOStatement::class, 'invalid-args']]);
+} catch (TypeError $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 $stmt = $db->query('SELECT * FROM test030');
 var_dump(get_class($stmt));
 var_dump(get_class($stmt->dbh));
@@ -112,6 +123,18 @@ array(2) {
     }
   }
 }
+TypeError: PDO::setAttribute(): Argument #2 ($value) PDO::ATTR_STATEMENT_CLASS constructor_args must be of type ?array, string given
+array(2) {
+  [0]=>
+  string(13) "PDOStatementX"
+  [1]=>
+  array(1) {
+    [0]=>
+    object(PDODatabase)#%d (0) {
+    }
+  }
+}
+TypeError: PDO::ATTR_STATEMENT_CLASS constructor_args must be of type ?array, string given
 PDODatabase::query()
 PDOStatementX::__construct()
 string(13) "PDOStatementX"