summaryrefslogtreecommitdiff
path: root/ext/dom
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-15 04:31:31 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-15 04:31:31 +0200
commitf1d7e3ca0b70f910fcecef0278de9c15440ca3c0 (patch)
tree70af7290bf6c0b06f223254537b502013ade302e /ext/dom
parentf98c916845571deeab189fb2ab52a17aef49edb8 (diff)
downloadphp-git-f1d7e3ca0b70f910fcecef0278de9c15440ca3c0.tar.gz
Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'ext/dom')
-rw-r--r--ext/dom/tests/DOMAttr_name_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_appendData_basic.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_appendData_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_insertData_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMComment_appendData_basic.phpt2
-rw-r--r--ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt2
-rw-r--r--ext/dom/tests/DOMComment_insertData_error2.phpt2
-rw-r--r--ext/dom/tests/DOMComment_replaceData_error2.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_entities_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_name_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_notations_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_publicId_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_systemId_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_createAttribute_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_createAttribute_error1.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_encoding_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_implementationRead_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_preserveWhiteSpace_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_resolveExternals_basic.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_save_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_savexml_basic.phpt3
-rw-r--r--ext/dom/tests/DOMDocument_standalone_basic.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_validate_on_parse_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt1
-rw-r--r--ext/dom/tests/DOMNode_cloneNode_basic.phpt1
-rw-r--r--ext/dom/tests/DOMNode_hasChildNodes_basic.phpt2
-rw-r--r--ext/dom/tests/DOMNode_normalize_basic.phpt2
-rw-r--r--ext/dom/tests/DOMNode_removeChild_basic.phpt1
-rw-r--r--ext/dom/tests/DOMText_appendData_basic.phpt2
-rw-r--r--ext/dom/tests/bug28721.phpt1
-rw-r--r--ext/dom/tests/bug32615.phpt2
-rw-r--r--ext/dom/tests/bug37277.phpt2
-rw-r--r--ext/dom/tests/bug37456.phpt2
-rw-r--r--ext/dom/tests/bug44648.phpt2
-rw-r--r--ext/dom/tests/bug46185.phpt2
-rw-r--r--ext/dom/tests/bug47848.phpt2
-rw-r--r--ext/dom/tests/bug66502.phpt2
-rw-r--r--ext/dom/tests/bug67949.phpt2
-rw-r--r--ext/dom/tests/bug73907.phpt2
-rw-r--r--ext/dom/tests/canonicalization.phpt1
-rw-r--r--ext/dom/tests/dom004.phpt1
-rw-r--r--ext/dom/tests/dom005.phpt1
-rw-r--r--ext/dom/tests/dom007.phpt2
-rw-r--r--ext/dom/tests/dom_comment_basic.phpt2
-rw-r--r--ext/dom/tests/dom_comment_variation.phpt2
-rw-r--r--ext/dom/tests/domattributes.phpt2
-rw-r--r--ext/dom/tests/domchardata.phpt1
-rw-r--r--ext/dom/tests/domdocument_createcomment_error_001.phpt2
-rw-r--r--ext/dom/tests/domdocument_createentityreference_001.phpt2
-rw-r--r--ext/dom/tests/domdocument_createentityreference_002.phpt2
-rw-r--r--ext/dom/tests/domelement.phpt1
-rw-r--r--ext/dom/tests/domxpath.phpt2
-rw-r--r--ext/dom/tests/node_textcontent.phpt1
-rw-r--r--ext/dom/tests/regsiter_node_class.phpt1
68 files changed, 39 insertions, 77 deletions
diff --git a/ext/dom/tests/DOMAttr_name_basic_001.phpt b/ext/dom/tests/DOMAttr_name_basic_001.phpt
index 29ca8c585e..44e0324ff3 100644
--- a/ext/dom/tests/DOMAttr_name_basic_001.phpt
+++ b/ext/dom/tests/DOMAttr_name_basic_001.phpt
@@ -11,4 +11,4 @@ $attr = new DOMAttr('category', 'books');
print $attr->name;
?>
--EXPECT--
-category \ No newline at end of file
+category
diff --git a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
index e479c1e8b8..9b37b4443a 100644
--- a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
+++ b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
@@ -34,4 +34,4 @@ CDATA Length (two appends): 8
CDATA Content: data><&"
<?xml version="1.0"?>
-<root><cdata><![CDATA[data><&"]]></cdata></root> \ No newline at end of file
+<root><cdata><![CDATA[data><&"]]></cdata></root>
diff --git a/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt b/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt
index 4126f99141..cf38004d85 100644
--- a/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt
@@ -16,4 +16,4 @@ $root->appendChild($cdata);
$cdata->appendData();
?>
--EXPECTF--
-Warning: DOMCharacterData::appendData() expects exactly 1 parameter, 0 given in %s on line %d \ No newline at end of file
+Warning: DOMCharacterData::appendData() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt b/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
index c91071f364..787c5a7cfb 100644
--- a/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
@@ -17,4 +17,4 @@ $cdata->deleteData(1, 10);
var_dump($cdata->data);
?>
--EXPECTF--
-string(%d) "t" \ No newline at end of file
+string(%d) "t"
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt b/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt
index 3fa7fba2db..3726202d10 100644
--- a/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt
@@ -16,4 +16,4 @@ $root->appendChild($cdata);
$cdata->deleteData();
?>
--EXPECTF--
-Warning: DOMCharacterData::deleteData() expects exactly 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: DOMCharacterData::deleteData() expects exactly 2 parameters, 0 given in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt b/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
index 4795f8176c..2faa02eb58 100644
--- a/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
+++ b/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
@@ -20,4 +20,4 @@ Fatal error: Uncaught DOMException: Index Size Error in %s:%d
Stack trace:
#0 %s(%d): DOMCharacterData->deleteData(5, 1)
#1 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt b/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt
index 813a0be52a..55038e369a 100644
--- a/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt
@@ -16,4 +16,4 @@ $root->appendChild($cdata);
$cdata->insertData();
?>
--EXPECTF--
-Warning: DOMCharacterData::insertData() expects exactly 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: DOMCharacterData::insertData() expects exactly 2 parameters, 0 given in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt b/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt
index 45d25dd859..fb3e66b4f8 100644
--- a/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt
@@ -16,4 +16,4 @@ $root->appendChild($cdata);
$cdata->replaceData();
?>
--EXPECTF--
-Warning: DOMCharacterData::replaceData() expects exactly 3 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: DOMCharacterData::replaceData() expects exactly 3 parameters, 0 given in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt b/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt
index 8b924f04d5..be58fabd4b 100644
--- a/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt
@@ -18,4 +18,4 @@ print $cdata->substringData(1, 6);
?>
--EXPECT--
-estfes \ No newline at end of file
+estfes
diff --git a/ext/dom/tests/DOMComment_appendData_basic.phpt b/ext/dom/tests/DOMComment_appendData_basic.phpt
index c756f1665a..c8a2549685 100644
--- a/ext/dom/tests/DOMComment_appendData_basic.phpt
+++ b/ext/dom/tests/DOMComment_appendData_basic.phpt
@@ -18,4 +18,4 @@ echo $dom->saveXML();
?>
--EXPECTF--
<?xml version="1.0"?>
-<!--test-comment-more-data--> \ No newline at end of file
+<!--test-comment-more-data-->
diff --git a/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt
index ae06d8a87c..4d39ea4695 100644
--- a/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt
+++ b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt
@@ -34,4 +34,4 @@ Comment Length (two appends): 8
Comment Content: data><&"
<?xml version="1.0"?>
-<root><comment><!--data><&"--></comment></root> \ No newline at end of file
+<root><comment><!--data><&"--></comment></root>
diff --git a/ext/dom/tests/DOMComment_insertData_error2.phpt b/ext/dom/tests/DOMComment_insertData_error2.phpt
index d2affa89e7..5f41c23df7 100644
--- a/ext/dom/tests/DOMComment_insertData_error2.phpt
+++ b/ext/dom/tests/DOMComment_insertData_error2.phpt
@@ -21,4 +21,4 @@ try {
?>
--EXPECTF--
-Throws DOMException for offset too large \ No newline at end of file
+Throws DOMException for offset too large
diff --git a/ext/dom/tests/DOMComment_replaceData_error2.phpt b/ext/dom/tests/DOMComment_replaceData_error2.phpt
index 89614f9756..21a1474d53 100644
--- a/ext/dom/tests/DOMComment_replaceData_error2.phpt
+++ b/ext/dom/tests/DOMComment_replaceData_error2.phpt
@@ -21,4 +21,4 @@ try {
?>
--EXPECTF--
-Throws DOMException for offest too large \ No newline at end of file
+Throws DOMException for offest too large
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt
index 6ffe510b0d..e0d9dfa6f5 100644
--- a/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt
@@ -11,4 +11,4 @@ $fragment = new DOMDocumentFragment();
$fragment->appendXML();
?>
--EXPECTF--
-Warning: DOMDocumentFragment::appendXML() expects exactly 1 parameter, 0 given in %s on line %d \ No newline at end of file
+Warning: DOMDocumentFragment::appendXML() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
index 7603a01741..b6ce9dcb65 100644
--- a/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
@@ -16,4 +16,4 @@ Fatal error: Uncaught DOMException: No Modification Allowed Error in %s:%d
Stack trace:
#0 %s(%d): DOMDocumentFragment->appendXML('<bait>crankbait...')
#1 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
index 8735ae6ecf..45ef2bc6e9 100644
--- a/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
@@ -16,4 +16,4 @@ $fragment = $document->createDocumentFragment();
$root->appendChild($fragment);
?>
--EXPECTF--
-Warning: DOMNode::appendChild(): Document Fragment is empty in %s on line %d \ No newline at end of file
+Warning: DOMNode::appendChild(): Document Fragment is empty in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_entities_error_001.phpt b/ext/dom/tests/DOMDocumentType_entities_error_001.phpt
index 73655b06d3..4d047a0058 100644
--- a/ext/dom/tests/DOMDocumentType_entities_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_entities_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$entities = $doctype->entities;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt b/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
index c1f7d9b4de..5825914777 100644
--- a/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$internalSubset = $doctype->internalSubset;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_name_error_001.phpt b/ext/dom/tests/DOMDocumentType_name_error_001.phpt
index d2426e88f8..026ea2393a 100644
--- a/ext/dom/tests/DOMDocumentType_name_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_name_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$name = $doctype->name;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_notations_error_001.phpt b/ext/dom/tests/DOMDocumentType_notations_error_001.phpt
index e4d1c3c8ee..a18f47f3f1 100644
--- a/ext/dom/tests/DOMDocumentType_notations_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_notations_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$notations = $doctype->notations;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt b/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
index 49a7eecbf3..18f069ae16 100644
--- a/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
@@ -16,4 +16,4 @@ $doctype = $doc->doctype;
var_dump($doctype->publicId);
?>
--EXPECT--
-string(0) "" \ No newline at end of file
+string(0) ""
diff --git a/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt b/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
index 275bb65e3e..df6c2bd908 100644
--- a/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$publicId = $doctype->publicId;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt b/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
index 56f7ddda97..e689351dda 100644
--- a/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
@@ -16,4 +16,4 @@ $doctype = $doc->doctype;
var_dump($doctype->systemId);
?>
--EXPECT--
-string(0) "" \ No newline at end of file
+string(0) ""
diff --git a/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt b/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
index a4aadd7070..e302fcc7f1 100644
--- a/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$systemId = $doctype->systemId;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
index 4e00fbb8d8..2a9d5a1d01 100644
--- a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
+++ b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
@@ -23,4 +23,3 @@ echo $doc->saveXML();
--EXPECT--
<?xml version="1.0"?>
<para hahaha=""/>
-
diff --git a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt
index 745873aca9..9a1cba4813 100644
--- a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt
+++ b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt
@@ -26,4 +26,3 @@ catch (DOMException $e) {
?>
--EXPECT--
Test failed!
-
diff --git a/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt b/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
index 9f45f125d5..1c42f23b86 100644
--- a/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
+++ b/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
@@ -27,4 +27,3 @@ echo $doc->saveXML();
--EXPECT--
<?xml version="1.0"?>
<para><?blablabla?><?blablabla datadata?></para>
-
diff --git a/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt b/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
index a0c12b1fe7..e660b93e7f 100644
--- a/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
+++ b/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
@@ -28,4 +28,3 @@ catch (DOMException $e)
?>
--EXPECT--
Test failed!
-
diff --git a/ext/dom/tests/DOMDocument_encoding_basic.phpt b/ext/dom/tests/DOMDocument_encoding_basic.phpt
index 9fc099bfe2..6ac405da69 100644
--- a/ext/dom/tests/DOMDocument_encoding_basic.phpt
+++ b/ext/dom/tests/DOMDocument_encoding_basic.phpt
@@ -49,4 +49,3 @@ Adding UTF-8 encoding: UTF-8
UTF-8 Encoding Read: UTF-8
Adding UTF-16 encoding: UTF-16
UTF-16 Encoding Read: UTF-16
-
diff --git a/ext/dom/tests/DOMDocument_implementationRead_basic.phpt b/ext/dom/tests/DOMDocument_implementationRead_basic.phpt
index 17daddf38b..9482780b21 100644
--- a/ext/dom/tests/DOMDocument_implementationRead_basic.phpt
+++ b/ext/dom/tests/DOMDocument_implementationRead_basic.phpt
@@ -18,4 +18,3 @@ var_dump($doc->implementation);
--EXPECTF--
object(DOMImplementation)#%d (0) {
}
-
diff --git a/ext/dom/tests/DOMDocument_preserveWhiteSpace_basic.phpt b/ext/dom/tests/DOMDocument_preserveWhiteSpace_basic.phpt
index a772bc8569..17430d0770 100644
--- a/ext/dom/tests/DOMDocument_preserveWhiteSpace_basic.phpt
+++ b/ext/dom/tests/DOMDocument_preserveWhiteSpace_basic.phpt
@@ -20,4 +20,3 @@ var_dump($doc->preserveWhiteSpace);
--EXPECT--
bool(true)
bool(false)
-
diff --git a/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt b/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
index 7c5f8901e7..5ffdc91eb2 100644
--- a/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
+++ b/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
@@ -22,7 +22,6 @@ $result = $doc->relaxNGValidate($rng);
var_dump($result);
?>
--EXPECTF--
-
Warning: DOMDocument::relaxNGValidate(): I/O warning : failed to load external entity "%s/foo.rng" in %s on line %d
Warning: DOMDocument::relaxNGValidate(): xmlRelaxNGParse: could not load %s/foo.rng in %s on line %d
diff --git a/ext/dom/tests/DOMDocument_resolveExternals_basic.phpt b/ext/dom/tests/DOMDocument_resolveExternals_basic.phpt
index ccada3fe99..f228a18c1e 100644
--- a/ext/dom/tests/DOMDocument_resolveExternals_basic.phpt
+++ b/ext/dom/tests/DOMDocument_resolveExternals_basic.phpt
@@ -46,4 +46,4 @@ Read initial resolveExternals:
bool(false)
Set resolveExternals to TRUE, reading again:
bool(true)
-Done \ No newline at end of file
+Done
diff --git a/ext/dom/tests/DOMDocument_save_basic.phpt b/ext/dom/tests/DOMDocument_save_basic.phpt
index c7d1ead24b..6f49da496f 100644
--- a/ext/dom/tests/DOMDocument_save_basic.phpt
+++ b/ext/dom/tests/DOMDocument_save_basic.phpt
@@ -30,4 +30,3 @@ echo 'Wrote: ' . $doc->save($temp_filename) . ' bytes'; // Wrote: 72 bytes
?>
--EXPECTF--
Wrote: 72 bytes
-
diff --git a/ext/dom/tests/DOMDocument_savexml_basic.phpt b/ext/dom/tests/DOMDocument_savexml_basic.phpt
index 10f748cc48..491ade95e2 100644
--- a/ext/dom/tests/DOMDocument_savexml_basic.phpt
+++ b/ext/dom/tests/DOMDocument_savexml_basic.phpt
@@ -33,7 +33,6 @@ $result = file_get_contents($filename);
var_dump($result == $dom->saveXML());
unlink($filename);
-
--EXPECTF--
int(151)
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/dom/tests/DOMDocument_standalone_basic.phpt b/ext/dom/tests/DOMDocument_standalone_basic.phpt
index 2316a3897d..4a79ea6c3f 100644
--- a/ext/dom/tests/DOMDocument_standalone_basic.phpt
+++ b/ext/dom/tests/DOMDocument_standalone_basic.phpt
@@ -45,4 +45,4 @@ string(136) "<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE s1 PUBLIC "http://www.ibm.com/example.dtd" "example.dtd">
<s1>foo</s1>
"
-Done \ No newline at end of file
+Done
diff --git a/ext/dom/tests/DOMDocument_validate_on_parse_basic.phpt b/ext/dom/tests/DOMDocument_validate_on_parse_basic.phpt
index a95b0a3043..449fffb4ee 100644
--- a/ext/dom/tests/DOMDocument_validate_on_parse_basic.phpt
+++ b/ext/dom/tests/DOMDocument_validate_on_parse_basic.phpt
@@ -35,4 +35,3 @@ var_dump($dom->validateOnParse);
Checking documented default value: bool(false)
Setting validateOnParse to TRUE: bool(true)
Setting validateOnParse to FALSE: bool(false)
-
diff --git a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
index 4dfafa267d..cdf36319b3 100644
--- a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
+++ b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
@@ -43,4 +43,3 @@ Warning: DOMDocument::loadXML(): No declaration for element NYPHP in Entity, lin
Warning: DOMDocument::loadXML(): Element from was declared #PCDATA but contains non text nodes in Entity, line: %d in %s on line %d
Error Report Above
-
diff --git a/ext/dom/tests/DOMNode_cloneNode_basic.phpt b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
index bbfbcc15ea..101ef67dd4 100644
--- a/ext/dom/tests/DOMNode_cloneNode_basic.phpt
+++ b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
@@ -71,7 +71,6 @@ for ($index = 0; $index < $children->length; $index++) {
echo "node $index\n";
dumpcourse($children->item($index));
}
-
--EXPECTF--
Start cloneNode test
node 0
diff --git a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt
index 6670226246..91f50aa403 100644
--- a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt
+++ b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt
@@ -40,4 +40,4 @@ var_dump($text->hasChildNodes());
--EXPECTF--
Root has child nodes: bool(true)
Title has child nodes: bool(true)
-Text has child nodes: bool(false) \ No newline at end of file
+Text has child nodes: bool(false)
diff --git a/ext/dom/tests/DOMNode_normalize_basic.phpt b/ext/dom/tests/DOMNode_normalize_basic.phpt
index e413fb033a..814f1b3d1a 100644
--- a/ext/dom/tests/DOMNode_normalize_basic.phpt
+++ b/ext/dom/tests/DOMNode_normalize_basic.phpt
@@ -61,4 +61,4 @@ var_dump($title->childNodes->length);
Number of child nodes of title = int(1)
Number of child nodes of title after adding second title = int(2)
Number of child nodes of title after normalizing author = int(2)
-Number of child nodes of title after normalizing title = int(1) \ No newline at end of file
+Number of child nodes of title after normalizing title = int(1)
diff --git a/ext/dom/tests/DOMNode_removeChild_basic.phpt b/ext/dom/tests/DOMNode_removeChild_basic.phpt
index 24f48e6d0b..d9970bd67f 100644
--- a/ext/dom/tests/DOMNode_removeChild_basic.phpt
+++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt
@@ -56,7 +56,6 @@ for ($index = 0; $index < $children->length; $index++) {
$current = $children->item($index);
dumpcourse($current);
}
-
--EXPECTF--
original has 5 nodes
node 4
diff --git a/ext/dom/tests/DOMText_appendData_basic.phpt b/ext/dom/tests/DOMText_appendData_basic.phpt
index 0eea699a76..1472a955ea 100644
--- a/ext/dom/tests/DOMText_appendData_basic.phpt
+++ b/ext/dom/tests/DOMText_appendData_basic.phpt
@@ -37,4 +37,4 @@ Text Content: data><&"
<?xml version="1.0"?>
<root><text>data&gt;&lt;&amp;"</text></root>
===DONE===
- \ No newline at end of file
+
diff --git a/ext/dom/tests/bug28721.phpt b/ext/dom/tests/bug28721.phpt
index 818e62973e..941c8eb879 100644
--- a/ext/dom/tests/bug28721.phpt
+++ b/ext/dom/tests/bug28721.phpt
@@ -119,7 +119,6 @@ print_node_r($p);
?>
--EXPECT--
-
name (value): p ( t1 X t2 xxx )
parent: NULL
previousSibling: NULL
diff --git a/ext/dom/tests/bug32615.phpt b/ext/dom/tests/bug32615.phpt
index c6f2b5bf86..7850f064ee 100644
--- a/ext/dom/tests/bug32615.phpt
+++ b/ext/dom/tests/bug32615.phpt
@@ -72,7 +72,6 @@ echo $dom->saveXML();
?>
--EXPECT--
-
<?xml version="1.0"?>
<root><first/><newsecond/><newthird/><newfourth/></root>
@@ -81,4 +80,3 @@ echo $dom->saveXML();
<?xml version="1.0"?>
<root><second/><third/><fourth/></root>
-
diff --git a/ext/dom/tests/bug37277.phpt b/ext/dom/tests/bug37277.phpt
index 112b9f4655..f40df6e7a3 100644
--- a/ext/dom/tests/bug37277.phpt
+++ b/ext/dom/tests/bug37277.phpt
@@ -19,7 +19,5 @@ print $dom2->saveXML();
?>
--EXPECT--
-
<?xml version="1.0" encoding="UTF-8"?>
<foo/>
-
diff --git a/ext/dom/tests/bug37456.phpt b/ext/dom/tests/bug37456.phpt
index 5f0fc28778..d5a833413e 100644
--- a/ext/dom/tests/bug37456.phpt
+++ b/ext/dom/tests/bug37456.phpt
@@ -17,6 +17,4 @@ print $attr->nodeValue;
?>
--EXPECT--
-
newval
-
diff --git a/ext/dom/tests/bug44648.phpt b/ext/dom/tests/bug44648.phpt
index 4ff7ac389c..657f193dbd 100644
--- a/ext/dom/tests/bug44648.phpt
+++ b/ext/dom/tests/bug44648.phpt
@@ -42,4 +42,4 @@ Invalid Character Error
Invalid Character Error
Invalid Character Error
Namespace Error
-<root/> \ No newline at end of file
+<root/>
diff --git a/ext/dom/tests/bug46185.phpt b/ext/dom/tests/bug46185.phpt
index 927a6e59e6..eaff4136a2 100644
--- a/ext/dom/tests/bug46185.phpt
+++ b/ext/dom/tests/bug46185.phpt
@@ -20,4 +20,4 @@ echo $aDOM->saveXML();
?>
--EXPECT--
<?xml version="1.0"?>
-<ns1:a xmlns:ns1="urn::ns"><ns1:ok xmlns="urn::REAL"><watch-me xmlns:default="urn::BOGUS"/></ns1:ok></ns1:a> \ No newline at end of file
+<ns1:a xmlns:ns1="urn::ns"><ns1:ok xmlns="urn::REAL"><watch-me xmlns:default="urn::BOGUS"/></ns1:ok></ns1:a>
diff --git a/ext/dom/tests/bug47848.phpt b/ext/dom/tests/bug47848.phpt
index e484e9c5dd..b9f72d3069 100644
--- a/ext/dom/tests/bug47848.phpt
+++ b/ext/dom/tests/bug47848.phpt
@@ -22,4 +22,4 @@ echo $aDOM->saveXML();
?>
--EXPECT--
<?xml version="1.0"?>
-<f2f:a xmlns:f2f="http://friend2friend.net/" xmlns:ai="http://altruists.org" ai:attr="namespaced"/> \ No newline at end of file
+<f2f:a xmlns:f2f="http://friend2friend.net/" xmlns:ai="http://altruists.org" ai:attr="namespaced"/>
diff --git a/ext/dom/tests/bug66502.phpt b/ext/dom/tests/bug66502.phpt
index 5b35b41e93..62ca4424d7 100644
--- a/ext/dom/tests/bug66502.phpt
+++ b/ext/dom/tests/bug66502.phpt
@@ -17,4 +17,4 @@ $comment->__construct("Comment 3");
echo 'DONE', PHP_EOL;
?>
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/dom/tests/bug67949.phpt b/ext/dom/tests/bug67949.phpt
index 823e6e1449..59dae62d85 100644
--- a/ext/dom/tests/bug67949.phpt
+++ b/ext/dom/tests/bug67949.phpt
@@ -47,7 +47,6 @@ $anchor = $doc->getElementsByTagName('a')[0];
var_dump($anchor->attributes[0]->name);
echo "==DONE==\n";
-
--EXPECTF--
testing has_dimension
bool(true)
@@ -84,4 +83,3 @@ NULL
testing attribute access
string(4) "href"
==DONE==
-
diff --git a/ext/dom/tests/bug73907.phpt b/ext/dom/tests/bug73907.phpt
index 346d8135bb..597736665d 100644
--- a/ext/dom/tests/bug73907.phpt
+++ b/ext/dom/tests/bug73907.phpt
@@ -17,4 +17,4 @@ var_dump($attr);
object(DOMElement)#%d (%d) {%A
["nextSibling"]=>
NULL
-%A} \ No newline at end of file
+%A}
diff --git a/ext/dom/tests/canonicalization.phpt b/ext/dom/tests/canonicalization.phpt
index c1caf3fec3..37b982b6a9 100644
--- a/ext/dom/tests/canonicalization.phpt
+++ b/ext/dom/tests/canonicalization.phpt
@@ -49,7 +49,6 @@ echo $doc->c14N(TRUE, FALSE,
echo $doc->C14N(TRUE, FALSE, NULL, array('test'));
?>
--EXPECTF--
-
<contain xmlns="http://www.example.com/ns/foo" xmlns:fubar="http://www.example.com/ns/fubar" xmlns:test="urn::test">
<bar><test1></test1></bar>
<bar><test2></test2></bar>
diff --git a/ext/dom/tests/dom004.phpt b/ext/dom/tests/dom004.phpt
index 5b65f24ba1..3a9295feb3 100644
--- a/ext/dom/tests/dom004.phpt
+++ b/ext/dom/tests/dom004.phpt
@@ -10,7 +10,6 @@ in_array('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib wrap
$dom = new domdocument;
$dom->load("compress.zlib://".dirname(__FILE__)."/book.xml.gz");
print $dom->saveXML();
-
--EXPECT--
<?xml version="1.0"?>
<books>
diff --git a/ext/dom/tests/dom005.phpt b/ext/dom/tests/dom005.phpt
index 0aceb881bf..d7e828cc32 100644
--- a/ext/dom/tests/dom005.phpt
+++ b/ext/dom/tests/dom005.phpt
@@ -16,7 +16,6 @@ print adjustDoctype($dom->saveHTML());
function adjustDoctype($xml) {
return str_replace(array("DOCTYPE HTML",'<p>','</p>'),array("DOCTYPE html",'',''),$xml);
}
-
--EXPECT--
--- save as XML
<?xml version="1.0" standalone="yes"?>
diff --git a/ext/dom/tests/dom007.phpt b/ext/dom/tests/dom007.phpt
index 5d12aa344d..b0062e8e4a 100644
--- a/ext/dom/tests/dom007.phpt
+++ b/ext/dom/tests/dom007.phpt
@@ -88,8 +88,6 @@ $node = $ents->item(3);
var_dump($node);
$node = $ents->getNamedItem('xxx');
var_dump($node);
-
-
--EXPECT--
Length: 1
Key GIF: GIF (image/gif) (-)
diff --git a/ext/dom/tests/dom_comment_basic.phpt b/ext/dom/tests/dom_comment_basic.phpt
index 3a6970562b..13f1bb9b9f 100644
--- a/ext/dom/tests/dom_comment_basic.phpt
+++ b/ext/dom/tests/dom_comment_basic.phpt
@@ -26,7 +26,6 @@ for ($index = 0; $index < $children->length; $index++) {
echo get_class($current), "\n";
var_dump($current->textContent);
}
-
--EXPECTF--
bool(true)
--- child 0 ---
@@ -40,4 +39,3 @@ string(14) " Hello World! "
DOMText
string(1) "
"
-
diff --git a/ext/dom/tests/dom_comment_variation.phpt b/ext/dom/tests/dom_comment_variation.phpt
index 1f30e7c7ea..92db0f6e69 100644
--- a/ext/dom/tests/dom_comment_variation.phpt
+++ b/ext/dom/tests/dom_comment_variation.phpt
@@ -23,10 +23,8 @@ for ($index = 0; $index < $children->length; $index++) {
echo get_class($current), "\n";
var_dump($current->textContent);
}
-
--EXPECTF--
bool(true)
--- child 0 ---
DOMComment
string(14) " Hello World! "
-
diff --git a/ext/dom/tests/domattributes.phpt b/ext/dom/tests/domattributes.phpt
index 9097a887e9..a9663f1543 100644
--- a/ext/dom/tests/domattributes.phpt
+++ b/ext/dom/tests/domattributes.phpt
@@ -35,9 +35,7 @@ print $dom->saveXML($top_element);
?>
--EXPECT--
-
Language: en
Language: en-US
Is ID?: NO
<chapter language="en-US" num="1"/>
-
diff --git a/ext/dom/tests/domchardata.phpt b/ext/dom/tests/domchardata.phpt
index 6baff6d148..52bfef2fd2 100644
--- a/ext/dom/tests/domchardata.phpt
+++ b/ext/dom/tests/domchardata.phpt
@@ -62,7 +62,6 @@ $text3 = $text2->splitText(1);
echo "Is Whitespace?: ".($text2->isElementContentWhitespace()?'YES':'NO');
?>
--EXPECT--
-
Comment Length: 42
New Comment Length: 15
New Comment Data: Updated comment
diff --git a/ext/dom/tests/domdocument_createcomment_error_001.phpt b/ext/dom/tests/domdocument_createcomment_error_001.phpt
index 24104a1a0b..e73e1f163a 100644
--- a/ext/dom/tests/domdocument_createcomment_error_001.phpt
+++ b/ext/dom/tests/domdocument_createcomment_error_001.phpt
@@ -13,4 +13,4 @@ Clint Priest @ PhpTek09
--EXPECTF--
Warning: DOMDocument::createComment() expects exactly 1 parameter, 0 given in %s
===DONE===
- \ No newline at end of file
+
diff --git a/ext/dom/tests/domdocument_createentityreference_001.phpt b/ext/dom/tests/domdocument_createentityreference_001.phpt
index 9a43599914..481b47225b 100644
--- a/ext/dom/tests/domdocument_createentityreference_001.phpt
+++ b/ext/dom/tests/domdocument_createentityreference_001.phpt
@@ -15,4 +15,4 @@ Clint Priest @ PhpTek09
--EXPECT--
Test
===DONE===
- \ No newline at end of file
+
diff --git a/ext/dom/tests/domdocument_createentityreference_002.phpt b/ext/dom/tests/domdocument_createentityreference_002.phpt
index 90754100dd..f981362890 100644
--- a/ext/dom/tests/domdocument_createentityreference_002.phpt
+++ b/ext/dom/tests/domdocument_createentityreference_002.phpt
@@ -14,4 +14,4 @@ Clint Priest @ PhpTek09
--EXPECTF--
Warning: DOMDocument::createEntityReference() expects exactly 1 parameter, 0 given in %s
===DONE===
- \ No newline at end of file
+
diff --git a/ext/dom/tests/domelement.phpt b/ext/dom/tests/domelement.phpt
index bc69af602c..43a6e98603 100644
--- a/ext/dom/tests/domelement.phpt
+++ b/ext/dom/tests/domelement.phpt
@@ -85,7 +85,6 @@ for ($x = 0; $x < $mylen; $x++) {
echo 'Element Name: '.(($elem = $dom->getElementByID('n3'))?$elem->nodeName:'Not Found')."\n";
?>
--EXPECT--
-
Tag Name: chapter
Chapter: 1
Attribute num exists?: Yes
diff --git a/ext/dom/tests/domxpath.phpt b/ext/dom/tests/domxpath.phpt
index e63c96ba93..da91142ef5 100644
--- a/ext/dom/tests/domxpath.phpt
+++ b/ext/dom/tests/domxpath.phpt
@@ -55,4 +55,4 @@ var_dump($avg);
myval
float(1)
bool(true)
-float(4) \ No newline at end of file
+float(4)
diff --git a/ext/dom/tests/node_textcontent.phpt b/ext/dom/tests/node_textcontent.phpt
index 288278412f..d346bfba38 100644
--- a/ext/dom/tests/node_textcontent.phpt
+++ b/ext/dom/tests/node_textcontent.phpt
@@ -36,4 +36,3 @@ var_dump($dom->saveHTML($node));
string(8) "hi there"
bool(true)
string(63) "<div id="test">&lt;p&gt;hello world &amp;trade;&lt;/p&gt;</div>"
-
diff --git a/ext/dom/tests/regsiter_node_class.phpt b/ext/dom/tests/regsiter_node_class.phpt
index 311433b12c..1511a1e507 100644
--- a/ext/dom/tests/regsiter_node_class.phpt
+++ b/ext/dom/tests/regsiter_node_class.phpt
@@ -30,7 +30,6 @@ echo get_class($attr), "\n";
print $attr->testit()."\n";
?>
--EXPECTF--
-
myElement
HELLO Element
myAttribute