mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: sync NEWS with the reverted stuff Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)" Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)"
This commit is contained in:
commit
3bc7ea9a0a
@ -26,7 +26,6 @@
|
||||
#include "php.h"
|
||||
#if HAVE_LIBXML && HAVE_DOM
|
||||
#include "php_dom.h"
|
||||
#include <libxml/xmlsave.h>
|
||||
#include <libxml/SAX.h>
|
||||
#ifdef LIBXML_SCHEMAS_ENABLED
|
||||
#include <libxml/relaxng.h>
|
||||
@ -1617,47 +1616,36 @@ PHP_FUNCTION(dom_document_savexml)
|
||||
dom_doc_propsptr doc_props;
|
||||
int size, format, saveempty = 0;
|
||||
zend_long options = 0;
|
||||
xmlSaveCtxtPtr xscp;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|O!l", &id, dom_document_class_entry, &nodep, dom_node_class_entry, &options) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
options = options | XML_SAVE_AS_XML;
|
||||
|
||||
DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
|
||||
|
||||
doc_props = dom_get_doc_props(intern->document);
|
||||
format = doc_props->formatoutput;
|
||||
if (format) {
|
||||
options = options | XML_SAVE_FORMAT;
|
||||
}
|
||||
|
||||
buf = xmlBufferCreate();
|
||||
if (!buf) {
|
||||
php_error_docref(NULL, E_WARNING, "Could not fetch buffer");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
xscp = xmlSaveToBuffer(buf, docp->encoding, options);
|
||||
|
||||
if (nodep != NULL) {
|
||||
/* Dump contents of Node */
|
||||
DOM_GET_OBJ(node, nodep, xmlNodePtr, nodeobj);
|
||||
if (node->doc != docp) {
|
||||
php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(intern->document));
|
||||
xmlBufferFree(buf);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
if(xmlSaveTree(xscp, node) < 0) {
|
||||
xmlBufferFree(buf);
|
||||
buf = xmlBufferCreate();
|
||||
if (!buf) {
|
||||
php_error_docref(NULL, E_WARNING, "Could not fetch buffer");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
} else {
|
||||
if(xmlSaveDoc(xscp, docp) < 0) {
|
||||
xmlBufferFree(buf);
|
||||
RETURN_FALSE;
|
||||
if (options & LIBXML_SAVE_NOEMPTYTAG) {
|
||||
saveempty = xmlSaveNoEmptyTags;
|
||||
xmlSaveNoEmptyTags = 1;
|
||||
}
|
||||
xmlNodeDump(buf, docp, node, 0, format);
|
||||
if (options & LIBXML_SAVE_NOEMPTYTAG) {
|
||||
xmlSaveNoEmptyTags = saveempty;
|
||||
}
|
||||
xmlSaveClose(xscp);
|
||||
mem = (xmlChar*) xmlBufferContent(buf);
|
||||
if (!mem) {
|
||||
xmlBufferFree(buf);
|
||||
@ -1665,6 +1653,22 @@ PHP_FUNCTION(dom_document_savexml)
|
||||
}
|
||||
RETVAL_STRING((char *) mem);
|
||||
xmlBufferFree(buf);
|
||||
} else {
|
||||
if (options & LIBXML_SAVE_NOEMPTYTAG) {
|
||||
saveempty = xmlSaveNoEmptyTags;
|
||||
xmlSaveNoEmptyTags = 1;
|
||||
}
|
||||
/* Encoding is handled from the encoding property set on the document */
|
||||
xmlDocDumpFormatMemory(docp, &mem, &size, format);
|
||||
if (options & LIBXML_SAVE_NOEMPTYTAG) {
|
||||
xmlSaveNoEmptyTags = saveempty;
|
||||
}
|
||||
if (!size || !mem) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
RETVAL_STRINGL((char *) mem, size);
|
||||
xmlFree(mem);
|
||||
}
|
||||
}
|
||||
/* }}} end dom_document_savexml */
|
||||
|
||||
|
@ -1,33 +0,0 @@
|
||||
--TEST--
|
||||
DOM Document: saveXML with createElement and formatOutput
|
||||
--CREDITS--
|
||||
CHU Zhaowei <jhdxr@php.net>
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$dom = new domDocument('1.0', 'UTF-8');
|
||||
$dom->formatOutput = true;
|
||||
|
||||
$root = $dom->createElement('root');
|
||||
$dom->appendChild($root);
|
||||
|
||||
$child1 = $dom->createElement('testsuite');
|
||||
$root->appendChild($child1);
|
||||
|
||||
$child11 = $dom->createElement('testcase');
|
||||
$child11->setAttribute('name', 'leaf1');
|
||||
$child12 = $dom->createElement('testcase');
|
||||
$child12->setAttribute('name', 'leaf2');
|
||||
$child1->appendChild($child11);
|
||||
$child1->appendChild($child12);
|
||||
|
||||
echo $dom->saveXml();
|
||||
--EXPECT--
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<root>
|
||||
<testsuite>
|
||||
<testcase name="leaf1"/>
|
||||
<testcase name="leaf2"/>
|
||||
</testsuite>
|
||||
</root>
|
@ -1,12 +0,0 @@
|
||||
--TEST--
|
||||
Bug #50989 add support LIBXML_NOXMLDECL for DOMDocument::saveXML()
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$dom = new DomDocument();
|
||||
$dom->loadXML("<foo />");
|
||||
|
||||
print $dom->saveXML(null,LIBXML_NOXMLDECL);
|
||||
--EXPECT--
|
||||
<foo/>
|
Loading…
Reference in New Issue
Block a user