Skip to content

Commit 2bc53b4

Browse files
committed
ZPP -> fZPP
1 parent 9051f5f commit 2bc53b4

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

ext/pdo_pgsql/pgsql_driver.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -657,11 +657,14 @@ void pgsqlCopyFromArray_internal(INTERNAL_FUNCTION_PARAMETERS)
657657
PGresult *pgsql_result;
658658
ExecStatusType status;
659659

660-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sA|sss!",
661-
&table_name, &table_name_len, &pg_rows,
662-
&pg_delim, &pg_delim_len, &pg_null_as, &pg_null_as_len, &pg_fields, &pg_fields_len) == FAILURE) {
663-
RETURN_THROWS();
664-
}
660+
ZEND_PARSE_PARAMETERS_START(2, 5)
661+
Z_PARAM_STRING(table_name, table_name_len)
662+
Z_PARAM_ITERABLE(pg_rows)
663+
Z_PARAM_OPTIONAL
664+
Z_PARAM_STRING(pg_delim, pg_delim_len)
665+
Z_PARAM_STRING_OR_NULL(pg_null_as, pg_null_as_len)
666+
Z_PARAM_STRING(pg_fields, pg_fields_len)
667+
ZEND_PARSE_PARAMETERS_END();
665668

666669
if ((Z_TYPE_P(pg_rows) != IS_ARRAY && !instanceof_function(Z_OBJCE_P(pg_rows), zend_ce_traversable))) {
667670
zend_argument_type_error(2, "must be of type array or Traversable");

ext/pdo_pgsql/tests/copy_from_iterator.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
6262
$db->query('DROP TABLE IF EXISTS test_copy_from_traversable CASCADE');
6363
?>
6464
--EXPECT--
65-
PDO::pgsqlCopyFromArray(): Argument #2 ($rows) must be of type array or Traversable
65+
PDO::pgsqlCopyFromArray(): Argument #2 ($rows) must be of type Traversable|array, stdClass given
6666
array (
6767
0 => 1,
6868
1 => 1,

0 commit comments

Comments
 (0)