Skip to content

[pull] master from php:master #648

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
merged 11 commits into from
Mar 6, 2025
Merged

[pull] master from php:master #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8a69937
Fix flaky DatePeriod test
iluuu1994 Mar 6, 2025
9256ee7
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 Mar 6, 2025
a840a54
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Mar 6, 2025
253c579
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Mar 6, 2025
bc32bb1
Merge branch 'PHP-8.4'
iluuu1994 Mar 6, 2025
5fcc8d4
Upgrade security branches to Ubuntu 22.04
iluuu1994 Mar 6, 2025
1009ff6
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 Mar 6, 2025
01c1dbb
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Mar 6, 2025
4d5a88c
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Mar 6, 2025
01a894a
Merge branch 'PHP-8.4'
iluuu1994 Mar 6, 2025
918332c
Fix Symfony tests failures with function JIT
dstogov Mar 6, 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
5 changes: 2 additions & 3 deletions .github/workflows/root.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
with:
asan_ubuntu_version: ${{
(((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '24.04')
|| '20.04' }}
|| '22.04' }}
branch: ${{ matrix.branch.ref }}
community_verify_type_inference: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }}
Expand All @@ -57,8 +57,7 @@ jobs:
run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
ubuntu_version: ${{
(((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '24.04')
|| ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) && '22.04')
|| '20.04' }}
|| '22.04' }}
windows_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9) && '2022' || '2019' }}
skip_symfony: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
skip_wordpress: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
Expand Down
4 changes: 2 additions & 2 deletions ext/date/tests/DatePeriod_no_advance_on_valid.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Date Period iterators do not advance on valid()
--FILE--
<?php

$start = DateTime::createFromFormat('Y-m-d', '2022-01-01');
$end = DateTime::createFromFormat('Y-m-d', '2022-01-04');
$start = DateTime::createFromFormat('Y-m-d H:i:s', '2022-01-01 00:00:00');
$end = DateTime::createFromFormat('Y-m-d H:i:s', '2022-01-04 00:00:00');
$interval = DateInterval::createFromDateString('1 day');
$period = new DatePeriod($start, $interval, $end);
$iterator = $period->getIterator();
Expand Down
4 changes: 2 additions & 2 deletions ext/opcache/jit/zend_jit_ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9250,7 +9250,7 @@ static int zend_jit_init_static_method_call(zend_jit_ctx *jit,
}

ce = zend_get_known_class(op_array, opline, opline->op1_type, opline->op1);
if (!func && ce) {
if (!func && ce && (opline->op1_type == IS_CONST || !(ce->ce_flags & ZEND_ACC_TRAIT))) {
zval *zv = RT_CONSTANT(opline, opline->op2);
zend_string *method_name;

Expand Down Expand Up @@ -16034,7 +16034,7 @@ static int zend_jit_fetch_static_prop(zend_jit_ctx *jit, const zend_op *opline,
zend_class_entry *ce;

ce = zend_get_known_class(op_array, opline, opline->op2_type, opline->op2);
if (ce) {
if (ce && (opline->op2_type == IS_CONST || !(ce->ce_flags & ZEND_ACC_TRAIT))) {
zval *zv = RT_CONSTANT(opline, opline->op1);
zend_string *prop_name;

Expand Down
Loading