Skip to content

php-8.1/8.1.34 package update #76128

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
OddBloke merged 2 commits into from
Dec 17, 2025
Merged

php-8.1/8.1.34 package update #76128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0bb4cb
php-8.1/8.1.34 package update
Dec 16, 2025
b5ffd56
php-8.1: refresh fix-pear.patch
OddBloke Dec 17, 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
6 changes: 3 additions & 3 deletions php-8.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: php-8.1
version: "8.1.33"
epoch: 8
version: "8.1.34"
epoch: 0
description: "the PHP programming language"
copyright:
- license: PHP-3.01
Expand Down Expand Up @@ -71,7 +71,7 @@ pipeline:
with:
repository: https://github.com/php/php-src
tag: php-${{package.version}}
expected-commit: 1996831969293a866863f7148f5416e99ea123cb
expected-commit: 94abff74457effe4432f0bd49f5230aa11155dff

# https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/php81/fix-pear.patch
# https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/php81/install-pear.patch
Expand Down
9 changes: 4 additions & 5 deletions php-8.1/fix-pear.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ Closes GH-14837.
create mode 100644 ext/xml/tests/gh14834.phpt

diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index 242cc4ba7c40c..5f55dc62b3687 100644
index 18a7beae..3de77d07 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -375,7 +375,7 @@ _get_entity(void *user, const xmlChar *name)
if (ret == NULL)
@@ -376,7 +376,7 @@ _get_entity(void *user, const xmlChar *name)
ret = xmlGetDocEntity(parser->parser->myDoc, name);

ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
- if (ret == NULL || (parser->parser->instate != XML_PARSER_ENTITY_VALUE && parser->parser->instate != XML_PARSER_ATTRIBUTE_VALUE)) {
+ if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) {
ZEND_DIAGNOSTIC_IGNORED_END
if (ret == NULL || ret->etype == XML_INTERNAL_GENERAL_ENTITY || ret->etype == XML_INTERNAL_PARAMETER_ENTITY || ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) {
/* Predefined entities will expand unless no cdata handler is present */
if (parser->h_default && ! (ret && ret->etype == XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) {
diff --git a/ext/xml/tests/gh14834.phpt b/ext/xml/tests/gh14834.phpt
new file mode 100644
index 0000000000000..2781ba2ed0941
Expand Down Expand Up @@ -64,4 +64,3 @@ index 0000000000000..2781ba2ed0941
+string(7) " & "
+string(1) "
+"

Loading