Commit 826fa36

committed

Merge branch 'PHP-8.3' into PHP-8.4

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

2 parents a57f582 + 034c3f2 commit 826fa36Copy full SHA for 826fa36

File tree

-0

lines changed

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,9 @@ get_entity(void user, const xmlChar name)`
`355`	`355`	`if (ret == NULL)`
`356`	`356`	`ret = xmlGetDocEntity(parser->parser->myDoc, name);`
`357`	`357`
	`358`	`+ ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")`
`358`	`359`	`if (ret == NULL \|\| parser->parser->instate == XML_PARSER_CONTENT) {`
	`360`	`+ ZEND_DIAGNOSTIC_IGNORED_END`
`359`	`361`	`if (ret == NULL \|\| ret->etype == XML_INTERNAL_GENERAL_ENTITY \|\| ret->etype == XML_INTERNAL_PARAMETER_ENTITY \|\| ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) {`
`360`	`362`	`/* Predefined entities will expand unless no cdata handler is present */`
`361`	`363`	`if (parser->h_default && ! (ret && ret->etype == XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) {`

Comments

(0)