rrichards Tue Aug 8 20:52:46 2006 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/tests 002.phpt 003.phpt 004.phpt 005.phpt
006.phpt 007.phpt 008.phpt 009.phpt
009b.phpt 010.phpt 011.phpt 012.phpt
013.phpt 014.phpt 014a.phpt 014b.phpt
015.phpt 016.phpt 016a.phpt 017.phpt
018.phpt 019.phpt 020.phpt 021.phpt
022.phpt 023.phpt 024.phpt 025.phpt
026.phpt 027.phpt 028.phpt 029.phpt
030.phpt 031.phpt 032.phpt 033.phpt
bug26976.phpt bug27010.phpt
bug35785.phpt bug36611.phpt
bug37565.phpt bug38347.phpt
bug38354.phpt profile01.phpt
profile02.phpt profile03.phpt
profile04.phpt profile05.phpt
profile06.phpt profile07.phpt
profile08.phpt profile09.phpt
profile10.phpt profile11.phpt
profile12.phpt profile13.phpt
Log:
add unicode support
update tests (binary string must be passed to simplexml_load_string)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.215&r2=1.216&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.215
php-src/ext/simplexml/simplexml.c:1.216
--- php-src/ext/simplexml/simplexml.c:1.215 Tue Aug 8 16:59:11 2006
+++ php-src/ext/simplexml/simplexml.c Tue Aug 8 20:52:45 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.215 2006/08/08 16:59:11 tony2001 Exp $ */
+/* $Id: simplexml.c,v 1.216 2006/08/08 20:52:45 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -254,7 +254,7 @@
tmp_zv = *member;
zval_copy_ctor(&tmp_zv);
member = &tmp_zv;
- convert_to_string(member);
+ convert_to_string_with_converter(member, UG(utf8_conv));
}
name = Z_STRVAL_P(member);
}
@@ -383,7 +383,7 @@
zval_copy_ctor(&value_copy);
value = &value_copy;
}
- convert_to_string(value);
+ convert_to_string_with_converter(value, UG(utf8_conv));
/* break missing intentionally */
case IS_STRING:
xmlNodeSetContentLen(node, (xmlChar
*)Z_STRVAL_P(value), Z_STRLEN_P(value));
@@ -437,7 +437,7 @@
if (Z_TYPE_P(member) != IS_STRING) {
trim_zv = *member;
zval_copy_ctor(&trim_zv);
- convert_to_string(&trim_zv);
+ convert_to_string_with_converter(&trim_zv,
UG(utf8_conv));
php_trim(Z_STRVAL(trim_zv), Z_STRLEN(trim_zv), NULL, 0,
IS_STRING, &tmp_zv, 3 TSRMLS_CC);
zval_dtor(&trim_zv);
member = &tmp_zv;
@@ -487,7 +487,7 @@
zval_copy_ctor(&value_copy);
value = &value_copy;
}
- convert_to_string(value);
+ convert_to_string_with_converter(value,
UG(utf8_conv));
break;
case IS_STRING:
break;
@@ -611,7 +611,8 @@
sxe = php_sxe_fetch_object(object TSRMLS_CC);
GET_NODE(sxe, node);
- convert_to_string(member);
+ convert_to_string_with_converter(member, UG(utf8_conv));
+
name = Z_STRVAL_P(member);
node = sxe_get_element_by_name(sxe, node, &name, &type TSRMLS_CC);
if (!node) {
@@ -645,7 +646,7 @@
tmp_zv = *member;
zval_copy_ctor(&tmp_zv);
member = &tmp_zv;
- convert_to_string(member);
+ convert_to_string_with_converter(member, UG(utf8_conv));
}
sxe = php_sxe_fetch_object(object TSRMLS_CC);
@@ -765,7 +766,7 @@
tmp_zv = *member;
zval_copy_ctor(&tmp_zv);
member = &tmp_zv;
- convert_to_string(member);
+ convert_to_string_with_converter(member, UG(utf8_conv));
}
sxe = php_sxe_fetch_object(object TSRMLS_CC);
@@ -886,7 +887,7 @@
if (node->children && node->children->type == XML_TEXT_NODE &&
!xmlIsBlankNode(node->children)) {
contents = xmlNodeListGetString(node->doc, node->children, 1);
if (contents) {
-
ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), *value, (char
*)contents, 1);
+ ZVAL_XML_STRING(*value, (char *)contents,
ZSTR_DUPLICATE);
xmlFree(contents);
}
} else {
@@ -971,7 +972,8 @@
xmlChar *tmp;
MAKE_STD_ZVAL(value);
-
ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), value, tmp =
xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, attr->children, 1), 1);
+ tmp = xmlNodeListGetString((xmlDocPtr)
sxe->document->ptr, attr->children, 1);
+ ZVAL_XML_STRING(value, (char *)tmp,
ZSTR_DUPLICATE);
xmlFree(tmp);
namelen = xmlStrlen(attr->name) + 1;
if (!zattr) {
@@ -992,7 +994,8 @@
xmlChar *tmp;
MAKE_STD_ZVAL(value);
-
ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), value, tmp =
xmlNodeListGetString(node->doc, node->children, 1), 1);
+ tmp = xmlNodeListGetString(node->doc, node->children,
1);
+ ZVAL_XML_STRING(value, (char *)tmp, ZSTR_DUPLICATE);
xmlFree(tmp);
zend_hash_next_index_insert(rv, &value, sizeof(zval *),
NULL);
node = NULL;
@@ -1008,7 +1011,8 @@
xmlChar *tmp;
MAKE_STD_ZVAL(value);
-
ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), value, tmp =
xmlNodeListGetString(node->doc, node, 1), 1);
+ tmp = xmlNodeListGetString(node->doc,
node, 1);
+ ZVAL_XML_STRING(value, (char *)tmp,
ZSTR_DUPLICATE);
xmlFree(tmp);
zend_hash_next_index_insert(rv, &value,
sizeof(zval *), NULL);
goto next_iter;
@@ -1059,7 +1063,7 @@
}
/* }}} */
-/* {{{ proto array SimpleXMLElement::xpath(string path)
+/* {{{ proto array SimpleXMLElement::xpath(string path) U
Runs XPath query on the XML data */
SXE_METHOD(xpath)
{
@@ -1074,7 +1078,7 @@
xmlNodeSetPtr result;
xmlNodePtr nodeptr;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &query,
&query_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&", &query,
&query_len, UG(utf8_conv)) == FAILURE) {
return;
}
@@ -1134,7 +1138,7 @@
if (nodeptr->type == XML_TEXT_NODE) {
_node_as_zval(sxe, nodeptr->parent, value,
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
} else if (nodeptr->type == XML_ATTRIBUTE_NODE) {
- _node_as_zval(sxe, nodeptr->parent, value,
SXE_ITER_ATTRLIST, (char*)nodeptr->name, NULL, 0 TSRMLS_CC);
+ _node_as_zval(sxe, nodeptr->parent, value,
SXE_ITER_ATTRLIST, (char *)nodeptr->name, NULL, 0 TSRMLS_CC);
} else {
_node_as_zval(sxe, nodeptr, value,
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
}
@@ -1146,7 +1150,7 @@
xmlXPathFreeObject(retval);
}
-/* {{{ proto bool SimpleXMLElement::registerXPathNamespace(string prefix,
string ns)
+/* {{{ proto bool SimpleXMLElement::registerXPathNamespace(string prefix,
string ns) U
Creates a prefix/ns context for the next XPath query */
SXE_METHOD(registerXPathNamespace)
{
@@ -1154,7 +1158,7 @@
int prefix_len, ns_uri_len;
char *prefix, *ns_uri;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &prefix,
&prefix_len, &ns_uri, &ns_uri_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&s&", &prefix,
&prefix_len, UG(utf8_conv), &ns_uri, &ns_uri_len, UG(utf8_conv)) == FAILURE) {
return;
}
@@ -1171,7 +1175,7 @@
/* }}} */
-/* {{{ proto string SimpleXMLElement::asXML([string filename])
+/* {{{ proto string SimpleXMLElement::asXML([string filename]) U
Return a well-formed XML string based on SimpleXML element */
SXE_METHOD(asXML)
{
@@ -1182,13 +1186,14 @@
int strval_len;
char *filename;
int filename_len;
+ zend_uchar filename_type;
if (ZEND_NUM_ARGS() > 1) {
RETURN_FALSE;
}
if (ZEND_NUM_ARGS() == 1) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&filename, &filename_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t",
&filename, &filename_len, &filename_type) == FAILURE) {
RETURN_FALSE;
}
@@ -1197,25 +1202,35 @@
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
if (node) {
+ if (filename_type == IS_UNICODE) {
+ if (php_stream_path_encode(NULL, &filename,
&filename_len, (UChar*)filename, filename_len, REPORT_ERRORS, NULL) == FAILURE)
{
+ RETURN_FALSE;
+ }
+ }
+
if (XML_DOCUMENT_NODE == node->parent->type) {
int bytes;
bytes = xmlSaveFile(filename, (xmlDocPtr)
sxe->document->ptr);
if (bytes == -1) {
- RETURN_FALSE;
+ RETVAL_FALSE;
} else {
- RETURN_TRUE;
+ RETVAL_TRUE;
}
} else {
outbuf =
xmlOutputBufferCreateFilename(filename, NULL, 0);
if (outbuf == NULL) {
- RETURN_FALSE;
+ RETVAL_FALSE;
+ } else {
+ xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe->document->ptr, node, 0, 0, NULL);
+ xmlOutputBufferClose(outbuf);
+ RETVAL_TRUE;
}
-
- xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe->document->ptr, node, 0, 0, NULL);
- xmlOutputBufferClose(outbuf);
- RETURN_TRUE;
}
+ if (filename_type == IS_UNICODE) {
+ efree(filename);
+ }
+ return;
} else {
RETURN_FALSE;
}
@@ -1251,11 +1266,24 @@
#define SXE_NS_PREFIX(ns) (ns->prefix ? (char*)ns->prefix : "")
-static inline void sxe_add_namespace_name(zval *return_value, xmlNsPtr ns)
+static inline void sxe_add_namespace_name(zval *return_value, xmlNsPtr ns
TSRMLS_DC)
{
+ uint prefix_len;
char *prefix = SXE_NS_PREFIX(ns);
- if (zend_hash_exists(Z_ARRVAL_P(return_value), prefix, strlen(prefix) +
1) == 0) {
- add_assoc_string(return_value, prefix, (char*)ns->href, 1);
+
+ prefix_len = strlen(prefix) + 1;
+
+ if (zend_hash_exists(Z_ARRVAL_P(return_value), prefix, prefix_len) ==
0) {
+ if (UG(unicode)) {
+ UErrorCode status = U_ZERO_ERROR;
+ UChar *u_str;
+ int u_len;
+ int length = strlen((char*)ns->href);
+ zend_string_to_unicode_ex(UG(utf8_conv), &u_str,
&u_len, (char*)ns->href, length, &status);
+ add_assoc_unicodel_ex(return_value, prefix, prefix_len,
u_str, u_len, 0);
+ } else {
+ add_assoc_string_ex(return_value, prefix, prefix_len,
(char*)ns->href, 1);
+ }
}
}
@@ -1264,13 +1292,13 @@
xmlAttrPtr attr;
if (node->ns) {
- sxe_add_namespace_name(return_value, node->ns);
+ sxe_add_namespace_name(return_value, node->ns TSRMLS_CC);
}
attr = node->properties;
while (attr) {
if (attr->ns) {
- sxe_add_namespace_name(return_value, attr->ns);
+ sxe_add_namespace_name(return_value, attr->ns
TSRMLS_CC);
}
attr = attr->next;
}
@@ -1309,7 +1337,7 @@
if (node->type == XML_ELEMENT_NODE) {
sxe_add_namespaces(sxe, node, recursive, return_value
TSRMLS_CC);
} else if (node->type == XML_ATTRIBUTE_NODE && node->ns) {
- sxe_add_namespace_name(return_value, node->ns);
+ sxe_add_namespace_name(return_value, node->ns
TSRMLS_CC);
}
next_iter:
node = node->next;
@@ -1324,7 +1352,7 @@
if (node->type == XML_ELEMENT_NODE) {
ns = node->nsDef;
while (ns != NULL) {
- sxe_add_namespace_name(return_value, ns);
+ sxe_add_namespace_name(return_value, ns TSRMLS_CC);
ns = ns->next;
}
if (recursive) {
@@ -1357,7 +1385,7 @@
}
/* }}} */
-/* {{{ proto object SimpleXMLElement::children([string ns [, bool is_prefix]])
+/* {{{ proto object SimpleXMLElement::children([string ns [, bool is_prefix]])
U
Finds children of given node */
SXE_METHOD(children)
{
@@ -1367,7 +1395,7 @@
xmlNodePtr node;
zend_bool isprefix = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!b", &nsprefix,
&nsprefix_len, &isprefix) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!&b",
&nsprefix, &nsprefix_len, UG(utf8_conv), &isprefix) == FAILURE) {
return;
}
@@ -1385,7 +1413,7 @@
}
/* }}} */
-/* {{{ proto object SimpleXMLElement::getName()
+/* {{{ proto object SimpleXMLElement::getName() U
Finds children of given node */
SXE_METHOD(getName)
{
@@ -1398,11 +1426,11 @@
GET_NODE(sxe, node);
namelen = xmlStrlen(node->name);
- RETURN_ASCII_STRINGL((char*)node->name, namelen, 1);
+ RETVAL_XML_STRING_LEN((char *) node->name, namelen, ZSTR_DUPLICATE);
}
/* }}} */
-/* {{{ proto array SimpleXMLElement::attributes([string ns [, bool is_prefix]])
+/* {{{ proto array SimpleXMLElement::attributes([string ns [, bool
is_prefix]]) U
Identifies an element's attributes */
SXE_METHOD(attributes)
{
@@ -1412,7 +1440,7 @@
xmlNodePtr node;
zend_bool isprefix = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!b", &nsprefix,
&nsprefix_len, &isprefix) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!&b",
&nsprefix, &nsprefix_len, UG(utf8_conv), &isprefix) == FAILURE) {
return;
}
@@ -1429,7 +1457,7 @@
}
/* }}} */
-/* {{{ proto void SimpleXMLElement::addChild(string qName [, string value [,
string ns]])
+/* {{{ proto void SimpleXMLElement::addChild(string qName [, string value [,
string ns]]) U
Add Element with optional namespace information */
SXE_METHOD(addChild)
{
@@ -1440,8 +1468,8 @@
xmlNsPtr nsptr = NULL;
xmlChar *localname, *prefix = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!s!",
- &qname, &qname_len, &value, &value_len, &nsuri, &nsuri_len) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&|s!&s!&",
+ &qname, &qname_len, UG(utf8_conv), &value, &value_len,
UG(utf8_conv), &nsuri, &nsuri_len, UG(utf8_conv)) == FAILURE) {
return;
}
@@ -1484,7 +1512,7 @@
}
/* }}} */
-/* {{{ proto void SimpleXMLElement::addAttribute(string qName, string value
[,string ns])
+/* {{{ proto void SimpleXMLElement::addAttribute(string qName, string value
[,string ns]) U
Add Attribute with optional namespace information */
SXE_METHOD(addAttribute)
{
@@ -1496,8 +1524,8 @@
xmlNsPtr nsptr = NULL;
xmlChar *localname, *prefix = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s!",
- &qname, &qname_len, &value, &value_len, &nsuri, &nsuri_len) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&s&|s!&",
+ &qname, &qname_len, UG(utf8_conv), &value, &value_len,
UG(utf8_conv), &nsuri, &nsuri_len, UG(utf8_conv)) == FAILURE) {
return;
}
@@ -1556,11 +1584,7 @@
static int cast_object(zval *object, int type, char *contents TSRMLS_DC)
{
if (contents) {
- if (UG(unicode)) {
-
ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), object, contents, 1);
- } else {
- ZVAL_STRINGL(object, contents, strlen(contents), 1);
- }
+ ZVAL_XML_STRING(object, contents, ZSTR_DUPLICATE);
} else {
ZVAL_NULL(object);
}
@@ -1830,7 +1854,7 @@
}
/* }}} */
-/* {{{ proto simplemxml_element simplexml_load_file(string filename [, string
class_name [, int options [, string ns [, bool is_prefix]]]])
+/* {{{ proto simplemxml_element simplexml_load_file(string filename [, string
class_name [, int options [, string ns [, bool is_prefix]]]]) U
Load a filename and return a simplexml_element object to allow for
processing */
PHP_FUNCTION(simplexml_load_file)
{
@@ -1843,13 +1867,25 @@
long options = 0;
zend_class_entry *ce= sxe_class_entry;
zend_bool isprefix = 0;
+ zend_uchar filename_type;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|C!lsb",
&filename, &filename_len, &ce, &options, &ns, &ns_len, &isprefix) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|C!ls&b",
&filename, &filename_len, &filename_type, &ce, &options, &ns, &ns_len,
UG(utf8_conv), &isprefix) == FAILURE) {
return;
}
+ if (filename_type == IS_UNICODE) {
+ if (php_stream_path_encode(NULL, &filename, &filename_len,
(UChar*)filename, filename_len, REPORT_ERRORS, NULL) == FAILURE) {
+
zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Could not encode
filename", 0 TSRMLS_CC);
+ return;
+ }
+ }
+
docp = xmlReadFile(filename, NULL, options);
+ if (filename_type == IS_UNICODE) {
+ efree(filename);
+ }
+
if (! docp) {
RETURN_FALSE;
}
@@ -1868,7 +1904,7 @@
}
/* }}} */
-/* {{{ proto simplemxml_element simplexml_load_string(string data [, string
class_name [, int options [, string ns [, bool is_prefix]]]])
+/* {{{ proto simplemxml_element simplexml_load_string(string data [, string
class_name [, int options [, string ns [, bool is_prefix]]]]) U
Load a string and return a simplexml_element object to allow for processing
*/
PHP_FUNCTION(simplexml_load_string)
{
@@ -1882,7 +1918,7 @@
zend_class_entry *ce= sxe_class_entry;
zend_bool isprefix = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|C!lsb", &data,
&data_len, &ce, &options, &ns, &ns_len, &isprefix) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|C!ls&b", &data,
&data_len, &ce, &options, &ns, &ns_len, UG(utf8_conv), &isprefix) == FAILURE) {
return;
}
@@ -1907,7 +1943,7 @@
/* }}} */
-/* {{{ proto SimpleXMLElement::__construct(string data [, int options [, bool
data_is_url [, string ns [, bool is_prefix]]]])
+/* {{{ proto SimpleXMLElement::__construct(string data [, int options [, bool
data_is_url [, string ns [, bool is_prefix]]]]) U
SimpleXMLElement constructor */
SXE_METHOD(__construct)
{
@@ -1917,17 +1953,34 @@
xmlDocPtr docp;
long options = 0;
zend_bool is_url = 0, isprefix = 0;
+ zend_uchar data_type;
php_set_error_handling(EH_THROW, zend_exception_get_default(TSRMLS_C)
TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lbsb", &data,
&data_len, &options, &is_url, &ns, &ns_len, &isprefix) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|lbs&b", &data,
&data_len, &data_type, &options, &is_url, &ns, &ns_len, UG(utf8_conv),
&isprefix) == FAILURE) {
php_std_error_handling();
return;
}
php_std_error_handling();
+ if (data_type == IS_UNICODE) {
+ if (is_url) {
+ if (php_stream_path_encode(NULL, &data, &data_len,
(UChar*)data, data_len, REPORT_ERRORS, NULL) == FAILURE) {
+
zend_throw_exception(zend_exception_get_default(TSRMLS_C), "String could not be
parsed as XML", 0 TSRMLS_CC);
+ return;
+ }
+ } else {
+
zend_throw_exception(zend_exception_get_default(TSRMLS_C), "SimpleXMLElement
can only parse a binary string", 0 TSRMLS_CC);
+ return;
+ }
+ }
+
docp = is_url ? xmlReadFile(data, NULL, options) : xmlReadMemory(data,
data_len, NULL, NULL, options);
+ if (is_url && data_type == IS_UNICODE) {
+ efree(data);
+ }
+
if (!docp) {
((php_libxml_node_object *)sxe)->document = NULL;
zend_throw_exception(zend_exception_get_default(TSRMLS_C),
"String could not be parsed as XML", 0 TSRMLS_CC);
@@ -2080,12 +2133,12 @@
int u_len;
namelen = xmlStrlen(curnode->name);
-
zend_string_to_unicode_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
&str_key->u, &u_len, (char*)curnode->name, namelen, &status);
+ zend_string_to_unicode_ex(UG(utf8_conv), &str_key->u, &u_len,
(char*)curnode->name, namelen, &status);
*str_key_len = u_len + 1;
return HASH_KEY_IS_UNICODE;
} else {
namelen = xmlStrlen(curnode->name);
- str_key->s = estrndup(curnode->name, namelen);
+ str_key->s = estrndup((char *)curnode->name, namelen);
*str_key_len = namelen + 1;
return HASH_KEY_IS_STRING;
}
@@ -2134,7 +2187,7 @@
return php_sxe_get_first_node(sxe, node TSRMLS_CC);
}
-/* {{{ proto simplemxml_element simplexml_import_dom(domNode node [, string
class_name])
+/* {{{ proto simplemxml_element simplexml_import_dom(domNode node [, string
class_name]) U
Get a simplexml_element object from dom to allow for processing */
PHP_FUNCTION(simplexml_import_dom)
{
@@ -2271,7 +2324,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.215 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.216 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/002.phpt?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/simplexml/tests/002.phpt
diff -u php-src/ext/simplexml/tests/002.phpt:1.11
php-src/ext/simplexml/tests/002.phpt:1.12
--- php-src/ext/simplexml/tests/002.phpt:1.11 Wed Dec 7 16:52:13 2005
+++ php-src/ext/simplexml/tests/002.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd">
<sxe id="elem1">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/003.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/simplexml/tests/003.phpt
diff -u php-src/ext/simplexml/tests/003.phpt:1.6
php-src/ext/simplexml/tests/003.phpt:1.7
--- php-src/ext/simplexml/tests/003.phpt:1.6 Wed Dec 7 16:52:13 2005
+++ php-src/ext/simplexml/tests/003.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd" [
<!ENTITY included-entity "This is text included from an entity">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/004.phpt?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/simplexml/tests/004.phpt
diff -u php-src/ext/simplexml/tests/004.phpt:1.10
php-src/ext/simplexml/tests/004.phpt:1.11
--- php-src/ext/simplexml/tests/004.phpt:1.10 Wed Dec 7 16:52:13 2005
+++ php-src/ext/simplexml/tests/004.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$sxe = simplexml_load_string(<<<EOF
+$sxe = simplexml_load_string(b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd">
<sxe id="elem1">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/005.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/simplexml/tests/005.phpt
diff -u php-src/ext/simplexml/tests/005.phpt:1.4
php-src/ext/simplexml/tests/005.phpt:1.5
--- php-src/ext/simplexml/tests/005.phpt:1.4 Sat Oct 29 16:12:57 2005
+++ php-src/ext/simplexml/tests/005.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$sxe = simplexml_load_string(<<<EOF
+$sxe = simplexml_load_string(b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd">
<sxe id="elem1">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/006.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/simplexml/tests/006.phpt
diff -u php-src/ext/simplexml/tests/006.phpt:1.8
php-src/ext/simplexml/tests/006.phpt:1.9
--- php-src/ext/simplexml/tests/006.phpt:1.8 Sun Feb 26 15:48:28 2006
+++ php-src/ext/simplexml/tests/006.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$sxe = simplexml_load_string(<<<EOF
+$sxe = simplexml_load_string(b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd">
<sxe id="elem1">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/007.phpt?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/simplexml/tests/007.phpt
diff -u php-src/ext/simplexml/tests/007.phpt:1.12
php-src/ext/simplexml/tests/007.phpt:1.13
--- php-src/ext/simplexml/tests/007.phpt:1.12 Wed Dec 7 16:52:13 2005
+++ php-src/ext/simplexml/tests/007.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd">
<sxe id="elem1">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/008.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/simplexml/tests/008.phpt
diff -u php-src/ext/simplexml/tests/008.phpt:1.6
php-src/ext/simplexml/tests/008.phpt:1.7
--- php-src/ext/simplexml/tests/008.phpt:1.6 Sat Oct 29 16:12:57 2005
+++ php-src/ext/simplexml/tests/008.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd">
<sxe id="elem1">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/009.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/simplexml/tests/009.phpt
diff -u php-src/ext/simplexml/tests/009.phpt:1.7
php-src/ext/simplexml/tests/009.phpt:1.8
--- php-src/ext/simplexml/tests/009.phpt:1.7 Sat Oct 29 16:12:57 2005
+++ php-src/ext/simplexml/tests/009.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$sxe = simplexml_load_string(<<<EOF
+$sxe = simplexml_load_string(b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd">
<sxe id="elem1">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/009b.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/009b.phpt
diff -u php-src/ext/simplexml/tests/009b.phpt:1.1
php-src/ext/simplexml/tests/009b.phpt:1.2
--- php-src/ext/simplexml/tests/009b.phpt:1.1 Fri Apr 14 15:13:46 2006
+++ php-src/ext/simplexml/tests/009b.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$sxe = simplexml_load_string(<<<EOF
+$sxe = simplexml_load_string(b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd">
<sxe id="elem1">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/010.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/simplexml/tests/010.phpt
diff -u php-src/ext/simplexml/tests/010.phpt:1.8
php-src/ext/simplexml/tests/010.phpt:1.9
--- php-src/ext/simplexml/tests/010.phpt:1.8 Wed Dec 7 16:52:13 2005
+++ php-src/ext/simplexml/tests/010.phpt Tue Aug 8 20:52:45 2006
@@ -9,7 +9,7 @@
{
}
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd">
<sxe id="elem1">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/011.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/simplexml/tests/011.phpt
diff -u php-src/ext/simplexml/tests/011.phpt:1.4
php-src/ext/simplexml/tests/011.phpt:1.5
--- php-src/ext/simplexml/tests/011.phpt:1.4 Sat Oct 29 16:12:57 2005
+++ php-src/ext/simplexml/tests/011.phpt Tue Aug 8 20:52:45 2006
@@ -7,7 +7,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version="1.0" encoding="ISO-8859-1" ?>
<foo>
<bar>bar</bar>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/012.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/simplexml/tests/012.phpt
diff -u php-src/ext/simplexml/tests/012.phpt:1.7
php-src/ext/simplexml/tests/012.phpt:1.8
--- php-src/ext/simplexml/tests/012.phpt:1.7 Tue Nov 29 02:41:54 2005
+++ php-src/ext/simplexml/tests/012.phpt Tue Aug 8 20:52:45 2006
@@ -7,7 +7,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version="1.0" encoding="ISO-8859-1" ?>
<foo/>
EOF;
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/013.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/simplexml/tests/013.phpt
diff -u php-src/ext/simplexml/tests/013.phpt:1.4
php-src/ext/simplexml/tests/013.phpt:1.5
--- php-src/ext/simplexml/tests/013.phpt:1.4 Tue Jan 17 12:18:52 2006
+++ php-src/ext/simplexml/tests/013.phpt Tue Aug 8 20:52:45 2006
@@ -7,7 +7,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version="1.0" encoding="ISO-8859-1" ?>
<foo>bar<baz/>bar</foo>
EOF;
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/014.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/simplexml/tests/014.phpt
diff -u php-src/ext/simplexml/tests/014.phpt:1.8
php-src/ext/simplexml/tests/014.phpt:1.9
--- php-src/ext/simplexml/tests/014.phpt:1.8 Mon Aug 15 14:37:55 2005
+++ php-src/ext/simplexml/tests/014.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person name="Joe"></person>
</people>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/014a.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/simplexml/tests/014a.phpt
diff -u php-src/ext/simplexml/tests/014a.phpt:1.5
php-src/ext/simplexml/tests/014a.phpt:1.6
--- php-src/ext/simplexml/tests/014a.phpt:1.5 Mon Aug 15 14:37:55 2005
+++ php-src/ext/simplexml/tests/014a.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person name="Joe"></person>
</people>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/014b.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/simplexml/tests/014b.phpt
diff -u php-src/ext/simplexml/tests/014b.phpt:1.5
php-src/ext/simplexml/tests/014b.phpt:1.6
--- php-src/ext/simplexml/tests/014b.phpt:1.5 Mon Aug 15 14:37:55 2005
+++ php-src/ext/simplexml/tests/014b.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person name="Joe"></person>
<person name="Boe"></person>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/015.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/simplexml/tests/015.phpt
diff -u php-src/ext/simplexml/tests/015.phpt:1.7
php-src/ext/simplexml/tests/015.phpt:1.8
--- php-src/ext/simplexml/tests/015.phpt:1.7 Tue Aug 16 15:09:45 2005
+++ php-src/ext/simplexml/tests/015.phpt Tue Aug 8 20:52:45 2006
@@ -4,13 +4,13 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person name="Joe"></person>
</people>
EOF;
-$xml2 =<<<EOF
+$xml2 =b<<<EOF
<people>
<person name="Joe"></person>
<person name="Boe"></person>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/016.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/simplexml/tests/016.phpt
diff -u php-src/ext/simplexml/tests/016.phpt:1.8
php-src/ext/simplexml/tests/016.phpt:1.9
--- php-src/ext/simplexml/tests/016.phpt:1.8 Mon Aug 15 14:37:55 2005
+++ php-src/ext/simplexml/tests/016.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person name="Joe"></person>
</people>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/016a.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/016a.phpt
diff -u php-src/ext/simplexml/tests/016a.phpt:1.2
php-src/ext/simplexml/tests/016a.phpt:1.3
--- php-src/ext/simplexml/tests/016a.phpt:1.2 Mon Aug 15 14:37:55 2005
+++ php-src/ext/simplexml/tests/016a.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person name="Foo"></person>
</people>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/017.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/simplexml/tests/017.phpt
diff -u php-src/ext/simplexml/tests/017.phpt:1.3
php-src/ext/simplexml/tests/017.phpt:1.4
--- php-src/ext/simplexml/tests/017.phpt:1.3 Sat Jan 17 19:41:32 2004
+++ php-src/ext/simplexml/tests/017.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person name="Joe">
<child name="Ann" />
@@ -16,7 +16,7 @@
</person>
</people>
EOF;
-$xml1 =<<<EOF
+$xml1 =b<<<EOF
<people>
<person name="Joe">
<child name="Ann" />
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/018.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/018.phpt
diff -u php-src/ext/simplexml/tests/018.phpt:1.2
php-src/ext/simplexml/tests/018.phpt:1.3
--- php-src/ext/simplexml/tests/018.phpt:1.2 Sat Jan 17 19:41:32 2004
+++ php-src/ext/simplexml/tests/018.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person name="Joe">
Text1
@@ -19,7 +19,7 @@
</person>
</people>
EOF;
-$xml1 =<<<EOF
+$xml1 =b<<<EOF
<people>
<person name="Joe">
<child />
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/019.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/simplexml/tests/019.phpt
diff -u php-src/ext/simplexml/tests/019.phpt:1.4
php-src/ext/simplexml/tests/019.phpt:1.5
--- php-src/ext/simplexml/tests/019.phpt:1.4 Sat Oct 29 16:12:57 2005
+++ php-src/ext/simplexml/tests/019.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$sxe = simplexml_load_string(<<<EOF
+$sxe = simplexml_load_string(b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE sxe SYSTEM "notfound.dtd">
<sxe id="elem1">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/020.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/020.phpt
diff -u php-src/ext/simplexml/tests/020.phpt:1.2
php-src/ext/simplexml/tests/020.phpt:1.3
--- php-src/ext/simplexml/tests/020.phpt:1.2 Sat Oct 29 16:12:57 2005
+++ php-src/ext/simplexml/tests/020.phpt Tue Aug 8 20:52:45 2006
@@ -1,21 +1,20 @@
---TEST--
-SimpleXML: Attribute compared to string
+--TEST--
+SimpleXML: Attribute compared to string
--SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
---FILE--
-<?php
-
-$doc = simplexml_load_string('<root><name attr="foo">bar</name></root>');
-print $doc->name["attr"];
-print "\n";
-if ($doc->name["attr"] == "foo") {
- print "Works\n";
-} else {
- print "Error\n";
-}
-?>
-===DONE===
---EXPECT--
-foo
-Works
-===DONE===
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--FILE--
+<?php
+$doc = simplexml_load_string(b'<root><name attr="foo">bar</name></root>');
+print $doc->name["attr"];
+print "\n";
+if ($doc->name["attr"] == "foo") {
+ print "Works\n";
+} else {
+ print "Error\n";
+}
+?>
+===DONE===
+--EXPECT--
+foo
+Works
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/021.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/021.phpt
diff -u php-src/ext/simplexml/tests/021.phpt:1.2
php-src/ext/simplexml/tests/021.phpt:1.3
--- php-src/ext/simplexml/tests/021.phpt:1.2 Sat Oct 29 16:12:57 2005
+++ php-src/ext/simplexml/tests/021.phpt Tue Aug 8 20:52:45 2006
@@ -6,7 +6,7 @@
<?php
$ok = 1;
-$doc = simplexml_load_string('<root><exists>foo</exists></root>');
+$doc = simplexml_load_string(b'<root><exists>foo</exists></root>');
if(!isset($doc->exists)) {
$ok *= 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/022.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/simplexml/tests/022.phpt
diff -u php-src/ext/simplexml/tests/022.phpt:1.5
php-src/ext/simplexml/tests/022.phpt:1.6
--- php-src/ext/simplexml/tests/022.phpt:1.5 Wed Dec 7 16:52:13 2005
+++ php-src/ext/simplexml/tests/022.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<pres><content><file glob="slide_*.xml"/></content></pres>
EOF;
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/023.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/simplexml/tests/023.phpt
diff -u php-src/ext/simplexml/tests/023.phpt:1.6
php-src/ext/simplexml/tests/023.phpt:1.7
--- php-src/ext/simplexml/tests/023.phpt:1.6 Wed Dec 7 16:52:13 2005
+++ php-src/ext/simplexml/tests/023.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<!DOCTYPE talks SYSTEM "nbsp.dtd" [
<!ELEMENT root EMPTY>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/024.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/simplexml/tests/024.phpt
diff -u php-src/ext/simplexml/tests/024.phpt:1.3
php-src/ext/simplexml/tests/024.phpt:1.4
--- php-src/ext/simplexml/tests/024.phpt:1.3 Wed Dec 7 16:52:13 2005
+++ php-src/ext/simplexml/tests/024.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<root>
<elem attr1='11' attr2='12' attr3='13'/>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/025.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/simplexml/tests/025.phpt
diff -u php-src/ext/simplexml/tests/025.phpt:1.4
php-src/ext/simplexml/tests/025.phpt:1.5
--- php-src/ext/simplexml/tests/025.phpt:1.4 Tue Nov 1 23:21:29 2005
+++ php-src/ext/simplexml/tests/025.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<xhtml:html xmlns:html='http://www.w3.org/1999/xhtml'
xmlns:xhtml='http://www.w3.org/TR/REC-html40'>
<xhtml:head><xhtml:title
xmlns:xhtml='http://www.w3.org/TR/REC-html401'>bla</xhtml:title></xhtml:head>
@@ -23,7 +23,7 @@
var_dump($sxe->getDocNamespaces());
var_dump($sxe->getDocNamespaces(true));
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head><title xmlns='http://www.w3.org/TR/REC-html40'>bla</title></head>
@@ -35,7 +35,7 @@
var_dump($sxe->getNamespaces());
var_dump($sxe->getDocNamespaces());
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version='1.0'?>
<root/>
EOF;
@@ -93,39 +93,39 @@
--UEXPECTF--
array(1) {
[u"xhtml"]=>
- string(31) "http://www.w3.org/TR/REC-html40";
+ unicode(31) "http://www.w3.org/TR/REC-html40";
}
array(3) {
[u"xhtml"]=>
- string(31) "http://www.w3.org/TR/REC-html40";
+ unicode(31) "http://www.w3.org/TR/REC-html40";
[u"html"]=>
- string(28) "http://www.w3.org/1999/xhtml";
+ unicode(28) "http://www.w3.org/1999/xhtml";
[u"foo"]=>
- string(6) "foobar"
+ unicode(6) "foobar"
}
array(2) {
[u"html"]=>
- string(28) "http://www.w3.org/1999/xhtml";
+ unicode(28) "http://www.w3.org/1999/xhtml";
[u"xhtml"]=>
- string(31) "http://www.w3.org/TR/REC-html40";
+ unicode(31) "http://www.w3.org/TR/REC-html40";
}
array(4) {
[u"html"]=>
- string(28) "http://www.w3.org/1999/xhtml";
+ unicode(28) "http://www.w3.org/1999/xhtml";
[u"xhtml"]=>
- string(31) "http://www.w3.org/TR/REC-html40";
+ unicode(31) "http://www.w3.org/TR/REC-html40";
[u"foo"]=>
- string(6) "foobar"
+ unicode(6) "foobar"
[u"baz"]=>
- string(9) "foobarbaz"
+ unicode(9) "foobarbaz"
}
array(1) {
[u""]=>
- string(28) "http://www.w3.org/1999/xhtml";
+ unicode(28) "http://www.w3.org/1999/xhtml";
}
array(1) {
[u""]=>
- string(28) "http://www.w3.org/1999/xhtml";
+ unicode(28) "http://www.w3.org/1999/xhtml";
}
array(0) {
}
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/026.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/026.phpt
diff -u php-src/ext/simplexml/tests/026.phpt:1.1
php-src/ext/simplexml/tests/026.phpt:1.2
--- php-src/ext/simplexml/tests/026.phpt:1.1 Sat Feb 25 23:41:06 2006
+++ php-src/ext/simplexml/tests/026.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person>Jane</person>
</people>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/027.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/027.phpt
diff -u php-src/ext/simplexml/tests/027.phpt:1.2
php-src/ext/simplexml/tests/027.phpt:1.3
--- php-src/ext/simplexml/tests/027.phpt:1.2 Sun Mar 5 14:01:13 2006
+++ php-src/ext/simplexml/tests/027.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people></people>
EOF;
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/028.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/028.phpt
diff -u php-src/ext/simplexml/tests/028.phpt:1.1
php-src/ext/simplexml/tests/028.phpt:1.2
--- php-src/ext/simplexml/tests/028.phpt:1.1 Sun Feb 26 13:37:54 2006
+++ php-src/ext/simplexml/tests/028.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people></people>
EOF;
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/029.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/029.phpt
diff -u php-src/ext/simplexml/tests/029.phpt:1.1
php-src/ext/simplexml/tests/029.phpt:1.2
--- php-src/ext/simplexml/tests/029.phpt:1.1 Mon Feb 27 13:32:25 2006
+++ php-src/ext/simplexml/tests/029.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person name="Joe"/>
<person name="John">
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/030.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/030.phpt
diff -u php-src/ext/simplexml/tests/030.phpt:1.1
php-src/ext/simplexml/tests/030.phpt:1.2
--- php-src/ext/simplexml/tests/030.phpt:1.1 Sun Mar 5 14:01:13 2006
+++ php-src/ext/simplexml/tests/030.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<root s:att1="b" att1="a"
xmlns:s="urn::test" xmlns:t="urn::test-t">
<child1>test</child1>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/031.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/031.phpt
diff -u php-src/ext/simplexml/tests/031.phpt:1.2
php-src/ext/simplexml/tests/031.phpt:1.3
--- php-src/ext/simplexml/tests/031.phpt:1.2 Tue Jun 20 19:04:57 2006
+++ php-src/ext/simplexml/tests/031.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<root s:att1="b" att1="a"
xmlns:s="urn::test" xmlns:t="urn::test-t">
<child1>test</child1>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/032.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/032.phpt
diff -u php-src/ext/simplexml/tests/032.phpt:1.2
php-src/ext/simplexml/tests/032.phpt:1.3
--- php-src/ext/simplexml/tests/032.phpt:1.2 Fri Aug 4 08:11:39 2006
+++ php-src/ext/simplexml/tests/032.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
<person name="Joe"/>
<person name="John">
@@ -16,7 +16,7 @@
</people>
EOF;
-$xml1 =<<<EOF
+$xml1 =b<<<EOF
<people>
<person name="John">
<children>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/033.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/033.phpt
diff -u php-src/ext/simplexml/tests/033.phpt:1.2
php-src/ext/simplexml/tests/033.phpt:1.3
--- php-src/ext/simplexml/tests/033.phpt:1.2 Mon Mar 27 13:51:32 2006
+++ php-src/ext/simplexml/tests/033.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<people>
test
<person name="Joe"/>
@@ -18,7 +18,7 @@
</people>
EOF;
-$foo = simplexml_load_string( "<foo />" );
+$foo = simplexml_load_string( b"<foo />" );
$people = simplexml_load_string($xml);
var_dump((bool)$foo);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug26976.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/bug26976.phpt
diff -u php-src/ext/simplexml/tests/bug26976.phpt:1.2
php-src/ext/simplexml/tests/bug26976.phpt:1.3
--- php-src/ext/simplexml/tests/bug26976.phpt:1.2 Wed Jan 21 03:18:13 2004
+++ php-src/ext/simplexml/tests/bug26976.phpt Tue Aug 8 20:52:45 2006
@@ -6,7 +6,7 @@
<?php
$root = simplexml_load_string(
-'<?xml version="1.0"?>
+b'<?xml version="1.0"?>
<root>
<child>a</child>
<child>b</child>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug27010.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/simplexml/tests/bug27010.phpt
diff -u php-src/ext/simplexml/tests/bug27010.phpt:1.5
php-src/ext/simplexml/tests/bug27010.phpt:1.6
--- php-src/ext/simplexml/tests/bug27010.phpt:1.5 Wed Dec 21 11:43:24 2005
+++ php-src/ext/simplexml/tests/bug27010.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml=<<<EOF
+$xml=b<<<EOF
<drinks xmlns:hot="http://www.example.com/hot";>
<hot:drink><hot:name>Coffee</hot:name></hot:drink>
<hot:drink><hot:name>Tea</hot:name></hot:drink>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug35785.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/simplexml/tests/bug35785.phpt
diff -u php-src/ext/simplexml/tests/bug35785.phpt:1.6
php-src/ext/simplexml/tests/bug35785.phpt:1.7
--- php-src/ext/simplexml/tests/bug35785.phpt:1.6 Tue Jun 27 00:09:23 2006
+++ php-src/ext/simplexml/tests/bug35785.phpt Tue Aug 8 20:52:45 2006
@@ -5,13 +5,13 @@
--FILE--
<?php
-$xml = simplexml_load_string("<root></root>");
+$xml = simplexml_load_string(b"<root></root>");
$xml->bla->posts->name = "FooBar";
echo $xml->asXML();
echo "===FAIL===\n";
-$xml = simplexml_load_string("<root></root>");
+$xml = simplexml_load_string(b"<root></root>");
$count = count($xml->bla->posts);
var_dump($count);
$xml->bla->posts[++$count]->name = "FooBar";
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug36611.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/simplexml/tests/bug36611.phpt
diff -u php-src/ext/simplexml/tests/bug36611.phpt:1.3
php-src/ext/simplexml/tests/bug36611.phpt:1.4
--- php-src/ext/simplexml/tests/bug36611.phpt:1.3 Tue Jun 27 00:09:23 2006
+++ php-src/ext/simplexml/tests/bug36611.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml_str = <<<EOD
+$xml_str = b<<<EOD
<?xml version="1.0" encoding="ISO-8859-1" ?>
<c_fpobel >
<pos >
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug37565.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/simplexml/tests/bug37565.phpt
diff -u php-src/ext/simplexml/tests/bug37565.phpt:1.3
php-src/ext/simplexml/tests/bug37565.phpt:1.4
--- php-src/ext/simplexml/tests/bug37565.phpt:1.3 Tue Jun 27 00:09:23 2006
+++ php-src/ext/simplexml/tests/bug37565.phpt Tue Aug 8 20:52:45 2006
@@ -14,7 +14,7 @@
{
}
-Reflection::export(simplexml_load_string('<test/>', 'Setting'));
+Reflection::export(simplexml_load_string(b'<test/>', 'Setting'));
Reflection::export(simplexml_load_file('data:,<test/>', 'Setting'));
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug38347.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/bug38347.phpt
diff -u php-src/ext/simplexml/tests/bug38347.phpt:1.1
php-src/ext/simplexml/tests/bug38347.phpt:1.2
--- php-src/ext/simplexml/tests/bug38347.phpt:1.1 Sun Aug 6 17:41:39 2006
+++ php-src/ext/simplexml/tests/bug38347.phpt Tue Aug 8 20:52:45 2006
@@ -13,7 +13,7 @@
}
}
-$xmlstr = "<xml><item>Item 1</item><item>Item 2</item></xml>";
+$xmlstr = b"<xml><item>Item 1</item><item>Item 2</item></xml>";
$xml = simplexml_load_string($xmlstr);
iterate($xml->unknown);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug38354.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/bug38354.phpt
diff -u php-src/ext/simplexml/tests/bug38354.phpt:1.2
php-src/ext/simplexml/tests/bug38354.phpt:1.3
--- php-src/ext/simplexml/tests/bug38354.phpt:1.2 Sun Aug 6 20:17:42 2006
+++ php-src/ext/simplexml/tests/bug38354.phpt Tue Aug 8 20:52:45 2006
@@ -6,7 +6,7 @@
<?php
$xml = simplexml_load_string(
-'<code>
+b'<code>
<a href="javascript:alert(\'1\');"><strong>Item Two</strong></a>
</code>'
);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile01.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/profile01.phpt
diff -u php-src/ext/simplexml/tests/profile01.phpt:1.1
php-src/ext/simplexml/tests/profile01.phpt:1.2
--- php-src/ext/simplexml/tests/profile01.phpt:1.1 Fri Jan 16 20:50:29 2004
+++ php-src/ext/simplexml/tests/profile01.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root>
<child>Hello</child>
</root>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile02.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/profile02.phpt
diff -u php-src/ext/simplexml/tests/profile02.phpt:1.1
php-src/ext/simplexml/tests/profile02.phpt:1.2
--- php-src/ext/simplexml/tests/profile02.phpt:1.1 Fri Jan 16 20:50:29 2004
+++ php-src/ext/simplexml/tests/profile02.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root>
<child>Hello</child>
<child>World</child>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile03.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/profile03.phpt
diff -u php-src/ext/simplexml/tests/profile03.phpt:1.1
php-src/ext/simplexml/tests/profile03.phpt:1.2
--- php-src/ext/simplexml/tests/profile03.phpt:1.1 Fri Jan 16 20:50:29 2004
+++ php-src/ext/simplexml/tests/profile03.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root>
<child attribute="Sample" />
</root>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile04.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/simplexml/tests/profile04.phpt
diff -u php-src/ext/simplexml/tests/profile04.phpt:1.3
php-src/ext/simplexml/tests/profile04.phpt:1.4
--- php-src/ext/simplexml/tests/profile04.phpt:1.3 Sat Jan 17 21:22:26 2004
+++ php-src/ext/simplexml/tests/profile04.phpt Tue Aug 8 20:52:45 2006
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root xmlns:reserved="reserved-ns">
<reserved:child>Hello</reserved:child>
</root>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile05.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/simplexml/tests/profile05.phpt
diff -u php-src/ext/simplexml/tests/profile05.phpt:1.3
php-src/ext/simplexml/tests/profile05.phpt:1.4
--- php-src/ext/simplexml/tests/profile05.phpt:1.3 Sat Jan 17 21:22:26 2004
+++ php-src/ext/simplexml/tests/profile05.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
error_reporting(E_ALL & ~E_NOTICE);
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root xmlns:reserved="reserved-ns">
<reserved:child>Hello</reserved:child>
</root>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile06.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/simplexml/tests/profile06.phpt
diff -u php-src/ext/simplexml/tests/profile06.phpt:1.4
php-src/ext/simplexml/tests/profile06.phpt:1.5
--- php-src/ext/simplexml/tests/profile06.phpt:1.4 Sat Jan 17 21:22:26 2004
+++ php-src/ext/simplexml/tests/profile06.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
error_reporting(E_ALL & ~E_NOTICE);
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root xmlns:reserved="reserved-ns">
<child reserved:attribute="Sample" />
</root>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile07.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/simplexml/tests/profile07.phpt
diff -u php-src/ext/simplexml/tests/profile07.phpt:1.4
php-src/ext/simplexml/tests/profile07.phpt:1.5
--- php-src/ext/simplexml/tests/profile07.phpt:1.4 Sat Jan 17 21:22:26 2004
+++ php-src/ext/simplexml/tests/profile07.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
error_reporting(E_ALL & ~E_NOTICE);
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root xmlns:reserved="reserved-ns">
<child reserved:attribute="Sample" />
</root>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile08.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/profile08.phpt
diff -u php-src/ext/simplexml/tests/profile08.phpt:1.2
php-src/ext/simplexml/tests/profile08.phpt:1.3
--- php-src/ext/simplexml/tests/profile08.phpt:1.2 Sat Jan 17 21:47:43 2004
+++ php-src/ext/simplexml/tests/profile08.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
error_reporting(E_ALL & ~E_NOTICE);
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root xmlns:reserved="reserved-ns">
<child reserved:attribute="Sample" />
</root>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile09.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/profile09.phpt
diff -u php-src/ext/simplexml/tests/profile09.phpt:1.1
php-src/ext/simplexml/tests/profile09.phpt:1.2
--- php-src/ext/simplexml/tests/profile09.phpt:1.1 Fri Jan 16 20:50:29 2004
+++ php-src/ext/simplexml/tests/profile09.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
error_reporting(E_ALL & ~E_NOTICE);
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root xmlns:reserved="reserved-ns">
<reserved:child>Hello</reserved:child>
</root>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile10.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/simplexml/tests/profile10.phpt
diff -u php-src/ext/simplexml/tests/profile10.phpt:1.5
php-src/ext/simplexml/tests/profile10.phpt:1.6
--- php-src/ext/simplexml/tests/profile10.phpt:1.5 Wed Jan 21 14:04:47 2004
+++ php-src/ext/simplexml/tests/profile10.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
error_reporting(E_ALL & ~E_NOTICE);
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root xmlns:reserved="reserved-ns" xmlns:special="special-ns">
<child reserved:attribute="Sample" special:attribute="Test" />
</root>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile11.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/simplexml/tests/profile11.phpt
diff -u php-src/ext/simplexml/tests/profile11.phpt:1.6
php-src/ext/simplexml/tests/profile11.phpt:1.7
--- php-src/ext/simplexml/tests/profile11.phpt:1.6 Tue Jan 17 12:18:52 2006
+++ php-src/ext/simplexml/tests/profile11.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
error_reporting(E_ALL & ~E_NOTICE);
-$root = simplexml_load_string('<?xml version="1.0"?>
+$root = simplexml_load_string(b'<?xml version="1.0"?>
<root xmlns:reserved="reserved-ns" xmlns:special="special-ns">
<reserved:child>Hello</reserved:child>
<special:child>World</special:child>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile12.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/simplexml/tests/profile12.phpt
diff -u php-src/ext/simplexml/tests/profile12.phpt:1.4
php-src/ext/simplexml/tests/profile12.phpt:1.5
--- php-src/ext/simplexml/tests/profile12.phpt:1.4 Tue Jun 27 00:09:23 2006
+++ php-src/ext/simplexml/tests/profile12.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version="1.0" encoding="utf-8"?>
<soap:Envelope
xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";
@@ -75,7 +75,7 @@
--UEXPECTF--
array(1) {
[u"soap"]=>
- string(41) "http://schemas.xmlsoap.org/soap/envelope/";
+ unicode(41) "http://schemas.xmlsoap.org/soap/envelope/";
}
object(SimpleXMLElement)#%s (0) {
}
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile13.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/profile13.phpt
diff -u php-src/ext/simplexml/tests/profile13.phpt:1.2
php-src/ext/simplexml/tests/profile13.phpt:1.3
--- php-src/ext/simplexml/tests/profile13.phpt:1.2 Tue Jun 27 00:09:23 2006
+++ php-src/ext/simplexml/tests/profile13.phpt Tue Aug 8 20:52:45 2006
@@ -5,7 +5,7 @@
--FILE--
<?php
-$xml =<<<EOF
+$xml =b<<<EOF
<?xml version="1.0" encoding="utf-8"?>
<soap:Envelope
xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
