shein                                    Wed, 22 Jun 2011 09:28:14 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=312375

Log:
Fixed dom tests.

Changed paths:
    U   
php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
    U   php/php-src/branches/PHP_5_3/ext/dom/tests/dom004.phpt
    U   php/php-src/branches/PHP_5_3/ext/dom/tests/dom_xinclude.phpt
    U   
php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
    U   php/php-src/branches/PHP_5_4/ext/dom/tests/dom004.phpt
    U   php/php-src/branches/PHP_5_4/ext/dom/tests/dom_xinclude.phpt
    U   
php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
    U   php/php-src/trunk/ext/dom/tests/dom004.phpt
    U   php/php-src/trunk/ext/dom/tests/dom_xinclude.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
     2011-06-22 09:09:01 UTC (rev 312374)
+++ 
php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
     2011-06-22 09:28:14 UTC (rev 312375)
@@ -6,17 +6,14 @@
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-
-// need external DTD/XML docs
-if( @file_get_contents('http://www.php.net/docs.php') === FALSE )
-    exit('skip network not available');
 ?>
 --FILE--
 <?php

 require_once('dom_test.inc');

-$XMLStringGood = file_get_contents('http://www.php.net/docs.php');
+chdir(__DIR__ . "/../examples");
+$XMLStringGood = file_get_contents('note.xml');

 $dom = new DOMDocument;
 $dom->resolveExternals = TRUE;
@@ -27,7 +24,7 @@
 echo "No Error Report Above\n";

 $BogusElement = $dom->createElement('NYPHP','DOMinatrix');
-$Body = $dom->getElementsByTagName('body')->item(0);
+$Body = $dom->getElementsByTagName('from')->item(0);
 $Body->appendChild($BogusElement);
 $XMLStringBad = $dom->saveXML();

@@ -42,12 +39,8 @@
 No Error Report Above
 validateOnParse set to TRUE:

-Warning: DOMDocument::loadXML(): Entity 'nbsp' not defined in Entity, line: %d 
in %s on line %d
-
-Warning: DOMDocument::loadXML(): Entity 'copy' not defined in Entity, line: %d 
in %s on line %d
-
 Warning: DOMDocument::loadXML(): No declaration for element NYPHP in Entity, 
line: %d in %s on line %d

-Warning: DOMDocument::loadXML(): Element body content does not follow the DTD, 
expecting (p | h1 | h2 | h3 | h4 | h5 | h6 | div | ul | ol | dl | pre | hr | 
blockquote | address | fieldset | table | form | noscript | ins | del | 
script)*, got (div div div div div NYPHP) in Entity, line: %d in %s on line %d
+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


Modified: php/php-src/branches/PHP_5_3/ext/dom/tests/dom004.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/dom/tests/dom004.phpt      2011-06-22 
09:09:01 UTC (rev 312374)
+++ php/php-src/branches/PHP_5_3/ext/dom/tests/dom004.phpt      2011-06-22 
09:28:14 UTC (rev 312375)
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-array_search('compress.zlib', stream_get_wrappers()) or die('skip 
compress.zlib wrapper is not available');
+in_array('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib 
wrapper is not available');
 ?>
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_3/ext/dom/tests/dom_xinclude.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/dom/tests/dom_xinclude.phpt        
2011-06-22 09:09:01 UTC (rev 312374)
+++ php/php-src/branches/PHP_5_3/ext/dom/tests/dom_xinclude.phpt        
2011-06-22 09:28:14 UTC (rev 312375)
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-array_search('compress.zlib', stream_get_wrappers()) or die('skip 
compress.zlib wrapper is not available');
+in_array('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib 
wrapper is not available');
 ?>
 --FILE--
 <?php

Modified: 
php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
     2011-06-22 09:09:01 UTC (rev 312374)
+++ 
php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
     2011-06-22 09:28:14 UTC (rev 312375)
@@ -39,10 +39,6 @@
 No Error Report Above
 validateOnParse set to TRUE:

-Warning: DOMDocument::loadXML(): Entity 'nbsp' not defined in Entity, line: %d 
in %s on line %d
-
-Warning: DOMDocument::loadXML(): Entity 'copy' not defined in Entity, line: %d 
in %s on line %d
-
 Warning: DOMDocument::loadXML(): No declaration for element NYPHP in Entity, 
line: %d in %s on line %d

 Warning: DOMDocument::loadXML(): Element from was declared #PCDATA but 
contains non text nodes in Entity, line: %d in %s on line %d

Modified: php/php-src/branches/PHP_5_4/ext/dom/tests/dom004.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/dom/tests/dom004.phpt      2011-06-22 
09:09:01 UTC (rev 312374)
+++ php/php-src/branches/PHP_5_4/ext/dom/tests/dom004.phpt      2011-06-22 
09:28:14 UTC (rev 312375)
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-array_search('compress.zlib', stream_get_wrappers()) or die('skip 
compress.zlib wrapper is not available');
+in_array('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib 
wrapper is not available');
 ?>
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_4/ext/dom/tests/dom_xinclude.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/dom/tests/dom_xinclude.phpt        
2011-06-22 09:09:01 UTC (rev 312374)
+++ php/php-src/branches/PHP_5_4/ext/dom/tests/dom_xinclude.phpt        
2011-06-22 09:28:14 UTC (rev 312375)
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-array_search('compress.zlib', stream_get_wrappers()) or die('skip 
compress.zlib wrapper is not available');
+in_array('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib 
wrapper is not available');
 ?>
 --FILE--
 <?php

Modified: 
php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
===================================================================
--- 
php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt    
    2011-06-22 09:09:01 UTC (rev 312374)
+++ 
php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt    
    2011-06-22 09:28:14 UTC (rev 312375)
@@ -39,10 +39,6 @@
 No Error Report Above
 validateOnParse set to TRUE:

-Warning: DOMDocument::loadXML(): Entity 'nbsp' not defined in Entity, line: %d 
in %s on line %d
-
-Warning: DOMDocument::loadXML(): Entity 'copy' not defined in Entity, line: %d 
in %s on line %d
-
 Warning: DOMDocument::loadXML(): No declaration for element NYPHP in Entity, 
line: %d in %s on line %d

 Warning: DOMDocument::loadXML(): Element from was declared #PCDATA but 
contains non text nodes in Entity, line: %d in %s on line %d

Modified: php/php-src/trunk/ext/dom/tests/dom004.phpt
===================================================================
--- php/php-src/trunk/ext/dom/tests/dom004.phpt 2011-06-22 09:09:01 UTC (rev 
312374)
+++ php/php-src/trunk/ext/dom/tests/dom004.phpt 2011-06-22 09:28:14 UTC (rev 
312375)
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-array_search('compress.zlib', stream_get_wrappers()) or die('skip 
compress.zlib wrapper is not available');
+in_array('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib 
wrapper is not available');
 ?>
 --FILE--
 <?php

Modified: php/php-src/trunk/ext/dom/tests/dom_xinclude.phpt
===================================================================
--- php/php-src/trunk/ext/dom/tests/dom_xinclude.phpt   2011-06-22 09:09:01 UTC 
(rev 312374)
+++ php/php-src/trunk/ext/dom/tests/dom_xinclude.phpt   2011-06-22 09:28:14 UTC 
(rev 312375)
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-array_search('compress.zlib', stream_get_wrappers()) or die('skip 
compress.zlib wrapper is not available');
+in_array('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib 
wrapper is not available');
 ?>
 --FILE--
 <?php

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to