archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0' into PHP-7.1

Browse source 
* PHP-7.0:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
This commit is contained in:
Joe Watkins 2017-01-30 11:26:37 +00:00
commit e6bc4f39a2
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
2 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/dom/document.c
View file

@ -1628,6 +1628,9 @@ PHP_FUNCTION(dom_document_savexml)
doc_props = dom_get_doc_props(intern->document); doc_props = dom_get_doc_props(intern->document);
format = doc_props->formatoutput; format = doc_props->formatoutput;
if (format) {
options = options | XML_SAVE_FORMAT;
}
buf = xmlBufferCreate(); buf = xmlBufferCreate();
if (!buf) { if (!buf) {

33
ext/dom/tests/DOMDocument_savexml_basic2.phpt Normal file
View file

@ -0,0 +1,33 @@
--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>