Skip to content

[pull] master from php:master #499

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 4 commits into from
Jan 19, 2026
Merged

[pull] master from php:master #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6989f51
Remove BP_VAR_R handling from zend_std_get_property_ptr_ptr() (GH-20954)
iluuu1994 Jan 19, 2026
ee5fc4a
Fix run-tests.php -s flag
iluuu1994 Jan 18, 2026
ca9305e
Merge branch 'PHP-8.4' into PHP-8.5
iluuu1994 Jan 19, 2026
0caebcd
Merge branch 'PHP-8.5'
iluuu1994 Jan 19, 2026
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: 4 additions & 2 deletions Zend/zend_object_handlers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,8 @@ ZEND_API zval *zend_std_get_property_ptr_ptr(zend_object *zobj, zend_string *nam
uintptr_t property_offset;
const zend_property_info *prop_info = NULL;

ZEND_ASSERT(type != BP_VAR_R && type != BP_VAR_IS);

#if DEBUG_OBJECT_HANDLERS
fprintf(stderr, "Ptr object #%d property: %s\n", zobj->handle, ZSTR_VAL(name));
#endif
Expand All @@ -1412,7 +1414,7 @@ ZEND_API zval *zend_std_get_property_ptr_ptr(zend_object *zobj, zend_string *nam

return zend_std_get_property_ptr_ptr(zobj, name, type, cache_slot);
}
if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) {
if (UNEXPECTED(type == BP_VAR_RW)) {
if (prop_info) {
zend_typed_property_uninitialized_access(prop_info, name);
retval = &EG(error_zval);
Expand Down Expand Up @@ -1473,7 +1475,7 @@ ZEND_API zval *zend_std_get_property_ptr_ptr(zend_object *zobj, zend_string *nam
if (UNEXPECTED(!zobj->properties)) {
rebuild_object_properties_internal(zobj);
}
if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) {
if (UNEXPECTED(type == BP_VAR_RW)) {
zend_error(E_WARNING, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name));
}
retval = zend_hash_add(zobj->properties, name, &EG(uninitialized_zval));
Expand Down
7 changes: 4 additions & 3 deletions run-tests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,8 @@ function main(): void
write_information($user_tests, $phpdbg);

if ($test_cnt) {
putenv('NO_INTERACTION=1');
$exts_tested = [];
$exts_skipped = [];
usort($test_files, "test_sort");
$start_time = hrtime(true);

Expand Down Expand Up @@ -780,7 +781,7 @@ function main(): void
show_end($start_timestamp, $start_time, $end_time);
show_summary();

save_results($output_file, /* prompt_to_save_results: */ true);
save_results($output_file, /* prompt_to_save_results: */ !$just_save_results);
}

$junit->saveXML();
Expand Down Expand Up @@ -906,7 +907,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
{
global $sum_results, $failed_test_summary, $PHP_FAILED_TESTS, $php;

if (getenv('NO_INTERACTION')) {
if (getenv('NO_INTERACTION') && $prompt_to_save_results) {
return;
}

Expand Down
Loading