From: Marcus Boerger <helly@php.net>
Date: Wed, 30 Nov 2005 08:14:49 +0000 (+0000)
Subject: - Fix tests
X-Git-Tag: RELEASE_2_0_2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a71b5970d513f3a43776c61abc4e9543685f3e7b;p=php

- Fix tests
---

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 33f12c0450..f1c4a73b09 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -865,7 +865,7 @@ static HashTable * sxe_properties_get(zval *object TSRMLS_DC)
 	if (node && sxe->iter.type != SXE_ITER_ATTRLIST) {
 		if (node->type == XML_ATTRIBUTE_NODE) {
 			MAKE_STD_ZVAL(value);
-			ZVAL_STRING(value, sxe_xmlNodeListGetString(node->doc, node->children, 1), 0);
+			ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), value, sxe_xmlNodeListGetString(node->doc, node->children, 1), 0);
 			zend_hash_next_index_insert(rv, &value, sizeof(zval *), NULL);
 			node = NULL;
 		} else {
@@ -878,7 +878,7 @@ static HashTable * sxe_properties_get(zval *object TSRMLS_DC)
 			} else {
 				if (node->type == XML_TEXT_NODE) {
 					MAKE_STD_ZVAL(value);
-					ZVAL_STRING(value, sxe_xmlNodeListGetString(node->doc, node, 1), 0);
+					ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), value, sxe_xmlNodeListGetString(node->doc, node, 1), 0);
 					zend_hash_next_index_insert(rv, &value, sizeof(zval *), NULL);
 					goto next_iter;
 				}
diff --git a/ext/simplexml/tests/023.phpt b/ext/simplexml/tests/023.phpt
index c838ea7681..449daf47b7 100755
--- a/ext/simplexml/tests/023.phpt
+++ b/ext/simplexml/tests/023.phpt
@@ -39,7 +39,7 @@ object(SimpleXMLElement)#%d (1) {
   [u"@attributes"]=>
   array(1) {
     [u"attr"]=>
-    string(13) "foo bar baz"
+    string(%d) "foo%sbar%sbaz"
   }
 }
 object(SimpleXMLElement)#%d (1) {