Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"

Author: smalyshev

ext/simplexml/simplexml.c

@@ -1211,7 +1211,7 @@ static HashTable *sxe_get_prop_hash(zval *object, int is_debug) /* {{{ */
 				}
 			}
 
-			if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) || node->type == XML_ENTITY_DECL) {
+			if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix))) {
 				goto next_iter;
 			}
 
@@ -1908,7 +1908,7 @@ static int sxe_object_cast_ex(zval *readobj, zval *writeobj, int type)
 
 		if (sxe->node && sxe->node->node) {
 			if (sxe->node->node->children) {
-				contents = xmlNodeListGetRawString((xmlDocPtr) sxe->document->ptr, sxe->node->node->children, 1);
+				contents = xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, sxe->node->node->children, 1);
 			}
 		}
 	}