MFH

diff --git a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
index ee590de80c4c2bd022046be52f6585bc9163c0cd..9b37b4443a1f177513c299ee040df18572472149 100644 (file)
--- a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
+++ b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
@@ -3,6 +3,8 @@ DOMCharacterData::appendData basic functionality test
 --CREDITS--
 Mike Sullivan <mike@regexia.com>
 #TestFest 2008 (London)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
@@ -32,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/DOMComment_appendData_basic_Sullivan.phpt b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt
index b7d90a1194904a28fb6a2a335da6b70cbe911c8f..4d39ea469524411dc7e050f0d365bf33894c867b 100644 (file)
--- a/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt
+++ b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt
@@ -3,6 +3,8 @@ DOMComment::appendData basic functionality test
 --CREDITS--
 Mike Sullivan <mike@regexia.com>
 #TestFest 2008 (London)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
@@ -32,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_replaceData_basic.phpt b/ext/dom/tests/DOMComment_replaceData_basic.phpt
index 10bf677ff349f2e0a038bd5f2c8e6db89fd4abd1..2963cb1e06809e777ae3abae316a307adcef9fa0 100644 (file)
--- a/ext/dom/tests/DOMComment_replaceData_basic.phpt
+++ b/ext/dom/tests/DOMComment_replaceData_basic.phpt
@@ -4,7 +4,7 @@ Test replacing data into a DOMComment basic test
 Andrew Larssen <al@larssen.org>
 London TestFest 2008
 --SKIPIF--
-<?php // require_once('skipif.inc'); ?>
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 

diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt
index d6fb63213262876e6ac804ec48e10d2d0570ea51..c82a73b526650064c1695e582af4b28caa52e0d5 100644 (file)
--- a/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Testing DOMDocumentFragment::appendXML and DOMDocumentFragment::hasChildNodes
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 $doc = new DOMDocument();

diff --git a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
index 5205a3e30fd757bb2b4605147301068b95ca4570..4dd181b3f8b50da122a6808de9303a2d5c202cc3 100644 (file)
--- a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
+++ b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
@@ -3,6 +3,8 @@ DomDocument::createAttribute() - basic test for DomDocument::createAttribute()
 --CREDITS--
 Muhammad Khalid Adnan 
 # TestFest 2008
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 

diff --git a/ext/dom/tests/DOMDocument_createAttribute_error.phpt b/ext/dom/tests/DOMDocument_createAttribute_error.phpt
index 3b318d40d285d80b32f87941f5c2339c4150ceba..bf71d554aac119e193e70dc0e89406078e66b123 100644 (file)
--- a/ext/dom/tests/DOMDocument_createAttribute_error.phpt
+++ b/ext/dom/tests/DOMDocument_createAttribute_error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test DOMDocument::createAttribute() for expected expection thrown when wrong parameter passed
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 $dom = new DOMDocument();

diff --git a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt
index 153b18b5a24cb298f74c4c29f75c4ffc91555a06..745873aca905a9fddd51c4f318cb167306f0295e 100644 (file)
--- a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt
+++ b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt
@@ -3,6 +3,8 @@ DomDocument::createAttribute() - error test for DomDocument::createAttribute()
 --CREDITS--
 Muhammad Khalid Adnan
 # TestFest 2008
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 

diff --git a/ext/dom/tests/DOMDocument_createAttribute_variation.phpt b/ext/dom/tests/DOMDocument_createAttribute_variation.phpt
index f00493455ca80b6ec7f90f9077fb329dd869523c..ff81343cc98e4a1cb820be41611803f63cb287a0 100644 (file)
--- a/ext/dom/tests/DOMDocument_createAttribute_variation.phpt
+++ b/ext/dom/tests/DOMDocument_createAttribute_variation.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test DOMDocument::createAttribute() for expected return value
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 $dom = new DOMDocument();

diff --git a/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt b/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
index ea0910417cea5ea605cc70b5d2757051c389c31f..9f45f125d56743e922a4ba449881827d4254cc19 100644 (file)
--- a/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
+++ b/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
@@ -3,6 +3,8 @@ DomDocument::createProcessingInstruction() - basic test for DomDocument::createP
 --CREDITS--
 Muhammad Khalid Adnan
 # TestFest 2008
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 

diff --git a/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt b/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
index d050b17714606a490e5a2edd93494a5811c148b8..a0c12b1fe714249a521f06cb5f8fb8366498cb86 100644 (file)
--- a/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
+++ b/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
@@ -3,6 +3,8 @@ DomDocument::createProcessingInstruction() - error test for DomDocument::createP
 --CREDITS--
 Muhammad Khalid Adnan
 # TestFest 2008
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 

diff --git a/ext/dom/tests/DOMElement_hasAttributes_basic.phpt b/ext/dom/tests/DOMElement_hasAttributes_basic.phpt
index f0d0c355b8242086509edd72606cbf13b18b7884..8e38d935e728348a18c088ed4f368395cefc6975 100644 (file)
--- a/ext/dom/tests/DOMElement_hasAttributes_basic.phpt
+++ b/ext/dom/tests/DOMElement_hasAttributes_basic.phpt
@@ -3,6 +3,8 @@ DOMNode: hasAttributes()
 --CREDITS--
 James Lewis <james@s-1.com>
 #TestFest 2008
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 require_once("dom_test.inc");

diff --git a/ext/dom/tests/DOMNode_hasChildNodes.phpt b/ext/dom/tests/DOMNode_hasChildNodes.phpt
index 406f8d14ceccebee1bd57cddc9b0efb51a600eda..5c1d714e121d8663c16eda7ff9f88ee7e5b0352d 100644 (file)
--- a/ext/dom/tests/DOMNode_hasChildNodes.phpt
+++ b/ext/dom/tests/DOMNode_hasChildNodes.phpt
@@ -3,6 +3,8 @@ Tests DOMNode::hasChildNodes()
 --CREDITS--
 Michael Stillwell <mjs@beebo.org>
 # TestFest 2008
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 

diff --git a/ext/dom/tests/DOMNode_insertBefore.phpt b/ext/dom/tests/DOMNode_insertBefore.phpt
index 85cd502b26b7805a936ee5fe032d89c0a89489c3..d371aaf045f377f0f961be800f13b3d0f67c81b0 100644 (file)
--- a/ext/dom/tests/DOMNode_insertBefore.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore.phpt
@@ -3,6 +3,8 @@ Tests DOMNode::insertBefore()
 --CREDITS--
 Michael Stillwell <mjs@beebo.org>
 # TestFest 2008
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 

diff --git a/ext/dom/tests/DOMNode_issamenode_basic.phpt b/ext/dom/tests/DOMNode_issamenode_basic.phpt
index beccb8fb624d249382f89b0024cca18447f261ec..e008340ead9634700d2c252bcb9df52ae112cad4 100644 (file)
--- a/ext/dom/tests/DOMNode_issamenode_basic.phpt
+++ b/ext/dom/tests/DOMNode_issamenode_basic.phpt
@@ -3,6 +3,8 @@ DOMNode: isSameNode()
 --CREDITS--
 James Lewis <james@s-1.com>
 #TestFest 2008
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 require_once("dom_test.inc");

diff --git a/ext/dom/tests/DOMText_appendData_basic.phpt b/ext/dom/tests/DOMText_appendData_basic.phpt
index 6a28a9ae4558e8514d99e74e92dab5afb8806723..72d0d6ca9446e6ab0f26a696f2c6bda5654c91e1 100644 (file)
--- a/ext/dom/tests/DOMText_appendData_basic.phpt
+++ b/ext/dom/tests/DOMText_appendData_basic.phpt
@@ -3,6 +3,8 @@ DOMText::appendData basic functionality test
 --CREDITS--
 Mike Sullivan <mike@regexia.com>
 #TestFest 2008 (London)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
@@ -32,4 +34,4 @@ Text Length (two appends): 8
 Text Content: data><&"
 
 <?xml version="1.0"?>
-<root><text>data&gt;&lt;&amp;"</text></root>
\ No newline at end of file
+<root><text>data&gt;&lt;&amp;"</text></root>

diff --git a/ext/dom/tests/bug42082.phpt b/ext/dom/tests/bug42082.phpt
index 86f32dd8d91e18099d2ae93e0b0ccb583f9cd7a4..c57d312e1bd57f71fdfb1089dfa6416422e44a52 100644 (file)
--- a/ext/dom/tests/bug42082.phpt
+++ b/ext/dom/tests/bug42082.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #42082 (NodeList length zero should be empty)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 $doc = new DOMDocument();
@@ -24,4 +26,4 @@ string(0) ""
 bool(true)
 bool(true)
 bool(false)
-bool(false) 
\ No newline at end of file
+bool(false) 

diff --git a/ext/dom/tests/bug43364.phpt b/ext/dom/tests/bug43364.phpt
index 0df581b7acdabda759498e70d61ec354f43244aa..6e08ffc01f28a6f27823d965b5c083644b0b9bea 100644 (file)
--- a/ext/dom/tests/bug43364.phpt
+++ b/ext/dom/tests/bug43364.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #43364 (recursive xincludes don't remove internal xml nodes properly)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php 
 function loopElements($nodes)

diff --git a/ext/dom/tests/dom003.phpt b/ext/dom/tests/dom003.phpt
index bc864432b7134e4f395077e3274d5a741283be6d..58ab6cec023a70ab090dd3ccd56434db8fc10f0c 100644 (file)
--- a/ext/dom/tests/dom003.phpt
+++ b/ext/dom/tests/dom003.phpt
@@ -54,6 +54,8 @@ object(DOMException)#%d (6) {
   }
   ["code"]=>
   int(3)
+  ["previous":"Exception":private]=>
+  NULL
 }
 --- Don't catch exception with try/catch
 

diff --git a/ext/dom/tests/dom_set_attr_node.phpt b/ext/dom/tests/dom_set_attr_node.phpt
index 974908387494a85c92fdbbbef801a1a81f6464bc..dba8a1689d92f3bb17a2d46d0c7624634a2bfac4 100644 (file)
--- a/ext/dom/tests/dom_set_attr_node.phpt
+++ b/ext/dom/tests/dom_set_attr_node.phpt
@@ -31,7 +31,7 @@ try {
 
 ?>
 --EXPECTF--
-object(DOMException)#%d (6) {
+object(DOMException)#%d (7) {
   ["message":protected]=>
   string(20) "Wrong Document Error"
   ["string":"Exception":private]=>
@@ -64,4 +64,6 @@ object(DOMException)#%d (6) {
   }
   ["code"]=>
   int(4)
+  ["previous":"Exception":private]=>
+  NULL
 }