diff options
Diffstat (limited to 'ext/xmlreader')
| -rw-r--r-- | ext/xmlreader/php_xmlreader.c | 4 | ||||
| -rw-r--r-- | ext/xmlreader/php_xmlreader.h | 4 | ||||
| -rwxr-xr-x | ext/xmlreader/tests/012.phpt | 22 |
3 files changed, 18 insertions, 12 deletions
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 2fd5c9978..a39f98df4 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c 314376 2011-08-06 14:47:44Z felipe $ */ +/* $Id: php_xmlreader.c 321634 2012-01-01 13:15:04Z felipe $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h index ab90ea1e0..0e46a4510 100644 --- a/ext/xmlreader/php_xmlreader.h +++ b/ext/xmlreader/php_xmlreader.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.h 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: php_xmlreader.h 321634 2012-01-01 13:15:04Z felipe $ */ #ifndef PHP_XMLREADER_H #define PHP_XMLREADER_H diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt index efc42350d..3aae4c0e6 100755 --- a/ext/xmlreader/tests/012.phpt +++ b/ext/xmlreader/tests/012.phpt @@ -4,7 +4,7 @@ XMLReader: accessing empty and non existing attributes <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- <?php -/* $Id: 012.phpt 210441 2006-03-30 21:47:21Z helly $ */ +/* $Id: 012.phpt 316311 2011-09-07 09:19:28Z pajoye $ */ $xmlstring =<<<EOF <?xml version="1.0" encoding="UTF-8"?> @@ -25,7 +25,9 @@ $xmlstring =<<<EOF EOF; $xmlstring = str_replace('012.dtd', dirname(__FILE__).'/012.dtd', $xmlstring); - +if (DIRECTORY_SEPARATOR == '\\') { + $xmlstring = str_replace('\\',"/", $xmlstring); +} $reader = new XMLReader(); $reader->XML($xmlstring); $reader->setParserProperty(XMLReader::DEFAULTATTRS, true); @@ -34,12 +36,15 @@ var_dump($reader->getAttribute('bar')); var_dump($reader->getAttribute('baz')); $reader->close(); -?> -===FILE=== -<?php - +echo "\nUsing URI:\n"; $reader = new XMLReader(); -$reader->open(dirname(__FILE__) . '/012.xml'); +$file = dirname(__FILE__) . '/012.xml'; +if (DIRECTORY_SEPARATOR == '\\') { + $file = str_replace('\\',"/", $file); +} + +$reader->open($file); + //$reader->setParserProperty(XMLReader::DEFAULTATTRS, true); while($reader->read() && $reader->nodeType != XMLReader::ELEMENT); var_dump($reader->getAttribute('bar')); @@ -61,7 +66,8 @@ string(0) "" NULL string(0) "" string(0) "" -===FILE=== + +Using URI: string(0) "" NULL string(0) "" |