Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
985 commits
Select commit Hold shift + click to select a range
7bf3f70
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 9, 2024
b63e161
Merge branch 'PHP-8.4'
cmb69 Oct 9, 2024
0ef2a22
Fix JIT support for static properties of self and parent
dstogov Oct 9, 2024
6bcba24
Fix GH-16174: Empty string is an invalid expression for phpdbg-ev
cmb69 Oct 2, 2024
5c6fc09
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 9, 2024
980d41c
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 9, 2024
4d32402
Merge branch 'PHP-8.4'
cmb69 Oct 9, 2024
a1d4595
Fix calculation of aligned buffer size
cmb69 Oct 3, 2024
0b5167c
[skip ci] Allow to run push workflows manually
cmb69 Oct 1, 2024
509fec8
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Oct 10, 2024
80477b1
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 10, 2024
279e952
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 10, 2024
df8f298
Merge branch 'PHP-8.4'
cmb69 Oct 10, 2024
3da6818
reflection: Use fast ZPP for ReflectionProperty::(get|set)Value() (#1…
TimWolla Oct 10, 2024
57bfca9
JIT support for ASSIGN_DIM[_OP] with IS_VAR op1 (#16339)
dstogov Oct 10, 2024
1d0fbdf
Fix GH-16316: DOMXPath breaks when not initialized properly
ndossche Oct 9, 2024
5ae7927
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 10, 2024
25d0661
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 10, 2024
c597f92
Merge branch 'PHP-8.4'
ndossche Oct 10, 2024
018e7f5
ext/standard/html.c: clean up a bit (GH-16311)
DanielEScherzer Oct 10, 2024
6e172f0
Drop fallback for `PathCchCanonicalizeEx()` (GH-16341)
cmb69 Oct 10, 2024
e0b1b69
Fix OSS-Fuzz #371445205: Heap-use-after-free in attr_free
ndossche Oct 10, 2024
543c168
Merge branch 'PHP-8.4'
ndossche Oct 11, 2024
e2e2b3a
Fix GH-16168: php 8.1 and earlier crash immediately when compiled wit…
ndossche Oct 10, 2024
e4a23e9
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 11, 2024
5b0b151
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 11, 2024
5bb987b
Merge branch 'PHP-8.4'
ndossche Oct 11, 2024
c34d4fb
Fix GH-16360 mb_substr overflow on start and length arguments.
devnexen Oct 11, 2024
89b4f94
Merge branch 'PHP-8.2' into PHP-8.3
devnexen Oct 11, 2024
f47a45e
Merge branch 'PHP-8.3' into PHP-8.4
devnexen Oct 11, 2024
0323fff
Merge branch 'PHP-8.4'
devnexen Oct 11, 2024
9345582
XLEAK bug78270_2.phpt (GH-16352)
cmb69 Oct 11, 2024
b14076a
Fix property access of PHP objects wrapped in variant
cmb69 Oct 9, 2024
f2859a4
Fix GH-16322: imageaffine overflow on affine argument.
devnexen Oct 9, 2024
d612b0a
Merge branch 'PHP-8.2' into PHP-8.3
devnexen Oct 11, 2024
be370ed
Merge branch 'PHP-8.3' into PHP-8.4
devnexen Oct 11, 2024
2b39e72
Merge branch 'PHP-8.4'
devnexen Oct 11, 2024
7ff940f
Fix GH-16356: Segmentation fault with $outerHTML and next node (#16364)
ndossche Oct 11, 2024
3756182
Fix GH-16367: macOS CI fails to configure ext/intl on master
cmb69 Oct 11, 2024
7dda2de
Merge branch 'PHP-8.4'
cmb69 Oct 11, 2024
0258b9d
Run PHP-8.4 nightly on macOS 13
cmb69 Oct 11, 2024
8497400
Backport 3237b8f471f5f3701622c6b08a953311e24fed1f
SakiTakamachi May 4, 2024
e8ef81a
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Oct 11, 2024
382cd2f
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 11, 2024
e35380c
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 11, 2024
8953348
Merge branch 'PHP-8.4'
cmb69 Oct 11, 2024
24d11b7
RecursiveTreeIterator::__construct(): switch `@param` to typehint (#1…
DanielEScherzer Oct 12, 2024
7cdd130
Fix GH-16385: Unexpected null returned by session_set_cookie_params
ndossche Oct 12, 2024
a1f7ce5
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 12, 2024
45f7f87
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 12, 2024
7fae9f7
Merge branch 'PHP-8.4'
ndossche Oct 12, 2024
497dbaa
Fix GH-16389: Assertion failure in ext/ldap/ldap.c:2718 (#16392)
ndossche Oct 12, 2024
baa76be
Use SWAR to seek for non-ASCII UTF-8 in DOM parsing (#16350)
ndossche Oct 12, 2024
a56ff4f
Fix GH-16337: Use-after-free in SplHeap
ndossche Oct 10, 2024
6902e19
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 12, 2024
3ed01d4
Add missing hierarchy checks to replaceChild
ndossche Oct 11, 2024
c31eac7
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 12, 2024
105cf92
Merge branch 'PHP-8.4'
ndossche Oct 12, 2024
b7b0b95
Restore accidentally deleted check
ndossche Oct 12, 2024
a1974e6
Merge branch 'PHP-8.4'
ndossche Oct 12, 2024
fa6a0f8
Backport 0a39890c: Fix libxml2 2.12 build due to API breaks
ndossche Dec 1, 2023
dbde99d
Backport e2d97314: Backport deprecation warning ignores to unbreak CI
ndossche Dec 6, 2023
bb46b4b
Backport 4fe82131: Backport libxml2 2.13.2 fixes (#14816)
ndossche Jul 4, 2024
b786187
Backport f74f9b07: Update libxml test for the directory field behavio…
ndossche Sep 12, 2024
6199289
Backport 3ec5919e: Update error message for libxml 2.13
ndossche Sep 12, 2024
5bd04ac
Workaround deprecation warning in zend_test on 8.1
ndossche Oct 11, 2024
14c1073
Backport 061058a9: Test fixes for libxml2 2.12.0
ndossche Nov 29, 2023
2c40762
Fix error message for newer libxml
ndossche Oct 12, 2024
2554640
Merge remote-tracking branch 'upstream/PHP-8.1' into PHP-8.2
ndossche Oct 12, 2024
3d9e55c
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 12, 2024
2577b89
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 12, 2024
18ab3b9
Merge branch 'PHP-8.4'
ndossche Oct 12, 2024
42f8776
Fix GH-16359 curl write callback crash on FCC usage w/o user function.
devnexen Oct 11, 2024
2e263d2
Merge branch 'PHP-8.4'
devnexen Oct 12, 2024
9402121
Fix potentially erroneous php_win32_crt_compatible() (GH-16374)
cmb69 Oct 12, 2024
549bcdb
Fix GH-16357: openssl may modify member types of certificate arrays
cmb69 Oct 11, 2024
76a819e
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 12, 2024
33fab73
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 12, 2024
40052b3
Merge branch 'PHP-8.4'
cmb69 Oct 12, 2024
e583890
Fix socket_recvfrom overflow on buffer size.
devnexen Oct 12, 2024
f12e496
Merge branch 'PHP-8.2' into PHP-8.3
devnexen Oct 12, 2024
10dbdc5
Merge branch 'PHP-8.3' into PHP-8.4
devnexen Oct 12, 2024
35c8a01
Merge branch 'PHP-8.4'
devnexen Oct 12, 2024
a3eb1fd
Fix GH-16388: UB when freeing a cloned _ZendTestFiber
cmb69 Oct 12, 2024
41d75f4
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 12, 2024
8a5c716
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 12, 2024
7a1f4b6
Merge branch 'PHP-8.4'
cmb69 Oct 12, 2024
6ff4a2d
Fix GH-16318: Recursive array segfaults soap encoding
ndossche Oct 10, 2024
f108c16
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 12, 2024
e150b0b
Merge branch 'PHP-8.4'
ndossche Oct 12, 2024
6c9db60
ext/standard/exec.c: combine conditions, update docs
DanielEScherzer Sep 19, 2024
b6ca871
[skip ci] Mark some more macOS tests as flaky
iluuu1994 Oct 13, 2024
5c8f42f
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 13, 2024
b7e3997
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 13, 2024
50b6713
Merge branch 'PHP-8.4'
iluuu1994 Oct 13, 2024
d94be24
Fix GH-16326: Memory management is broken for bad dictionaries
cmb69 Oct 10, 2024
631c04e
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 13, 2024
a7918a7
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 13, 2024
b2ff871
Merge branch 'PHP-8.4'
cmb69 Oct 13, 2024
150599e
win32/dllmain.c: drop some unused code (#16353)
DanielEScherzer Oct 13, 2024
84a8fea
Fix GH-16290: session cookie_lifetime ini value overflow.
devnexen Oct 8, 2024
f31232e
Merge branch 'PHP-8.2' into PHP-8.3
devnexen Oct 13, 2024
4d008e3
Merge branch 'PHP-8.3' into PHP-8.4
devnexen Oct 13, 2024
ecccb36
Merge branch 'PHP-8.4'
devnexen Oct 13, 2024
8475d5f
Zend/tests: organize some tests with subdirectories (#15638)
DanielEScherzer Oct 13, 2024
d70b781
ext/gmp: gmp_pow fix FPE with large values.
devnexen Oct 12, 2024
47c8146
Merge branch 'PHP-8.2' into PHP-8.3
devnexen Oct 13, 2024
61d34b3
Merge branch 'PHP-8.3' into PHP-8.4
devnexen Oct 13, 2024
79c71c9
Merge branch 'PHP-8.4'
devnexen Oct 13, 2024
da4eab6
[skip ci] Some more organisational fixes to UPGRADING
Girgias Oct 13, 2024
810a121
Merge branch 'PHP-8.4'
Girgias Oct 13, 2024
3843f0e
Fix GH-16409: Segfault in exif_thumbnail when not dealing with a real…
ndossche Oct 13, 2024
34e635f
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 13, 2024
63c9d12
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 13, 2024
41c55d1
Merge branch 'PHP-8.4'
ndossche Oct 13, 2024
fe76b39
Move ARG_(WITH|ENABLE) to the toplevel (GH-16391)
cmb69 Oct 14, 2024
275f63e
Zend/tests: organize some tests with subdirectories (2) (#16423)
DanielEScherzer Oct 14, 2024
c5745f4
Fix array to string conversion warning emitted in optimizer
iluuu1994 Oct 13, 2024
3546733
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 14, 2024
39533af
Merge branch 'PHP-8.4'
iluuu1994 Oct 14, 2024
06efe44
Skip shebang in cli-server router script
iluuu1994 Oct 13, 2024
77f7708
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 14, 2024
3074cbf
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 14, 2024
0f17271
Merge branch 'PHP-8.4'
iluuu1994 Oct 14, 2024
6d1881b
ext/zlib: gzfile/gzopen/readgzfile converting use_include_path argume…
devnexen Oct 13, 2024
323c9f4
[skip ci] UPGRADING/NEWS changes
devnexen Oct 14, 2024
6056217
Split expression
iluuu1994 Oct 14, 2024
67318e9
Fix op2 caching for static properties
iluuu1994 Oct 11, 2024
16d25da
Merge branch 'PHP-8.4'
iluuu1994 Oct 14, 2024
b817a4f
Fix GH-16427: Unchecked libavif return values
cmb69 Oct 14, 2024
05176ad
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 14, 2024
055b15f
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 14, 2024
d531fbd
Merge branch 'PHP-8.4'
cmb69 Oct 14, 2024
b5c09b1
Fix exception in assert() callback with bail enabled
iluuu1994 Oct 8, 2024
f512ff4
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 14, 2024
5f2f1a5
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 14, 2024
4195808
Merge branch 'PHP-8.4'
iluuu1994 Oct 14, 2024
5c79841
Fix segfault in zend_test_execute_internal()
iluuu1994 Oct 8, 2024
0237361
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 14, 2024
7d99355
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 14, 2024
8e3a773
Merge branch 'PHP-8.4'
iluuu1994 Oct 14, 2024
5955ce8
Fix segfault on debug_backtrace() in _ZendTestFiber
iluuu1994 Oct 8, 2024
94bd6ca
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 14, 2024
e7dc0d2
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 14, 2024
b55b957
Merge branch 'PHP-8.4'
iluuu1994 Oct 14, 2024
817d21e
Fix deprecation warnings in tests
iluuu1994 Oct 14, 2024
b1bd4e6
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 14, 2024
fc210b4
Merge branch 'PHP-8.4'
iluuu1994 Oct 14, 2024
253f4af
[skip ci] Fix new closure dump syntax in test
iluuu1994 Oct 14, 2024
6292e5c
Merge branch 'PHP-8.4'
iluuu1994 Oct 14, 2024
3401d55
zend_weakrefs: Add `zend_weakrefs_hash_(clean|destroy)()` (#16439)
TimWolla Oct 14, 2024
ec8a24f
Fix GH-16397: Segmentation fault when comparing FFI object (#16401)
ndossche Oct 14, 2024
c924af0
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 14, 2024
7a7ab73
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 14, 2024
8f1543a
Merge branch 'PHP-8.4'
ndossche Oct 14, 2024
d613c0e
Fix GH-16429: Segmentation fault (access null pointer) in SoapClient
ndossche Oct 14, 2024
0b657fe
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 14, 2024
37db2ed
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 14, 2024
275c7f2
Merge branch 'PHP-8.4'
ndossche Oct 14, 2024
edf351c
Mention where headers were already sent if session_start fails (#16378)
NattyNarwhal Oct 15, 2024
bf786d0
Fix GH-16393: Assertion failure in ext/opcache/jit/zend_jit.c:2897
dstogov Oct 15, 2024
dd45d85
Merge branch 'PHP-8.2' into PHP-8.3
dstogov Oct 15, 2024
f68dcc5
Merge branch 'PHP-8.3' into PHP-8.4
dstogov Oct 15, 2024
023d66d
Merge branch 'PHP-8.4'
dstogov Oct 15, 2024
1d94fb8
Fix handling of invalid iterator in zend_weakmap_iterator_get_current…
arnaud-lb Oct 14, 2024
900afb6
Merge branch 'PHP-8.2' into PHP-8.3
arnaud-lb Oct 15, 2024
8aa3260
Merge branch 'PHP-8.3' into PHP-8.4
arnaud-lb Oct 15, 2024
23c60d6
Merge branch 'PHP-8.4'
arnaud-lb Oct 15, 2024
b9a64c5
Fix GH-16358: Segmentation fault (access null pointer) in Zend/zend_o…
dstogov Oct 15, 2024
ab595c0
Fix GH-16411: gmp_export() can cause overflow
cmb69 Oct 13, 2024
ea6f78e
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 15, 2024
b1fbdd8
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 15, 2024
dbdcc95
Merge branch 'PHP-8.4'
cmb69 Oct 15, 2024
0be5dd1
[ci skip] Fix UPGRADING section
ndossche Oct 15, 2024
5e2e49a
Merge branch 'PHP-8.4'
ndossche Oct 15, 2024
9a4ec40
[skip ci] Group similar entries in UPGRADING (#16420)
Girgias Oct 15, 2024
2d9eb54
Merge branch 'PHP-8.4'
Girgias Oct 15, 2024
097edc8
Allow JIT for passing arguments to trampolines and "bad" functions …
dstogov Oct 15, 2024
2bdf2f9
Fix GH-16433: Large values for openssl_csr_sign() $days overflow
cmb69 Oct 14, 2024
931762c
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 16, 2024
ef1c3b8
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 16, 2024
99aa43a
Merge branch 'PHP-8.4'
cmb69 Oct 16, 2024
6d9f040
Stop trace recording only on ENTER to FAKE_CLOSURE (continue on EXIT)…
dstogov Oct 16, 2024
b7fd773
Refactor zlib dictionary processing (GH-16407)
cmb69 Oct 16, 2024
cb6025c
curl: Add `curl_multi_get_handles()` (#16363)
TimWolla Oct 16, 2024
d70f3ba
Fix GH-16465: Heap buffer overflow in DOMNode->getElementByTagName
ndossche Oct 16, 2024
1083872
Merge branch 'PHP-8.4'
ndossche Oct 16, 2024
a8bbc84
Disallow asymmetric visibility on static properties
iluuu1994 Oct 16, 2024
ec15210
Merge branch 'PHP-8.4'
iluuu1994 Oct 16, 2024
8820a10
Fix uaf in SplDoublyLinkedList::offsetSet()
iluuu1994 Oct 16, 2024
e5d837c
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 16, 2024
d15e227
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 16, 2024
1a2b370
Merge branch 'PHP-8.4'
iluuu1994 Oct 16, 2024
5ef3fe2
Download enchant dict from downloads.php.net
cmb69 Oct 8, 2024
5dba6ae
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 16, 2024
89f10e6
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 16, 2024
3351dae
Merge branch 'PHP-8.4'
cmb69 Oct 16, 2024
cf3ecff
Making zend_hash_str_find_ptr_lc && zend_hash_find_ptr_lc C++ friendl…
KaseyJenkins Oct 17, 2024
95dbc33
Merge branch 'PHP-8.4'
dstogov Oct 17, 2024
951dab7
UPGRADING: Fix `IntlTimeZone::getIanaID` new method notice
Ayesh Oct 17, 2024
6896756
Update IR
dstogov Oct 17, 2024
c98c198
Add test for GH-16355 (fixed by previous commit)
dstogov Oct 17, 2024
39fa9cf
Merge branch 'PHP-8.4'
dstogov Oct 17, 2024
84d6cb8
Unify headers already sent/session already started error handler (#16…
NattyNarwhal Oct 17, 2024
12c987f
Fix use-after-free in SplObjectStorage::setInfo()
iluuu1994 Oct 17, 2024
40e43ff
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 17, 2024
6d6b20f
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 17, 2024
9cb0f03
Merge branch 'PHP-8.4'
iluuu1994 Oct 17, 2024
7fe168d
Fix uaf in SplFixedArray::unset()
iluuu1994 Oct 17, 2024
0932b76
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 17, 2024
c82cea0
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 17, 2024
76138d6
Merge branch 'PHP-8.4'
iluuu1994 Oct 17, 2024
1c542af
Revert undoing of partial spl_filesystem_object initialization
iluuu1994 Oct 17, 2024
ee41549
Merge branch 'PHP-8.4'
iluuu1994 Oct 17, 2024
5cb38e9
Fix various document ref pointer mismanagements
ndossche Oct 10, 2024
81a2cd4
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 17, 2024
a73754f
Merge branch 'PHP-8.4'
ndossche Oct 17, 2024
6a8d0a0
Fix GH-16406: Assertion failure in ext/phar/phar.c:2808
ndossche Oct 16, 2024
25817ad
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 17, 2024
d8e5166
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 17, 2024
7aeafe4
Merge branch 'PHP-8.4'
ndossche Oct 17, 2024
41af933
Fix GH-16473: dom_import_simplexml stub is wrong
ndossche Oct 17, 2024
c26d5f2
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 17, 2024
55266d4
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 17, 2024
b6f59d2
Merge branch 'PHP-8.4'
ndossche Oct 17, 2024
6ddab74
sapi: Fix some variable shadowing (#16485)
Girgias Oct 17, 2024
e2dee95
ext/soap: Reduce scope of variable
Girgias Oct 16, 2024
5e7c876
ext/soap: Replace memset with 0 initialization
Girgias Oct 16, 2024
cfe2e11
ext/soap: Use bool instead of int
Girgias Oct 16, 2024
81132bb
ext/soap: Eliminate some variable shadowing
Girgias Oct 16, 2024
f0a35e2
ext/soap: Check services are not empty via an if guard
Girgias Oct 16, 2024
6171362
ext/soap: Indentation fix
Girgias Oct 16, 2024
d48bc08
ext/soap: Reduce scope and use proper names for XML attribute variables
Girgias Oct 16, 2024
42e179e
ext/soap: Minor refactoring to wsdl_message()
Girgias Oct 16, 2024
8b5668e
Fix invalid target opline with jit->reuse_ip active (#16457)
dstogov Oct 18, 2024
e61e2c1
Merge branch 'PHP-8.4'
dstogov Oct 18, 2024
9bc3418
Fix GH-16454: Unhandled INF in date_sunset() with tiny $utcOffset
cmb69 Oct 17, 2024
64f312f
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Oct 18, 2024
66fe549
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Oct 18, 2024
a920afd
Merge branch 'PHP-8.4'
cmb69 Oct 18, 2024
b2b294a
Fixed bug GH-16037 (Assertion failure in ext/date/php_date.c)
derickr Oct 18, 2024
8acdde5
Merge branch 'PHP-8.2' into PHP-8.3
derickr Oct 18, 2024
9923e14
Merge branch 'PHP-8.3' into PHP-8.4
derickr Oct 18, 2024
b63167f
Merge branch 'PHP-8.4'
derickr Oct 18, 2024
062837a
[skip ci] Mark another phar test as flaky on macOS
iluuu1994 Oct 18, 2024
ce44a7f
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Oct 18, 2024
fe31018
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Oct 18, 2024
4704f00
Merge branch 'PHP-8.4'
iluuu1994 Oct 18, 2024
cb1d4ba
GH-16315: Improve error messages when extending enums
DanielEScherzer Oct 18, 2024
a00c734
[skip ci] Fix test expectation for Windows
iluuu1994 Oct 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ env:

freebsd_task:
name: FREEBSD_DEBUG_NTS
timeout_in: 50m
freebsd_instance:
image_family: freebsd-13-3
skip: "changesIncludeOnly('docs/**', 'NEWS', 'UPGRADING', 'UPGRADING.INTERNALS', '**/README.*', 'CONTRIBUTING.md', 'CODING_STANDARDS.md', '.circleci/**', 'EXTENSIONS', '**.md', 'docs-old/**')"
env:
ARCH: amd64
install_script:
Expand Down
29 changes: 13 additions & 16 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# For more information, see the GitHub CODEOWNERS documentation:
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

/.github @iluuu1994 @TimWolla
/.github @TimWolla
/build/gen_stub.php @kocsismate
/ext/bcmath @Girgias @nielsdos @SakiTakamachi
/ext/curl @adoy
Expand All @@ -31,7 +31,7 @@
/ext/mbstring @alexdowad @youkidearitai
/ext/mysqlnd @SakiTakamachi
/ext/odbc @NattyNarwhal
/ext/opcache @dstogov @iluuu1994
/ext/opcache @dstogov
/ext/openssl @bukka
/ext/pcntl @devnexen
/ext/pdo @SakiTakamachi
Expand All @@ -54,27 +54,24 @@
/ext/xsl @nielsdos
/main @bukka
/sapi/fpm @bukka
/Zend/Optimizer @dstogov @iluuu1994
/Zend/Optimizer @dstogov
/Zend/zend.* @dstogov
/Zend/zend_alloc.* @dstogov
/Zend/zend_API.* @dstogov @iluuu1994
/Zend/zend_API.* @dstogov
/Zend/zend_call_stack.* @arnaud-lb
/Zend/zend_closures.* @dstogov
/Zend/zend_compile.* @iluuu1994
/Zend/zend_enum.* @iluuu1994
/Zend/zend_execute.* @dstogov @iluuu1994
/Zend/zend_execute_API.c @dstogov @iluuu1994
/Zend/zend_frameless_function.* @iluuu1994
/Zend/zend_execute.* @dstogov
/Zend/zend_execute_API.c @dstogov
/Zend/zend_gc.* @dstogov @arnaud-lb
/Zend/zend_hash.* @dstogov
/Zend/zend_inheritance.* @dstogov @iluuu1994
/Zend/zend_inheritance.* @dstogov
/Zend/zend_max_execution_timer.* @arnaud-lb
/Zend/zend_object_handlers.* @dstogov @iluuu1994
/Zend/zend_objects.* @dstogov @iluuu1994
/Zend/zend_objects_API.* @dstogov @iluuu1994
/Zend/zend_opcode.* @dstogov @iluuu1994
/Zend/zend_object_handlers.* @dstogov
/Zend/zend_objects.* @dstogov
/Zend/zend_objects_API.* @dstogov
/Zend/zend_opcode.* @dstogov
/Zend/zend_string.* @dstogov
/Zend/zend_type*.h @dstogov @iluuu1994
/Zend/zend_type*.h @dstogov
/Zend/zend_variables.* @dstogov
/Zend/zend_vm* @dstogov @iluuu1994
/Zend/zend_vm* @dstogov
*.stub.php @kocsismate
5 changes: 0 additions & 5 deletions .github/actions/apk/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ runs:
re2c \
pkgconf \
mysql-client \
aspell-dev \
hunspell-dev \
hunspell-en \
bzip2-dev \
curl-dev \
freetype-dev \
Expand All @@ -44,12 +41,10 @@ runs:
readline-dev \
sqlite-dev \
tidyhtml-dev \
krb5-dev \
gdbm-dev \
lmdb-dev \
argon2-dev \
enchant2-dev \
enchant2-hunspell \
freetds-dev \
imap-dev \
net-snmp-dev \
Expand Down
7 changes: 6 additions & 1 deletion .github/actions/apt-x64/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
name: apt
inputs:
asan:
default: false
required: false
runs:
using: composite
steps:
Expand Down Expand Up @@ -39,6 +43,7 @@ runs:
libsqlite3-dev \
libsqlite3-mod-spatialite \
libwebp-dev \
${{ inputs.asan == 'false' && 'libavif-dev' || '' }} \
libonig-dev \
libcurl4-openssl-dev \
libxml2-dev \
Expand All @@ -47,7 +52,7 @@ runs:
libedit-dev \
libldap2-dev \
libsodium-dev \
libargon2-0-dev \
libargon2-dev \
libmm-dev \
libsnmp-dev \
postgresql \
Expand Down
21 changes: 4 additions & 17 deletions .github/actions/brew/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,19 @@ runs:
code=" keg.link\(verbose: verbose\?"
sudo sed -Ei '' "s/$code.*/$code, overwrite: true\)/" "$formula_installer"

# Some packages exist on x86 but not arm, or vice versa.
# Install them with reinstall to avoid warnings.
brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c
brew install \
pkg-config \
autoconf \
bison \
re2c
brew install \
[email protected] \
curl \
bzip2 \
enchant \
libffi \
libpng \
webp \
freetype \
intltool \
icu4c \
libiconv \
zlib \
t1lib \
gd \
libzip \
gmp \
tidy-html5 \
libxml2 \
libjpeg \
libsodium \
libxslt \
postgresql
brew link icu4c gettext --force
libxslt
4 changes: 4 additions & 0 deletions .github/actions/configure-x64/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ inputs:
skipSlow:
default: false
required: false
asan:
default: false
required: false
runs:
using: composite
steps:
Expand All @@ -28,6 +31,7 @@ runs:
--enable-gd \
--with-jpeg \
--with-webp \
${{ inputs.asan == 'false' && '--with-avif' || '' }} \
--with-freetype \
--with-xpm \
--enable-exif \
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-mssql/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ runs:
-p 1433:1433 \
--name sql1 \
-h sql1 \
-d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04
-d mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04
14 changes: 5 additions & 9 deletions .github/actions/setup-x64/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@ runs:
run: |
set -x

sudo service mysql start
sudo service slapd start
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
# Ensure local_infile tests can run.
mysql -uroot -proot -e "SET GLOBAL local_infile = true"
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login odbc_test with password='password', check_policy=off; create user odbc_test for login odbc_test; grant alter, control, delete to odbc_test;"
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "ALTER SERVER ROLE sysadmin ADD MEMBER odbc_test;"
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE odbc;"
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE pdo_odbc;"
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "create login odbc_test with password='password', check_policy=off; create user odbc_test for login odbc_test; grant alter, control, delete to odbc_test;"
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "ALTER SERVER ROLE sysadmin ADD MEMBER odbc_test;"
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE odbc;"
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE pdo_odbc;"
sudo locale-gen de_DE

./.github/scripts/setup-slapd.sh
Expand Down
106 changes: 106 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -389,3 +389,109 @@
- changed-files:
- any-glob-to-any-file:
- sapi/phpdbg/**/*

"ABI break":
- changed-files:
- any-glob-to-any-file:
- 'TSRM/*.h'
- 'Zend/*.h'
- 'Zend/Optimizer/zend_call_graph.h'
- 'Zend/Optimizer/zend_cfg.h'
- 'Zend/Optimizer/zend_dfg.h'
- 'Zend/Optimizer/zend_dump.h'
- 'Zend/Optimizer/zend_func_info.h'
- 'Zend/Optimizer/zend_inference.h'
- 'Zend/Optimizer/zend_optimizer.h'
- 'Zend/Optimizer/zend_ssa.h'
- 'Zend/Optimizer/zend_worklist.h'
- 'ext/curl/php_curl.h'
- 'ext/date/lib/timelib.h'
- 'ext/date/lib/timelib_config.h'
- 'ext/date/php_date.h'
- 'ext/dom/dom_ce.h'
- 'ext/dom/namespace_compat.h'
- 'ext/dom/xml_common.h'
- 'ext/dom/xpath_callbacks.h'
- 'ext/filter/php_filter.h'
- 'ext/gd/libgd/*.h'
- 'ext/gd/php_gd.h'
- 'ext/gmp/php_gmp_int.h'
- 'ext/hash/php_hash.h'
- 'ext/hash/php_hash_adler32.h'
- 'ext/hash/php_hash_crc32.h'
- 'ext/hash/php_hash_fnv.h'
- 'ext/hash/php_hash_gost.h'
- 'ext/hash/php_hash_haval.h'
- 'ext/hash/php_hash_joaat.h'
- 'ext/hash/php_hash_md.h'
- 'ext/hash/php_hash_murmur.h'
- 'ext/hash/php_hash_ripemd.h'
- 'ext/hash/php_hash_sha.h'
- 'ext/hash/php_hash_sha3.h'
- 'ext/hash/php_hash_snefru.h'
- 'ext/hash/php_hash_tiger.h'
- 'ext/hash/php_hash_whirlpool.h'
- 'ext/hash/php_hash_xxhash.h'
- 'ext/hash/xxhash/xxhash.h'
- 'ext/iconv/php_iconv.h'
- 'ext/json/php_json.h'
- 'ext/json/php_json_parser.h'
- 'ext/json/php_json_scanner.h'
- 'ext/libxml/php_libxml.h'
- 'ext/mbstring/libmbfl/config.h'
- 'ext/mbstring/libmbfl/mbfl/eaw_table.h'
- 'ext/mbstring/libmbfl/mbfl/mbfilter.h'
- 'ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h'
- 'ext/mbstring/libmbfl/mbfl/mbfilter_pass.h'
- 'ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h'
- 'ext/mbstring/libmbfl/mbfl/mbfl_consts.h'
- 'ext/mbstring/libmbfl/mbfl/mbfl_convert.h'
- 'ext/mbstring/libmbfl/mbfl/mbfl_defs.h'
- 'ext/mbstring/libmbfl/mbfl/mbfl_encoding.h'
- 'ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h'
- 'ext/mbstring/libmbfl/mbfl/mbfl_language.h'
- 'ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h'
- 'ext/mbstring/libmbfl/mbfl/mbfl_string.h'
- 'ext/mbstring/mbstring.h'
- 'ext/mbstring/php_mbregex.h'
- 'ext/mbstring/php_onig_compat.h'
- 'ext/mysqli/mysqli_mysqlnd.h'
- 'ext/mysqli/php_mysqli_structs.h'
- 'ext/mysqlnd/*.h'
- 'ext/pcre/pcre2lib/*.h'
- 'ext/pcre/php_pcre.h'
- 'ext/pdo/pdo_sql_parser.h'
- 'ext/pdo/php_pdo.h'
- 'ext/pdo/php_pdo_driver.h'
- 'ext/pdo/php_pdo_error.h'
- 'ext/phar/php_phar.h'
- 'ext/random/php_random.h'
- 'ext/random/php_random_csprng.h'
- 'ext/random/php_random_uint128.h'
- 'ext/session/mod_files.h'
- 'ext/session/mod_mm.h'
- 'ext/session/mod_user.h'
- 'ext/session/php_session.h'
- 'ext/simplexml/php_simplexml.h'
- 'ext/simplexml/php_simplexml_exports.h'
- 'ext/sockets/php_sockets.h'
- 'ext/sockets/windows_common.h'
- 'ext/sodium/php_libsodium.h'
- 'ext/spl/php_spl.h'
- 'ext/spl/spl_array.h'
- 'ext/spl/spl_directory.h'
- 'ext/spl/spl_dllist.h'
- 'ext/spl/spl_exceptions.h'
- 'ext/spl/spl_fixedarray.h'
- 'ext/spl/spl_functions.h'
- 'ext/spl/spl_heap.h'
- 'ext/spl/spl_iterators.h'
- 'ext/spl/spl_observer.h'
- 'ext/standard/*.h'
- 'ext/xml/expat_compat.h'
- 'ext/xml/php_xml.h'
- 'main/*.h'
- 'main/streams/*.h'
- 'sapi/cli/cli.h'
- 'sapi/embed/php_embed.h'
- 'win32/*.h'
5 changes: 3 additions & 2 deletions .github/nightly_matrix.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?php

const BRANCHES = [
['name' => 'master', 'ref' => 'master', 'version' => ['major' => 8, 'minor' => 4]],
['name' => 'master', 'ref' => 'master', 'version' => ['major' => 8, 'minor' => 5]],
['name' => 'PHP-8.4', 'ref' => 'PHP-8.4', 'version' => ['major' => 8, 'minor' => 4]],
['name' => 'PHP-8.3', 'ref' => 'PHP-8.3', 'version' => ['major' => 8, 'minor' => 3]],
['name' => 'PHP-8.2', 'ref' => 'PHP-8.2', 'version' => ['major' => 8, 'minor' => 2]],
['name' => 'PHP-8.1', 'ref' => 'PHP-8.1', 'version' => ['major' => 8, 'minor' => 1]],
Expand Down Expand Up @@ -101,7 +102,7 @@ function get_macos_matrix_include(array $branches) {
'branch' => $branch,
'debug' => $debug,
'zts' => $zts,
'os' => $branch['name'] === 'master' ? '13' : '12',
'os' => in_array($branch['name'], ['master', 'PHP-8.4'], true) ? '13' : '12',
'arch' => 'X64',
'test_jit' => true,
];
Expand Down
7 changes: 1 addition & 6 deletions .github/scripts/windows/build_task.bat
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@ if %errorlevel% neq 0 exit /b 3
if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts
if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%

rem Some undefined behavior is reported on 32-bit, this should be fixed
if "%PLATFORM%" == "x86" (
set CFLAGS=/W1
) else (
set CFLAGS=/W1 /WX
)
set CFLAGS=/W1 /WX

cmd /c configure.bat ^
--enable-snapshot-build ^
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/windows/find-target-branch.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i
for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i

if /i "%BRANCH%" equ "8.4" (
if /i "%BRANCH%" equ "8.5" (
set BRANCH=master
)
Loading