From: Antony Dovgal Date: Tue, 11 Jul 2006 12:15:11 +0000 (+0000) Subject: there is no Unicode in 5_2 X-Git-Tag: php-5.2.0RC1~138 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3aaf62d159f4c2075cf1463cb7af5e60ea50d4c0;p=php there is no Unicode in 5_2 --- diff --git a/Zend/tests/bug28444.phpt b/Zend/tests/bug28444.phpt index 3c8cfa6df7..78c08d2fc6 100755 --- a/Zend/tests/bug28444.phpt +++ b/Zend/tests/bug28444.phpt @@ -79,27 +79,3 @@ int(5) Overloaded::__get(z) int(6) ===DONE=== ---UEXPECTF-- -object(Object)#%d (1) { - [u"x"]=> - int(2) -} -int(2) -int(3) -Overloaded::__set(y,3) -int(3) -Overloaded::__get(y) -int(3) -unicode(55) "Object of class Object could not be converted to string" -Overloaded::__set(z,) -object(Object)#%d (1) { - [u"x"]=> - int(4) -} -Overloaded::__get(z) -int(4) -Overloaded::__get(z) -int(5) -Overloaded::__get(z) -int(6) -===DONE=== diff --git a/Zend/tests/bug30791.phpt b/Zend/tests/bug30791.phpt index 0cd0db37ac..556192ad55 100755 --- a/Zend/tests/bug30791.phpt +++ b/Zend/tests/bug30791.phpt @@ -33,12 +33,3 @@ object(a)#2 (1) { ["a"]=> int(4) } ---UEXPECT-- -unicode(50) "Object of class a could not be converted to string" - -unicode(50) "Object of class a could not be converted to string" - -object(a)#2 (1) { - [u"a"]=> - int(4) -} diff --git a/ext/pdo/tests/bug_36428.phpt b/ext/pdo/tests/bug_36428.phpt index 77dcdd0c50..6abba6bd7c 100755 --- a/ext/pdo/tests/bug_36428.phpt +++ b/ext/pdo/tests/bug_36428.phpt @@ -31,12 +31,3 @@ array(1) { } } ===DONE=== ---UEXPECTF-- -array(1) { - [0]=> - object(SimpleXMLElement)#3 (1) { - [u"a"]=> - unicode(3) "xyz" - } -} -===DONE=== diff --git a/ext/pdo/tests/pdo_030.phpt b/ext/pdo/tests/pdo_030.phpt index e9d5475401..854dedc2ca 100755 --- a/ext/pdo/tests/pdo_030.phpt +++ b/ext/pdo/tests/pdo_030.phpt @@ -137,40 +137,3 @@ array(3) { ===DONE=== PDODatabase::__destruct() PDOStatementX::__destruct() ---UEXPECT-- -unicode(11) "PDODatabase" -unicode(12) "PDOStatement" -===QUERY=== -PDODatabase::query() -PDOStatementX::__construct() -PDOStatementX::execute() -unicode(13) "PDOStatementX" -unicode(11) "PDODatabase" -===FOREACH=== -array(3) { - [u"id"]=> - unicode(2) "10" - [u"val"]=> - unicode(3) "Abc" - [u"val2"]=> - unicode(3) "zxy" -} -array(3) { - [u"id"]=> - unicode(2) "20" - [u"val"]=> - unicode(3) "Def" - [u"val2"]=> - unicode(3) "wvu" -} -array(3) { - [u"id"]=> - unicode(2) "30" - [u"val"]=> - unicode(3) "Ghi" - [u"val2"]=> - unicode(3) "tsr" -} -===DONE=== -PDODatabase::__destruct() -PDOStatementX::__destruct() diff --git a/ext/spl/tests/array_022.phpt b/ext/spl/tests/array_022.phpt index 1067b03bf8..9cb2193f10 100755 --- a/ext/spl/tests/array_022.phpt +++ b/ext/spl/tests/array_022.phpt @@ -70,27 +70,3 @@ object(MyArrayIterator)#%d (2) { string(3) "Foo" } ===DONE=== ---UEXPECTF-- -==ArrayObject=== -object(MyArrayObject)#%d (1) { - [u"bar"]=> - unicode(3) "baz" -} -object(MyArrayObject)#%d (2) { - [u"bar"]=> - unicode(3) "baz" - [u"baz"]=> - unicode(3) "Foo" -} -==ArrayIterator=== -object(MyArrayIterator)#%d (1) { - [u"bar"]=> - unicode(3) "baz" -} -object(MyArrayIterator)#%d (2) { - [u"bar"]=> - unicode(3) "baz" - [u"baz"]=> - unicode(3) "Foo" -} -===DONE=== diff --git a/ext/spl/tests/iterator_027.phpt b/ext/spl/tests/iterator_027.phpt index 633c8fb0ab..601515e8fd 100755 --- a/ext/spl/tests/iterator_027.phpt +++ b/ext/spl/tests/iterator_027.phpt @@ -83,31 +83,3 @@ bool(false) bool(false) bool(false) ===DONE=== ---UEXPECT-- -0=>1 -1=>2 -0=>31 -1=>32 -0=>331 -3=>4 -===CHECK=== -int(0) -int(331) -int(1) -int(32) -int(3) -int(4) -unicode(3) "foo" -unicode(3) "bar" -unicode(2) "25" -bool(false) -bool(true) -bool(false) -bool(true) -bool(false) -===REWIND=== -bool(true) -bool(false) -bool(false) -bool(false) -===DONE=== diff --git a/ext/spl/tests/iterator_038.phpt b/ext/spl/tests/iterator_038.phpt index bc39a83c8b..71f911c57a 100755 --- a/ext/spl/tests/iterator_038.phpt +++ b/ext/spl/tests/iterator_038.phpt @@ -19,9 +19,3 @@ string(5) "Hello" int(1) string(5) "World" ===DONE=== ---UEXPECT-- -int(0) -unicode(5) "Hello" -int(1) -unicode(5) "World" -===DONE=== diff --git a/ext/spl/tests/iterator_045.phpt b/ext/spl/tests/iterator_045.phpt index 34dcfa78d1..ce29349cfb 100755 --- a/ext/spl/tests/iterator_045.phpt +++ b/ext/spl/tests/iterator_045.phpt @@ -169,76 +169,3 @@ array(2) { string(6) "FooBar" } ===DONE=== ---UEXPECTF-- -Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct) -Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct) - -Warning: CachingIterator::offsetSet() expects exactly 2 parameters, 0 given in %siterator_045.php on line %d -NULL - -Warning: CachingIterator::offsetSet() expects exactly 2 parameters, 1 given in %siterator_045.php on line %d -NULL - -Warning: CachingIterator::offsetUnset() expects exactly 1 parameter, 0 given in %siterator_045.php on line %d -NULL -MyCachingIterator::testSet() -set(0,25) -set(1,42) -set(3,FooBar) -MyCachingIterator::show() -array(3) { - [0]=> - int(25) - [1]=> - int(42) - [3]=> - unicode(6) "FooBar" -} -MyCachingIterator::testUnset() -unset(0) -unset(2) -MyCachingIterator::show() -array(2) { - [1]=> - int(42) - [3]=> - unicode(6) "FooBar" -} -MyCachingIterator::fill() -MyCachingIterator::show() -array(4) { - [0]=> - int(0) - [1]=> - int(1) - [2]=> - int(2) - [3]=> - int(3) -} -MyCachingIterator::testSet() -set(0,25) -set(1,42) -set(3,FooBar) -MyCachingIterator::show() -array(4) { - [0]=> - int(25) - [1]=> - int(42) - [2]=> - int(2) - [3]=> - unicode(6) "FooBar" -} -MyCachingIterator::testUnset() -unset(0) -unset(2) -MyCachingIterator::show() -array(2) { - [1]=> - int(42) - [3]=> - unicode(6) "FooBar" -} -===DONE=== diff --git a/ext/spl/tests/iterator_046.phpt b/ext/spl/tests/iterator_046.phpt index 35736c4110..34d9c027b6 100755 --- a/ext/spl/tests/iterator_046.phpt +++ b/ext/spl/tests/iterator_046.phpt @@ -51,10 +51,3 @@ string(1) "0" string(3) "foo" string(3) "bar" ===DONE=== ---UEXPECTF-- -MyCachingIterator::fill() -MyCachingIterator::show() -unicode(1) "0" -unicode(3) "foo" -unicode(3) "bar" -===DONE=== diff --git a/ext/spl/tests/iterator_048.phpt b/ext/spl/tests/iterator_048.phpt index feea20461a..8ad4287809 100755 --- a/ext/spl/tests/iterator_048.phpt +++ b/ext/spl/tests/iterator_048.phpt @@ -36,9 +36,3 @@ string(3) "Bar" int(2) string(6) "FooBar" ===DONE=== ---UEXPECTF-- -int(0) -unicode(3) "Bar" -int(2) -unicode(6) "FooBar" -===DONE=== diff --git a/ext/wddx/tests/bug37587.phpt b/ext/wddx/tests/bug37587.phpt index 2b5d5f3994..5361d38dae 100755 --- a/ext/wddx/tests/bug37587.phpt +++ b/ext/wddx/tests/bug37587.phpt @@ -32,12 +32,3 @@ array(1) { } } ===DONE=== ---UEXPECT-- -array(1) { - [0]=> - array(1) { - [u"test"]=> - string(11) "Hello World" - } -} -===DONE=== diff --git a/tests/classes/tostring_001.phpt b/tests/classes/tostring_001.phpt index a3b2cea194..53144ca207 100755 --- a/tests/classes/tostring_001.phpt +++ b/tests/classes/tostring_001.phpt @@ -128,57 +128,3 @@ object(test3)#%d (0) { test3::__toString() string(53) "Method test3::__toString() must return a string value" ====DONE==== ---UEXPECTF-- -====test1==== -test1 Object -( -) -unicode(54) "Object of class test1 could not be converted to string" -unicode(0) "" -object(test1)#%d (0) { -} -====test2==== -test2 Object -( -) -test2::__toString() -Converted -object(test2)#%d (0) { -} -====test3==== -test2::__toString() -Converted -====test4==== -test2::__toString() -string:Converted -====test5==== -test2::__toString() -1Converted -1test2::__toString() -Converted -====test6==== -test2::__toString() -test2::__toString() -Converted -Converted -test2::__toString() -Converted -test2::__toString() -Converted -====test7==== -test2::__toString() -unicode(19) "Illegal offset type" -====test8==== -test2::__toString() -unicode(9) "Converted" -test2::__toString() -unicode(9) "Converted" -====test9==== -test2::__toString() -Converted -====test10==== -object(test3)#%d (0) { -} -test3::__toString() -unicode(53) "Method test3::__toString() must return a string value" -====DONE====