tony2001 Tue Sep 19 12:01:19 2006 UTC
Modified files:
/php-src/ext/spl/tests iterator_006.phpt iterator_050.phpt
iterator_051.phpt iterator_052.phpt
iterator_053.phpt iterator_054.phpt
iterator_055.phpt sxe_001.phpt sxe_002.phpt
sxe_003.phpt sxe_004.phpt sxe_005.phpt
Log:
fix spl tests
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/iterator_006.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/iterator_006.phpt
diff -u php-src/ext/spl/tests/iterator_006.phpt:1.2
php-src/ext/spl/tests/iterator_006.phpt:1.3
--- php-src/ext/spl/tests/iterator_006.phpt:1.2 Tue Jun 28 10:17:01 2005
+++ php-src/ext/spl/tests/iterator_006.phpt Tue Sep 19 12:01:18 2006
@@ -5,7 +5,7 @@
--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/spl/tests/iterator_050.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/iterator_050.phpt
diff -u php-src/ext/spl/tests/iterator_050.phpt:1.2
php-src/ext/spl/tests/iterator_050.phpt:1.3
--- php-src/ext/spl/tests/iterator_050.phpt:1.2 Thu Jul 20 22:35:44 2006
+++ php-src/ext/spl/tests/iterator_050.phpt Tue Sep 19 12:01:18 2006
@@ -33,41 +33,41 @@
int(1)
array(3) {
[0]=>
- string(3) "1,2"
+ %s(3) "1,2"
[1]=>
- string(1) "1"
+ %s(1) "1"
[2]=>
- string(1) "2"
+ %s(1) "2"
}
int(2)
array(3) {
[0]=>
- string(3) "1,2"
+ %s(3) "1,2"
[1]=>
- string(1) "1"
+ %s(1) "1"
[2]=>
- string(1) "2"
+ %s(1) "2"
}
int(0)
array(2) {
[0]=>
- string(1) "1"
+ %s(1) "1"
[1]=>
- string(1) "1"
+ %s(1) "1"
}
int(1)
array(2) {
[0]=>
- string(1) "1"
+ %s(1) "1"
[1]=>
- string(1) "1"
+ %s(1) "1"
}
int(2)
array(2) {
[0]=>
- string(1) "1"
+ %s(1) "1"
[1]=>
- string(1) "1"
+ %s(1) "1"
}
object(ArrayIterator)#%d (9) {
[0]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/iterator_051.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/iterator_051.phpt
diff -u php-src/ext/spl/tests/iterator_051.phpt:1.2
php-src/ext/spl/tests/iterator_051.phpt:1.3
--- php-src/ext/spl/tests/iterator_051.phpt:1.2 Thu Jul 20 22:35:44 2006
+++ php-src/ext/spl/tests/iterator_051.phpt Tue Sep 19 12:01:18 2006
@@ -97,50 +97,50 @@
unicode(3) "1,2"
array(3) {
[0]=>
- string(3) "1,2"
+ unicode(3) "1,2"
[1]=>
- string(1) "1"
+ unicode(1) "1"
[2]=>
- string(1) "2"
+ unicode(1) "2"
}
unicode(5) "1,2,3"
array(3) {
[0]=>
- string(3) "1,2"
+ unicode(3) "1,2"
[1]=>
- string(1) "1"
+ unicode(1) "1"
[2]=>
- string(1) "2"
+ unicode(1) "2"
}
int(1)
array(2) {
[0]=>
- string(1) "1"
+ unicode(1) "1"
[1]=>
- string(1) "1"
+ unicode(1) "1"
}
unicode(3) "1,2"
array(2) {
[0]=>
- string(1) "1"
+ unicode(1) "1"
[1]=>
- string(1) "1"
+ unicode(1) "1"
}
unicode(5) "1,2,3"
array(2) {
[0]=>
- string(1) "1"
+ unicode(1) "1"
[1]=>
- string(1) "1"
+ unicode(1) "1"
}
int(0)
array(2) {
[0]=>
- string(1) "0"
+ unicode(1) "0"
[1]=>
- string(1) "0"
+ unicode(1) "0"
}
-object(ArrayIterator)#%d (7) {
+object(ArrayIterator)#1 (7) {
[1]=>
int(0)
[u"1,2"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/iterator_052.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/spl/tests/iterator_052.phpt
diff -u php-src/ext/spl/tests/iterator_052.phpt:1.3
php-src/ext/spl/tests/iterator_052.phpt:1.4
--- php-src/ext/spl/tests/iterator_052.phpt:1.3 Thu Jul 20 22:35:44 2006
+++ php-src/ext/spl/tests/iterator_052.phpt Tue Sep 19 12:01:18 2006
@@ -312,3 +312,269 @@
%s(2) ",,"
}
===DONE===
+--UEXPECTF--
+bool(true)
+int(0)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(1)
+array(3) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(3) "1,2"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "1"
+ }
+ [2]=>
+ array(1) {
+ [0]=>
+ unicode(1) "2"
+ }
+}
+bool(true)
+int(2)
+array(3) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(3) "1,2"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "1"
+ }
+ [2]=>
+ array(1) {
+ [0]=>
+ unicode(1) "2"
+ }
+}
+bool(true)
+int(3)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(4)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(5)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(6)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(7)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(8)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(0)
+array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(1) "1"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "1"
+ }
+}
+bool(true)
+int(1)
+array(2) {
+ [0]=>
+ array(2) {
+ [0]=>
+ unicode(1) "1"
+ [1]=>
+ unicode(1) "2"
+ }
+ [1]=>
+ array(2) {
+ [0]=>
+ unicode(1) "1"
+ [1]=>
+ unicode(1) "2"
+ }
+}
+bool(true)
+int(2)
+array(2) {
+ [0]=>
+ array(3) {
+ [0]=>
+ unicode(1) "1"
+ [1]=>
+ unicode(1) "2"
+ [2]=>
+ unicode(1) "3"
+ }
+ [1]=>
+ array(3) {
+ [0]=>
+ unicode(1) "1"
+ [1]=>
+ unicode(1) "2"
+ [2]=>
+ unicode(1) "3"
+ }
+}
+bool(true)
+int(3)
+array(2) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+}
+bool(true)
+int(4)
+array(2) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+}
+bool(true)
+int(5)
+array(2) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+}
+bool(true)
+int(6)
+array(2) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+}
+bool(true)
+int(7)
+array(2) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+}
+bool(true)
+int(8)
+array(2) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+}
+object(ArrayIterator)#%d (9) {
+ [0]=>
+ unicode(1) "1"
+ [1]=>
+ unicode(3) "1,2"
+ [2]=>
+ unicode(5) "1,2,3"
+ [3]=>
+ unicode(0) ""
+ [4]=>
+ NULL
+ [5]=>
+ array(0) {
+ }
+ [6]=>
+ unicode(6) "FooBar"
+ [7]=>
+ unicode(1) ","
+ [8]=>
+ unicode(2) ",,"
+}
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/iterator_053.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/spl/tests/iterator_053.phpt
diff -u php-src/ext/spl/tests/iterator_053.phpt:1.3
php-src/ext/spl/tests/iterator_053.phpt:1.4
--- php-src/ext/spl/tests/iterator_053.phpt:1.3 Thu Jul 20 22:35:44 2006
+++ php-src/ext/spl/tests/iterator_053.phpt Tue Sep 19 12:01:18 2006
@@ -312,3 +312,269 @@
%s(2) ",,"
}
===DONE===
+--UEXPECTF--
+bool(true)
+int(0)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(1)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(2)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(3)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(4)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(5)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(6)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(7)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(8)
+array(3) {
+ [0]=>
+ array(0) {
+ }
+ [1]=>
+ array(0) {
+ }
+ [2]=>
+ array(0) {
+ }
+}
+bool(true)
+int(0)
+array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(1) "0"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "0"
+ }
+}
+bool(true)
+int(1)
+array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(1) "1"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "1"
+ }
+}
+bool(true)
+int(2)
+array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(1) "2"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "2"
+ }
+}
+bool(true)
+int(3)
+array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(1) "3"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "3"
+ }
+}
+bool(true)
+int(4)
+array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(1) "4"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "4"
+ }
+}
+bool(true)
+int(5)
+array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(1) "5"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "5"
+ }
+}
+bool(true)
+int(6)
+array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(1) "6"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "6"
+ }
+}
+bool(true)
+int(7)
+array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(1) "7"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "7"
+ }
+}
+bool(true)
+int(8)
+array(2) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(1) "8"
+ }
+ [1]=>
+ array(1) {
+ [0]=>
+ unicode(1) "8"
+ }
+}
+object(ArrayIterator)#%d (9) {
+ [0]=>
+ unicode(1) "1"
+ [1]=>
+ unicode(3) "1,2"
+ [2]=>
+ unicode(5) "1,2,3"
+ [3]=>
+ unicode(0) ""
+ [4]=>
+ NULL
+ [5]=>
+ array(0) {
+ }
+ [6]=>
+ unicode(6) "FooBar"
+ [7]=>
+ unicode(1) ","
+ [8]=>
+ unicode(2) ",,"
+}
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/iterator_054.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/iterator_054.phpt
diff -u php-src/ext/spl/tests/iterator_054.phpt:1.2
php-src/ext/spl/tests/iterator_054.phpt:1.3
--- php-src/ext/spl/tests/iterator_054.phpt:1.2 Thu Jul 20 22:35:44 2006
+++ php-src/ext/spl/tests/iterator_054.phpt Tue Sep 19 12:01:18 2006
@@ -82,3 +82,58 @@
%s(2) ",,"
}
===DONE===
+--UEXPECTF--
+int(1)
+array(2) {
+ [0]=>
+ unicode(1) "1"
+ [1]=>
+ unicode(1) "2"
+}
+int(2)
+array(3) {
+ [0]=>
+ unicode(1) "1"
+ [1]=>
+ unicode(1) "2"
+ [2]=>
+ unicode(1) "3"
+}
+int(7)
+array(2) {
+ [0]=>
+ unicode(0) ""
+ [1]=>
+ unicode(0) ""
+}
+int(8)
+array(3) {
+ [0]=>
+ unicode(0) ""
+ [1]=>
+ unicode(0) ""
+ [2]=>
+ unicode(0) ""
+}
+object(ArrayIterator)#%d (9) {
+ [0]=>
+ unicode(1) "1"
+ [1]=>
+ unicode(3) "1,2"
+ [2]=>
+ unicode(5) "1,2,3"
+ [3]=>
+ unicode(0) ""
+ [4]=>
+ NULL
+ [5]=>
+ array(0) {
+ }
+ [6]=>
+ unicode(6) "FooBar"
+ [7]=>
+ unicode(1) ","
+ [8]=>
+ unicode(2) ",,"
+}
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/iterator_055.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/iterator_055.phpt
diff -u php-src/ext/spl/tests/iterator_055.phpt:1.2
php-src/ext/spl/tests/iterator_055.phpt:1.3
--- php-src/ext/spl/tests/iterator_055.phpt:1.2 Thu Jul 20 22:35:44 2006
+++ php-src/ext/spl/tests/iterator_055.phpt Tue Sep 19 12:01:18 2006
@@ -63,16 +63,16 @@
unicode(3) "1,2"
array(2) {
[0]=>
- string(0) ""
+ unicode(0) ""
[1]=>
- string(0) ""
+ unicode(0) ""
}
unicode(5) "1,2,3"
array(2) {
[0]=>
- string(0) ""
+ unicode(0) ""
[1]=>
- string(2) ",3"
+ unicode(2) ",3"
}
object(ArrayIterator)#%d (7) {
[1]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/sxe_001.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/spl/tests/sxe_001.phpt
diff -u php-src/ext/spl/tests/sxe_001.phpt:1.5
php-src/ext/spl/tests/sxe_001.phpt:1.6
--- php-src/ext/spl/tests/sxe_001.phpt:1.5 Wed Dec 7 16:52:13 2005
+++ php-src/ext/spl/tests/sxe_001.phpt Tue Sep 19 12:01:18 2006
@@ -26,7 +26,7 @@
</sxe>
EOF;
-var_dump(simplexml_load_string($xml, 'SimpleXMLIterator'));
+var_dump(simplexml_load_string((binary)$xml, 'SimpleXMLIterator'));
?>
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/sxe_002.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/spl/tests/sxe_002.phpt
diff -u php-src/ext/spl/tests/sxe_002.phpt:1.3
php-src/ext/spl/tests/sxe_002.phpt:1.4
--- php-src/ext/spl/tests/sxe_002.phpt:1.3 Tue Aug 16 15:09:46 2005
+++ php-src/ext/spl/tests/sxe_002.phpt Tue Sep 19 12:01:18 2006
@@ -37,7 +37,7 @@
</sxe>
EOF;
-$sxe = simplexml_load_string($xml, 'SimpleXMLIterator');
+$sxe = simplexml_load_string((binary)$xml, 'SimpleXMLIterator');
foreach(new RecursiveIteratorIterator($sxe, 1) as $name => $data) {
var_dump($name);
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/sxe_003.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/spl/tests/sxe_003.phpt
diff -u php-src/ext/spl/tests/sxe_003.phpt:1.4
php-src/ext/spl/tests/sxe_003.phpt:1.5
--- php-src/ext/spl/tests/sxe_003.phpt:1.4 Tue Aug 16 15:09:46 2005
+++ php-src/ext/spl/tests/sxe_003.phpt Tue Sep 19 12:01:18 2006
@@ -37,7 +37,7 @@
</sxe>
EOF;
-$sxe = simplexml_load_string($xml, 'SimpleXMLIterator');
+$sxe = simplexml_load_string((binary)$xml, 'SimpleXMLIterator');
foreach($sxe->getChildren() as $name => $data) {
var_dump($name);
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/sxe_004.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/spl/tests/sxe_004.phpt
diff -u php-src/ext/spl/tests/sxe_004.phpt:1.4
php-src/ext/spl/tests/sxe_004.phpt:1.5
--- php-src/ext/spl/tests/sxe_004.phpt:1.4 Thu Sep 15 03:31:37 2005
+++ php-src/ext/spl/tests/sxe_004.phpt Tue Sep 19 12:01:18 2006
@@ -76,7 +76,7 @@
}
}
-$sxe = new SXETest($xml);
+$sxe = new SXETest((binary)$xml);
$rit = new RecursiveIteratorIterator($sxe,
RecursiveIteratorIterator::SELF_FIRST);
foreach($rit as $data) {
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/sxe_005.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/spl/tests/sxe_005.phpt
diff -u php-src/ext/spl/tests/sxe_005.phpt:1.1
php-src/ext/spl/tests/sxe_005.phpt:1.2
--- php-src/ext/spl/tests/sxe_005.phpt:1.1 Mon Oct 31 20:29:34 2005
+++ php-src/ext/spl/tests/sxe_005.phpt Tue Sep 19 12:01:18 2006
@@ -28,7 +28,7 @@
}
}
-$sxe = new SXETest($xml);
+$sxe = new SXETest((binary)$xml);
var_dump(count($sxe));
var_dump(count($sxe->elem1));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
