Skip to content

[pull] master from php:master #718

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 9 commits into from
Feb 8, 2026
Merged

[pull] master from php:master #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bbde9c8
Fix OSS-Fuzz #478009707 for JIT
iluuu1994 Feb 6, 2026
ba6df41
Merge branch 'PHP-8.4' into PHP-8.5
iluuu1994 Feb 8, 2026
fcb50e4
Merge branch 'PHP-8.5'
iluuu1994 Feb 8, 2026
0e0f547
[skip ci] Remove PHP-8.1 from push.yml triggers (GH-21157)
jorgsowa Feb 8, 2026
2a3e970
[CI] Use MySQL LTS version
KentarouTakeda Feb 6, 2026
44b0b14
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Feb 8, 2026
2cabea6
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Feb 8, 2026
d992576
Merge branch 'PHP-8.4' into PHP-8.5
iluuu1994 Feb 8, 2026
96be28c
Merge branch 'PHP-8.5'
iluuu1994 Feb 8, 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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
resource_class: arm.medium
docker:
- image: cimg/base:current-24.04
- image: mysql:8.3
- image: mysql:8.4
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: true
MYSQL_ROOT_PASSWORD: ''
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jobs:
LINUX_X64:
services:
mysql:
image: mysql:8.3
image: mysql:8.4
ports:
- 3306:3306
env:
Expand Down Expand Up @@ -277,7 +277,7 @@ jobs:
PDO_FIREBIRD_TEST_DSN: firebird:dbname=firebird:test.fdb
services:
mysql:
image: mysql:8.3
image: mysql:8.4
ports:
- 3306:3306
env:
Expand Down Expand Up @@ -406,7 +406,7 @@ jobs:
if: inputs.branch == 'master'
services:
mysql:
image: mysql:8.3
image: mysql:8.4
ports:
- 3306:3306
env:
Expand Down Expand Up @@ -652,7 +652,7 @@ jobs:
OPCACHE_VARIATION:
services:
mysql:
image: mysql:8.3
image: mysql:8.4
ports:
- 3306:3306
env:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ on:
- .cirrus.yml
- .circleci/**
branches:
- PHP-8.1
- PHP-8.2
- PHP-8.3
- PHP-8.4
Expand Down Expand Up @@ -77,7 +76,7 @@ jobs:
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
services:
mysql:
image: mysql:8.3
image: mysql:8.4
ports:
- 3306:3306
env:
Expand Down Expand Up @@ -183,7 +182,7 @@ jobs:
PDO_FIREBIRD_TEST_DSN: firebird:dbname=firebird:test.fdb
services:
mysql:
image: mysql:8.3
image: mysql:8.4
ports:
- 3306:3306
env:
Expand Down
6 changes: 5 additions & 1 deletion Zend/tests/oss-fuzz-478009707.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ $c = new C(1);
$c->prop = 1;
var_dump($c->prop);

$c->prop = PHP_INT_MAX;
var_dump($c->prop);

?>
--EXPECT--
--EXPECTF--
int(4)
float(%s)
14 changes: 13 additions & 1 deletion ext/opcache/jit/zend_jit_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2944,7 +2944,7 @@ static void ZEND_FASTCALL zend_jit_assign_obj_op_helper(zend_object *zobj, zend_
//??? } else {
//??? prop_info = zend_object_fetch_property_type_info(Z_OBJ_P(object), orig_zptr);
//??? }
if (prop_info) {
if (prop_info && ZEND_TYPE_IS_SET(prop_info->type)) {
/* special case for typed properties */
zend_jit_assign_op_to_typed_prop(zptr, prop_info, value, binary_op);
} else {
Expand Down Expand Up @@ -3140,6 +3140,9 @@ static void ZEND_FASTCALL zend_jit_pre_inc_obj_helper(zend_object *zobj, zend_st
}
} else {
zend_property_info *prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2);
if (prop_info && !ZEND_TYPE_IS_SET(prop_info->type)) {
prop_info = NULL;
}

if (EXPECTED(Z_TYPE_P(prop) == IS_LONG)) {
fast_long_increment_function(prop);
Expand Down Expand Up @@ -3210,6 +3213,9 @@ static void ZEND_FASTCALL zend_jit_pre_dec_obj_helper(zend_object *zobj, zend_st
}
} else {
zend_property_info *prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2);
if (prop_info && !ZEND_TYPE_IS_SET(prop_info->type)) {
prop_info = NULL;
}

if (EXPECTED(Z_TYPE_P(prop) == IS_LONG)) {
fast_long_decrement_function(prop);
Expand Down Expand Up @@ -3278,6 +3284,9 @@ static void ZEND_FASTCALL zend_jit_post_inc_obj_helper(zend_object *zobj, zend_s
ZVAL_NULL(result);
} else {
zend_property_info *prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2);
if (prop_info && !ZEND_TYPE_IS_SET(prop_info->type)) {
prop_info = NULL;
}

if (EXPECTED(Z_TYPE_P(prop) == IS_LONG)) {
ZVAL_LONG(result, Z_LVAL_P(prop));
Expand Down Expand Up @@ -3339,6 +3348,9 @@ static void ZEND_FASTCALL zend_jit_post_dec_obj_helper(zend_object *zobj, zend_s
ZVAL_NULL(result);
} else {
zend_property_info *prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2);
if (prop_info && !ZEND_TYPE_IS_SET(prop_info->type)) {
prop_info = NULL;
}

if (EXPECTED(Z_TYPE_P(prop) == IS_LONG)) {
ZVAL_LONG(result, Z_LVAL_P(prop));
Expand Down