Skip to content

[pull] master from php:master #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 8 commits into from
Nov 4, 2025
Merged

[pull] master from php:master #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
14ed75e
Fix include paths for new pgsql tests
Girgias Nov 4, 2025
3afac4c
Merge branch 'PHP-8.4' into PHP-8.5
Girgias Nov 4, 2025
00f42bb
Merge branch 'PHP-8.5'
Girgias Nov 4, 2025
b460062
random: Use ZVAL_EMPTY_ARRAY() for members in serialization (#20382)
ndossche Nov 4, 2025
720e006
random: Fix memory leak when serialization fails (#20383)
ndossche Nov 4, 2025
3c1c7a0
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Nov 4, 2025
7bc8ecb
Merge branch 'PHP-8.4' into PHP-8.5
ndossche Nov 4, 2025
928af45
Merge branch 'PHP-8.5'
ndossche Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pg_fetch_object() with abstract class name
pgsql
--SKIPIF--
<?php
include("skipif.inc");
include("inc/skipif.inc");
?>
--FILE--
<?php
Expand All @@ -17,7 +17,7 @@ enum E {
case A;
}

include "config.inc";
include "inc/config.inc";
$table_name = "pg_fetch_object_abstract_class";
$db = pg_connect($conn_str);
pg_query($db, "CREATE TABLE {$table_name} (a integer, b text)");
Expand Down Expand Up @@ -49,7 +49,7 @@ try {
?>
--CLEAN--
<?php
include('config.inc');
include('inc/config.inc');
$db = @pg_connect($conn_str);
@pg_query($db, "DROP TABLE IF EXISTS pg_fetch_object_abstract_class cascade");
?>
Expand Down
5 changes: 2 additions & 3 deletions ext/random/engine_mt19937.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,17 +324,16 @@ PHP_METHOD(Random_Engine_Mt19937, __serialize)
array_init(return_value);

/* members */
ZVAL_ARR(&t, zend_std_get_properties(&engine->std));
Z_TRY_ADDREF(t);
ZVAL_EMPTY_ARRAY(&t);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);

/* state */
array_init(&t);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);
if (!engine->engine.algo->serialize(engine->engine.state, Z_ARRVAL(t))) {
zend_throw_exception(NULL, "Engine serialize failed", 0);
RETURN_THROWS();
}
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);
}
/* }}} */

Expand Down