Skip to content

[pull] master from php:master #1161

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 6 commits into from
Oct 30, 2025
Merged

[pull] master from php:master #1161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4098613
[ci skip] Fix CODEOWNERS name
ndossche Oct 30, 2025
a585ace
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Oct 30, 2025
0929f73
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 30, 2025
2e0ab27
Merge branch 'PHP-8.4' into PHP-8.5
ndossche Oct 30, 2025
2523491
Merge branch 'PHP-8.5'
ndossche Oct 30, 2025
425b97e
phar: Remove unused macro (#20343)
ndossche Oct 30, 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
22 changes: 11 additions & 11 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@

/.github @TimWolla
/build/gen_stub.php @kocsismate
/ext/bcmath @nielsdos @SakiTakamachi
/ext/bcmath @ndossche @SakiTakamachi
/ext/curl @adoy
/ext/date @derickr
/ext/dba @Girgias
/ext/dom @nielsdos
/ext/dom @ndossche
/ext/ffi @dstogov
/ext/gd @devnexen
/ext/gettext @devnexen
/ext/gmp @Girgias
/ext/intl @devnexen
/ext/json @bukka
/ext/lexbor @kocsismate @nielsdos
/ext/libxml @nielsdos
/ext/lexbor @kocsismate @ndossche
/ext/libxml @ndossche
/ext/mbstring @alexdowad @youkidearitai
/ext/mysqli @bukka @kamil-tekiela
/ext/mysqlnd @bukka @kamil-tekiela @SakiTakamachi
Expand All @@ -47,17 +47,17 @@
/ext/random @TimWolla @zeriyoshi
/ext/reflection @DanielEScherzer
/ext/session @Girgias
/ext/simplexml @nielsdos
/ext/soap @nielsdos
/ext/simplexml @ndossche
/ext/soap @ndossche
/ext/sockets @devnexen
/ext/spl @Girgias
/ext/standard @bukka
/ext/tidy @nielsdos
/ext/tidy @ndossche
/ext/uri @kocsismate @TimWolla
/ext/xml @nielsdos
/ext/xmlreader @nielsdos
/ext/xmlwriter @nielsdos
/ext/xsl @nielsdos
/ext/xml @ndossche
/ext/xmlreader @ndossche
/ext/xmlwriter @ndossche
/ext/xsl @ndossche
/main @bukka
/sapi/fpm @bukka
/Zend/Optimizer @dstogov
Expand Down
7 changes: 0 additions & 7 deletions ext/phar/phar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,17 +464,10 @@ ZEND_ATTRIBUTE_NONNULL void phar_entry_remove(phar_entry_data *idata, char **err
| ((uint32_t)(((unsigned char*)(buffer))[1]) << 8) \
| ((uint32_t)((unsigned char*)(buffer))[0]); \
(buffer) += 4
# define PHAR_GET_16(buffer, var) \
var = ((uint16_t)(((unsigned char*)(buffer))[1]) << 8) \
| ((uint16_t)((unsigned char*)(buffer))[0]); \
(buffer) += 2
#else
# define PHAR_GET_32(buffer, var) \
memcpy(&var, buffer, sizeof(var)); \
buffer += 4
# define PHAR_GET_16(buffer, var) \
var = *(uint16_t*)(buffer); \
buffer += 2
#endif
#define PHAR_ZIP_16(var) ((uint16_t)((((uint16_t)var[0]) & 0xff) | \
(((uint16_t)var[1]) & 0xff) << 8))
Expand Down
Loading