helly Sun Oct 30 09:00:46 2005 EDT
Modified files:
/php-src/ext/simplexml/tests 000.phpt 001.phpt 002.phpt 003.phpt
004.phpt 007.phpt 010.phpt 022.phpt
023.phpt 024.phpt profile11.phpt
Log:
- Fix unicode expectations
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/000.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/simplexml/tests/000.phpt
diff -u php-src/ext/simplexml/tests/000.phpt:1.1
php-src/ext/simplexml/tests/000.phpt:1.2
--- php-src/ext/simplexml/tests/000.phpt:1.1 Sat Oct 29 12:12:57 2005
+++ php-src/ext/simplexml/tests/000.phpt Sun Oct 30 09:00:45 2005
@@ -218,3 +218,186 @@
bool(false)
NULL
===DONE===
+--UEXPECTF--
+===sxe
+bool(true)
+object(SimpleXMLElement)#%d (3) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"id"]=>
+ string(3) "123"
+ }
+ [u"elem1"]=>
+ array(2) {
+ [0]=>
+ string(36) "There is some text.Here is some more"
+ [1]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(2) {
+ [u"attr1"]=>
+ string(2) "11"
+ [u"attr2"]=>
+ string(2) "12"
+ }
+ }
+ }
+ [u"elem11"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem111"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem1111"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ }
+ }
+}
+===sxe->elem1
+bool(true)
+object(SimpleXMLElement)#%d (3) {
+ [u"@attributes"]=>
+ array(2) {
+ [u"attr1"]=>
+ string(5) "first"
+ [u"attr2"]=>
+ string(6) "second"
+ }
+ [u"comment"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ [u"elem2"]=>
+ object(SimpleXMLElement)#%d (2) {
+ [u"@attributes"]=>
+ array(2) {
+ [u"att25"]=>
+ string(2) "25"
+ [u"att42"]=>
+ string(2) "42"
+ }
+ [u"elem3"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem4"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"test"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ }
+ }
+ }
+}
+===sxe->elem1[0]
+bool(true)
+object(SimpleXMLElement)#%d (3) {
+ [u"@attributes"]=>
+ array(2) {
+ [u"attr1"]=>
+ string(5) "first"
+ [u"attr2"]=>
+ string(6) "second"
+ }
+ [u"comment"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ [u"elem2"]=>
+ object(SimpleXMLElement)#%d (2) {
+ [u"@attributes"]=>
+ array(2) {
+ [u"att25"]=>
+ string(2) "25"
+ [u"att42"]=>
+ string(2) "42"
+ }
+ [u"elem3"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem4"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"test"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ }
+ }
+ }
+}
+===sxe->elem1[0]->elem2
+bool(true)
+object(SimpleXMLElement)#%d (2) {
+ [u"@attributes"]=>
+ array(2) {
+ [u"att25"]=>
+ string(2) "25"
+ [u"att42"]=>
+ string(2) "42"
+ }
+ [u"elem3"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem4"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"test"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ }
+ }
+}
+===sxe->elem1[0]->elem2->bla
+bool(false)
+object(SimpleXMLElement)#%d (0) {
+}
+===sxe->elem1[0]["attr1"]
+bool(false)
+object(SimpleXMLElement)#%d (1) {
+ [0]=>
+ unicode(5) "first"
+}
+===sxe->elem1[0]->attr1
+bool(false)
+object(SimpleXMLElement)#%d (0) {
+}
+===sxe->elem1[1]
+bool(true)
+object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(2) {
+ [u"attr1"]=>
+ string(2) "11"
+ [u"attr2"]=>
+ string(2) "12"
+ }
+}
+===sxe->elem1[2]
+bool(false)
+NULL
+===sxe->elem11
+bool(true)
+object(SimpleXMLElement)#%d (1) {
+ [u"elem111"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem1111"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ }
+}
+===sxe->elem11->elem111
+bool(true)
+object(SimpleXMLElement)#%d (1) {
+ [u"elem1111"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+}
+===sxe->elem11->elem111->elem1111
+bool(true)
+object(SimpleXMLElement)#%d (0) {
+}
+===sxe->elem22
+bool(false)
+object(SimpleXMLElement)#%d (0) {
+}
+===sxe->elem22->elem222
+bool(false)
+NULL
+===sxe->elem22->attr22
+bool(false)
+NULL
+===sxe->elem22["attr22"]
+bool(false)
+NULL
+===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/001.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/simplexml/tests/001.phpt
diff -u php-src/ext/simplexml/tests/001.phpt:1.5
php-src/ext/simplexml/tests/001.phpt:1.6
--- php-src/ext/simplexml/tests/001.phpt:1.5 Sat Oct 29 12:12:57 2005
+++ php-src/ext/simplexml/tests/001.phpt Sun Oct 30 09:00:45 2005
@@ -41,3 +41,35 @@
}
}
===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (2) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"id"]=>
+ string(5) "elem1"
+ }
+ [u"elem1"]=>
+ object(SimpleXMLElement)#%d (3) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr1"]=>
+ string(5) "first"
+ }
+ [u"comment"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ [u"elem2"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem3"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem4"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"test"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ }
+ }
+ }
+ }
+}
+===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/002.phpt?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/simplexml/tests/002.phpt
diff -u php-src/ext/simplexml/tests/002.phpt:1.9
php-src/ext/simplexml/tests/002.phpt:1.10
--- php-src/ext/simplexml/tests/002.phpt:1.9 Sat Oct 29 12:12:57 2005
+++ php-src/ext/simplexml/tests/002.phpt Sun Oct 30 09:00:45 2005
@@ -62,3 +62,35 @@
}
}
===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (2) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"id"]=>
+ string(5) "elem1"
+ }
+ [u"elem1"]=>
+ object(SimpleXMLElement)#%d (3) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr1"]=>
+ string(5) "first"
+ }
+ [u"comment"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ [u"elem2"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem3"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem4"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"test"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ }
+ }
+ }
+ }
+}
+===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/003.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/simplexml/tests/003.phpt
diff -u php-src/ext/simplexml/tests/003.phpt:1.4
php-src/ext/simplexml/tests/003.phpt:1.5
--- php-src/ext/simplexml/tests/003.phpt:1.4 Sat Oct 29 12:12:57 2005
+++ php-src/ext/simplexml/tests/003.phpt Sun Oct 30 09:00:45 2005
@@ -67,3 +67,40 @@
}
}
===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (2) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"id"]=>
+ string(5) "elem1"
+ }
+ [u"elem1"]=>
+ object(SimpleXMLElement)#%d (3) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr1"]=>
+ string(5) "first"
+ }
+ [u"comment"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ [u"elem2"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem3"]=>
+ object(SimpleXMLElement)#%d (2) {
+ [u"included-entity"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"included-entity"]=>
+ string(36) "This is text included from an entity"
+ }
+ [u"elem4"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"test"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ }
+ }
+ }
+ }
+}
+===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/004.phpt?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/simplexml/tests/004.phpt
diff -u php-src/ext/simplexml/tests/004.phpt:1.8
php-src/ext/simplexml/tests/004.phpt:1.9
--- php-src/ext/simplexml/tests/004.phpt:1.8 Sat Oct 29 12:12:57 2005
+++ php-src/ext/simplexml/tests/004.phpt Sun Oct 30 09:00:45 2005
@@ -66,3 +66,36 @@
}
string(11) "CDATA block"
===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (2) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"id"]=>
+ string(5) "elem1"
+ }
+ [u"elem1"]=>
+ object(SimpleXMLElement)#%d (3) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr1"]=>
+ string(5) "first"
+ }
+ [u"comment"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ [u"elem2"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem3"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem4"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"test"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ }
+ }
+ }
+ }
+}
+unicode(11) "CDATA block"
+===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/007.phpt?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/simplexml/tests/007.phpt
diff -u php-src/ext/simplexml/tests/007.phpt:1.10
php-src/ext/simplexml/tests/007.phpt:1.11
--- php-src/ext/simplexml/tests/007.phpt:1.10 Sat Oct 29 12:12:57 2005
+++ php-src/ext/simplexml/tests/007.phpt Sun Oct 30 09:00:45 2005
@@ -95,3 +95,52 @@
int(4)
int(4)
===Done===
+--UEXPECTF--
+===Property===
+object(SimpleXMLElement)#%d (3) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr1"]=>
+ string(5) "first"
+ }
+ [u"comment"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ [u"elem2"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem3"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"elem4"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"test"]=>
+ object(SimpleXMLElement)#%d (0) {
+ }
+ }
+ }
+ }
+}
+===Array===
+object(SimpleXMLElement)#%d (1) {
+ [0]=>
+ unicode(5) "elem1"
+}
+object(SimpleXMLElement)#%d (1) {
+ [0]=>
+ unicode(5) "first"
+}
+===Set===
+object(SimpleXMLElement)#%d (1) {
+ [0]=>
+ unicode(8) "Changed1"
+}
+object(SimpleXMLElement)#%d (1) {
+ [0]=>
+ unicode(2) "12"
+}
+===Unset===
+NULL
+NULL
+===Misc.===
+int(4)
+int(4)
+===Done===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/010.phpt?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/simplexml/tests/010.phpt
diff -u php-src/ext/simplexml/tests/010.phpt:1.6
php-src/ext/simplexml/tests/010.phpt:1.7
--- php-src/ext/simplexml/tests/010.phpt:1.6 Sat Oct 29 12:12:57 2005
+++ php-src/ext/simplexml/tests/010.phpt Sun Oct 30 09:00:45 2005
@@ -62,3 +62,35 @@
}
}
===DONE===
+--UEXPECTF--
+object(simplexml_inherited)#%d (2) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"id"]=>
+ string(5) "elem1"
+ }
+ [u"elem1"]=>
+ object(simplexml_inherited)#%d (3) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr1"]=>
+ string(5) "first"
+ }
+ [u"comment"]=>
+ object(simplexml_inherited)#%d (0) {
+ }
+ [u"elem2"]=>
+ object(simplexml_inherited)#%d (1) {
+ [u"elem3"]=>
+ object(simplexml_inherited)#%d (1) {
+ [u"elem4"]=>
+ object(simplexml_inherited)#%d (1) {
+ [u"test"]=>
+ object(simplexml_inherited)#%d (0) {
+ }
+ }
+ }
+ }
+ }
+}
+===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/022.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/simplexml/tests/022.phpt
diff -u php-src/ext/simplexml/tests/022.phpt:1.3
php-src/ext/simplexml/tests/022.phpt:1.4
--- php-src/ext/simplexml/tests/022.phpt:1.3 Sat Oct 29 12:12:57 2005
+++ php-src/ext/simplexml/tests/022.phpt Sun Oct 30 09:00:45 2005
@@ -60,3 +60,36 @@
string(11) "slide_*.xml"
}
===DONE===
+--UEXPECTF--
+===CONTENT===
+object(SimpleXMLElement)#%d (1) {
+ [u"file"]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"glob"]=>
+ string(11) "slide_*.xml"
+ }
+ }
+}
+===FILE===
+object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"glob"]=>
+ string(11) "slide_*.xml"
+ }
+}
+===FOREACH===
+object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"glob"]=>
+ string(11) "slide_*.xml"
+ }
+}
+object(SimpleXMLElement)#%d (1) {
+ [0]=>
+ unicode(11) "slide_*.xml"
+}
+===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/023.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/simplexml/tests/023.phpt
diff -u php-src/ext/simplexml/tests/023.phpt:1.3
php-src/ext/simplexml/tests/023.phpt:1.4
--- php-src/ext/simplexml/tests/023.phpt:1.3 Sat Oct 29 12:12:57 2005
+++ php-src/ext/simplexml/tests/023.phpt Sun Oct 30 09:00:45 2005
@@ -34,3 +34,16 @@
string(%d) "foo%sbar%sbaz"
}
===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr"]=>
+ string(13) "foo bar baz"
+ }
+}
+object(SimpleXMLElement)#%d (1) {
+ [0]=>
+ unicode(%d) "foo%sbar%sbaz"
+}
+===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/024.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/simplexml/tests/024.phpt
diff -u php-src/ext/simplexml/tests/024.phpt:1.1
php-src/ext/simplexml/tests/024.phpt:1.2
--- php-src/ext/simplexml/tests/024.phpt:1.1 Sun Oct 30 08:01:01 2005
+++ php-src/ext/simplexml/tests/024.phpt Sun Oct 30 09:00:45 2005
@@ -173,3 +173,145 @@
}
}
===DONE===
+--UEXPECTF--
+===elem/@attr2===
+array(3) {
+ [0]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr2"]=>
+ string(2) "12"
+ }
+ }
+ [1]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr2"]=>
+ string(2) "22"
+ }
+ }
+ [2]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr2"]=>
+ string(2) "32"
+ }
+ }
+}
+===//@attr2===
+array(3) {
+ [0]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr2"]=>
+ string(2) "12"
+ }
+ }
+ [1]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr2"]=>
+ string(2) "22"
+ }
+ }
+ [2]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr2"]=>
+ string(2) "32"
+ }
+ }
+}
+===//@*===
+array(9) {
+ [0]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr1"]=>
+ string(2) "11"
+ }
+ }
+ [1]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr2"]=>
+ string(2) "12"
+ }
+ }
+ [2]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr3"]=>
+ string(2) "13"
+ }
+ }
+ [3]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr1"]=>
+ string(2) "21"
+ }
+ }
+ [4]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr2"]=>
+ string(2) "22"
+ }
+ }
+ [5]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr3"]=>
+ string(2) "23"
+ }
+ }
+ [6]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr1"]=>
+ string(2) "31"
+ }
+ }
+ [7]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr2"]=>
+ string(2) "32"
+ }
+ }
+ [8]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr3"]=>
+ string(2) "33"
+ }
+ }
+}
+===elem[2]/@attr2===
+array(1) {
+ [0]=>
+ object(SimpleXMLElement)#%d (1) {
+ [u"@attributes"]=>
+ array(1) {
+ [u"attr2"]=>
+ string(2) "22"
+ }
+ }
+}
+===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/profile11.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/simplexml/tests/profile11.phpt
diff -u php-src/ext/simplexml/tests/profile11.phpt:1.4
php-src/ext/simplexml/tests/profile11.phpt:1.5
--- php-src/ext/simplexml/tests/profile11.phpt:1.4 Sat Oct 29 12:12:57 2005
+++ php-src/ext/simplexml/tests/profile11.phpt Sun Oct 30 09:00:45 2005
@@ -33,3 +33,17 @@
object(SimpleXMLElement)#%d (0) {
}
===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (1) {
+ [0]=>
+ unicode(5) "Hello"
+}
+object(SimpleXMLElement)#%d (1) {
+ [0]=>
+ unicode(5) "World"
+}
+string(5) "Hello"
+string(5) "World"
+object(SimpleXMLElement)#%d (0) {
+}
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
