com php-src: Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)": ext/dom/document.c
ext/dom/tests/DOMDocument_savexml_basic2.phpt
| From: | Joe Watkins | Date: | Wed, 01 Feb 2017 19:17:50 +0000 |
| Subject: | com php-src: Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)": ext/dom/document.c ext/dom/tests/DOMDocument_savexml_basic2.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96963@lists.php.net to get a copy of this message | ||
Commit: 8a0c388e11a720949897c0371ee4ac4daf4eea37
Author: Joe Watkins <krakjoe@php.net> Wed, 1 Feb 2017 19:17:50 +0000
Parents: 49e9ae1fc1b5a4b0404135d1827ed64a1481d623
Branches: PHP-7.1.2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a0c388e11a720949897c0371ee4ac4daf4eea37
Log:
Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)"
This reverts commit 62938bf08806129b42b17e74d79a450c30d4ff30.
Bugs:
https://bugs.php.net/2346
https://bugs.php.net/2454
Changed paths:
M ext/dom/document.c
D ext/dom/tests/DOMDocument_savexml_basic2.phpt
Diff:
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 9250b92..0086d13 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -1628,9 +1628,6 @@ PHP_FUNCTION(dom_document_savexml)
doc_props = dom_get_doc_props(intern->document);
format = doc_props->formatoutput;
- if (format) {
- options = options | XML_SAVE_FORMAT;
- }
buf = xmlBufferCreate();
if (!buf) {
diff --git a/ext/dom/tests/DOMDocument_savexml_basic2.phpt
b/ext/dom/tests/DOMDocument_savexml_basic2.phpt
deleted file mode 100644
index 7c01014..0000000
--- a/ext/dom/tests/DOMDocument_savexml_basic2.phpt
+++ /dev/null
@@ -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>
\ No newline at end of file