Commit 034c3f2

committed

Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2: ext/xml: Suppress libxml deprecation for `_xmlParserCtxt.inState` (#19131)

2 parents eade5c1 + 9eee4dd commit 034c3f2Copy full SHA for 034c3f2

File tree

-0

lines changed

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,9 @@ _get_entity(void user, const xmlChar name)`
`375`	`375`	`if (ret == NULL)`
`376`	`376`	`ret = xmlGetDocEntity(parser->parser->myDoc, name);`
`377`	`377`
	`378`	`+ ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")`
`378`	`379`	`if (ret == NULL \|\| parser->parser->instate == XML_PARSER_CONTENT) {`
	`380`	`+ ZEND_DIAGNOSTIC_IGNORED_END`
`379`	`381`	`if (ret == NULL \|\| ret->etype == XML_INTERNAL_GENERAL_ENTITY \|\| ret->etype == XML_INTERNAL_PARAMETER_ENTITY \|\| ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) {`
`380`	`382`	`/* Predefined entities will expand unless no cdata handler is present */`
`381`	`383`	`if (parser->h_default && ! (ret && ret->etype == XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) {`

Comments

(0)