From: Antony Dovgal <tony2001@php.net>
Date: Sun, 13 Jul 2008 21:22:55 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.3.0alpha1~373
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad275fa6ef18fcd017e493177622f68c5baa38e0;p=php

MFH
---

diff --git a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
index ee590de80c..9b37b4443a 100644
--- 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 b7d90a1194..4d39ea4695 100644
--- 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 10bf677ff3..2963cb1e06 100644
--- 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 d6fb632132..c82a73b526 100644
--- 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 5205a3e30f..4dd181b3f8 100644
--- 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 3b318d40d2..bf71d554aa 100644
--- 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 153b18b5a2..745873aca9 100644
--- 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 f00493455c..ff81343cc9 100644
--- 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 ea0910417c..9f45f125d5 100644
--- 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 d050b17714..a0c12b1fe7 100644
--- 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 f0d0c355b8..8e38d935e7 100644
--- 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 406f8d14ce..5c1d714e12 100644
--- 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 85cd502b26..d371aaf045 100644
--- 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 beccb8fb62..e008340ead 100644
--- 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 6a28a9ae45..72d0d6ca94 100644
--- 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 86f32dd8d9..c57d312e1b 100644
--- 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 0df581b7ac..6e08ffc01f 100644
--- 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 bc864432b7..58ab6cec02 100644
--- 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 9749083874..dba8a1689d 100644
--- 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
 }