From: Felipe Pena Date: Tue, 27 May 2008 02:55:52 +0000 (+0000) Subject: - Removed UEXPECT(F) X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1660 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77080b64d9c63946daa31c3566d87a23bd9694ce;p=php - Removed UEXPECT(F) --- diff --git a/ext/spl/tests/array_001.phpt b/ext/spl/tests/array_001.phpt index 3fbb56ef16..3ba33ba746 100755 --- a/ext/spl/tests/array_001.phpt +++ b/ext/spl/tests/array_001.phpt @@ -36,82 +36,6 @@ var_dump($ar); ===DONE=== --EXPECTF-- -object(ArrayObject)#1 (1) { - ["storage":"ArrayObject":private]=> - array(2) { - [0]=> - int(0) - [1]=> - int(1) - } -} -int(2) -int(3) -array(6) { - [0]=> - int(0) - [1]=> - int(1) - [2]=> - int(2) - [3]=> - int(3) - [4]=> - int(4) - [5]=> - int(5) -} -string(1) "a" -object(ArrayObject)#1 (1) { - ["storage":"ArrayObject":private]=> - array(5) { - [0]=> - int(0) - [1]=> - int(1) - [2]=> - int(2) - [3]=> - int(3) - ["a"]=> - string(1) "a" - } -} -int(0) - -Notice: Undefined offset: 6 in %sarray_001.php on line %d -NULL - -Notice: Undefined index: b in %sarray_001.php on line %d -NULL - -Notice: Undefined offset: 7 in %sarray_001.php on line %d - -Notice: Undefined index: c in %sarray_001.php on line %d -object(ArrayObject)#1 (1) { - ["storage":"ArrayObject":private]=> - array(2) { - [0]=> - int(0) - [2]=> - int(2) - } -} -object(ArrayObject)#1 (1) { - ["storage":"ArrayObject":private]=> - array(4) { - [0]=> - int(0) - [2]=> - int(2) - [4]=> - string(1) "3" - [5]=> - int(4) - } -} -===DONE=== ---UEXPECTF-- object(ArrayObject)#1 (1) { [u"storage":u"ArrayObject":private]=> array(2) { diff --git a/ext/spl/tests/array_002.phpt b/ext/spl/tests/array_002.phpt index 852e8d6910..2a1d2ea95a 100755 --- a/ext/spl/tests/array_002.phpt +++ b/ext/spl/tests/array_002.phpt @@ -20,26 +20,6 @@ var_dump($arrayObject); ===DONE=== --EXPECTF-- -object(ArrayObject)#%d (1) { - ["storage":"ArrayObject":private]=> - object(ArrayObject)#1 (1) { - ["storage":"ArrayObject":private]=> - array(5) { - [1]=> - string(3) "one" - [2]=> - string(3) "two" - [3]=> - string(5) "three" - [4]=> - string(4) "four" - [5]=> - string(4) "five" - } - } -} -===DONE=== ---UEXPECTF-- object(ArrayObject)#%d (1) { [u"storage":u"ArrayObject":private]=> object(ArrayObject)#1 (1) { diff --git a/ext/spl/tests/array_010.phpt b/ext/spl/tests/array_010.phpt index ee55b9220b..c738230f52 100755 --- a/ext/spl/tests/array_010.phpt +++ b/ext/spl/tests/array_010.phpt @@ -64,85 +64,6 @@ var_dump($obj->getArrayCopy()); ===DONE=== --EXPECTF-- -array(4) { - [0]=> - string(3) "1st" - [1]=> - int(1) - [2]=> - string(3) "3rd" - ["4th"]=> - int(4) -} -===EMPTY=== -bool(false) -bool(false) -bool(false) -bool(false) -bool(true) -bool(true) -===isset=== -bool(true) -bool(true) -bool(true) -bool(true) -bool(false) -bool(false) -===offsetGet=== -string(3) "1st" -int(1) -string(3) "3rd" -int(4) - -Notice: Undefined index: 5th in %sarray_010.php on line %d -NULL - -Notice: Undefined offset: 6 in %sarray_010.php on line %d -NULL -===offsetSet=== -WRITE 1 -string(9) "Changed 1" -WRITE 2 -string(11) "Changed 4th" -WRITE 3 -string(9) "Added 5th" -WRITE 4 -string(7) "Added 6" -string(3) "1st" -string(3) "3rd" -string(9) "changed 6" -string(9) "changed 6" -===unset=== -array(6) { - [0]=> - string(3) "1st" - [1]=> - string(9) "Changed 1" - [2]=> - string(3) "3rd" - ["4th"]=> - string(11) "Changed 4th" - ["5th"]=> - string(9) "Added 5th" - [6]=> - string(9) "changed 6" -} - -Notice: Undefined offset: 7 in %sarray_010.php on line %d - -Notice: Undefined index: 8th in %sarray_010.php on line %d -array(4) { - [0]=> - string(3) "1st" - [1]=> - string(9) "Changed 1" - ["5th"]=> - string(9) "Added 5th" - [6]=> - string(9) "changed 6" -} -===DONE=== ---UEXPECTF-- array(4) { [0]=> unicode(3) "1st" diff --git a/ext/spl/tests/array_011.phpt b/ext/spl/tests/array_011.phpt index 9878f8213f..b3b5ddc2d4 100755 --- a/ext/spl/tests/array_011.phpt +++ b/ext/spl/tests/array_011.phpt @@ -14,26 +14,6 @@ foreach (new LimitIterator(new ArrayIterator($a), 1, 3) as $k => $v) ===DONE=== --EXPECT-- -array(2) { - [0]=> - string(3) "one" - [1]=> - int(1) -} -array(2) { - [0]=> - string(3) "two" - [1]=> - int(2) -} -array(2) { - [0]=> - string(5) "three" - [1]=> - int(3) -} -===DONE=== ---UEXPECT-- array(2) { [0]=> unicode(3) "one" diff --git a/ext/spl/tests/array_017.phpt b/ext/spl/tests/array_017.phpt index fda8489cda..9ec17e34dd 100755 --- a/ext/spl/tests/array_017.phpt +++ b/ext/spl/tests/array_017.phpt @@ -135,691 +135,6 @@ ArrayObjectEx::__construct() ===CHECK=== ArrayObjectEx::setFlags(0) ArrayObjectEx::dump() -array(3) { - ["Flags"]=> - int(0) - ["OVars"]=> - array(2) { - ["a"]=> - int(25) - ["pub1"]=> - int(42) - } - ["$this"]=> - object(ArrayObjectEx)#%d (6) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - ["storage":"ArrayObject":private]=> - array(3) { - [0]=> - int(1) - ["a"]=> - int(25) - ["pub1"]=> - int(42) - } - } -} -ArrayObjectEx::show() -ArrayObjectEx::getIterator() -ArrayIteratorEx::__construct() -ArrayIteratorEx::dump() -array(3) { - ["Flags"]=> - int(0) - ["OVars"]=> - array(2) { - ["a"]=> - int(25) - ["pub1"]=> - int(42) - } - ["$this"]=> - object(ArrayIteratorEx)#%d (6) { - ["pub2"]=> - int(1) - ["pro2":protected]=> - int(2) - ["pri2":"ArrayIteratorEx":private]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - ["storage":"ArrayIterator":private]=> - object(ArrayObjectEx)#%d (6) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - ["storage":"ArrayObject":private]=> - array(3) { - [0]=> - int(1) - ["a"]=> - int(25) - ["pub1"]=> - int(42) - } - } - } -} -array(1) { - [0]=> - int(1) -} -array(1) { - ["a"]=> - int(25) -} -array(1) { - ["pub1"]=> - int(42) -} -===FOREACH=== -ArrayObjectEx::getIterator() -ArrayIteratorEx::__construct() -ArrayIteratorEx::dump() -array(3) { - ["Flags"]=> - int(0) - ["OVars"]=> - array(2) { - ["a"]=> - int(25) - ["pub1"]=> - int(42) - } - ["$this"]=> - object(ArrayIteratorEx)#%d (6) { - ["pub2"]=> - int(1) - ["pro2":protected]=> - int(2) - ["pri2":"ArrayIteratorEx":private]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - ["storage":"ArrayIterator":private]=> - object(ArrayObjectEx)#%d (6) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - ["storage":"ArrayObject":private]=> - array(3) { - [0]=> - int(1) - ["a"]=> - int(25) - ["pub1"]=> - int(42) - } - } - } -} -array(1) { - [0]=> - int(1) -} -array(1) { - ["a"]=> - int(25) -} -array(1) { - ["pub1"]=> - int(42) -} -===PROPERTY=== -int(1) -bool(false) -ArrayObjectEx::setFlags(2) -int(1) -bool(true) -int(1) -bool(false) -ArrayIteratorEx::setFlags(2) -int(1) -bool(true) -===CHECK=== -ArrayObjectEx::setFlags(1) -ArrayObjectEx::dump() -array(3) { - ["Flags"]=> - int(1) - ["OVars"]=> - array(5) { - ["pub1"]=> - int(1) - ["pro1"]=> - int(2) - ["pri1"]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } - ["$this"]=> - object(ArrayObjectEx)#%d (6) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - ["storage":"ArrayObject":private]=> - array(3) { - [0]=> - int(1) - ["a"]=> - int(25) - ["pub1"]=> - int(42) - } - } -} -ArrayObjectEx::show() -ArrayObjectEx::getIterator() -ArrayIteratorEx::__construct() -ArrayIteratorEx::dump() -array(3) { - ["Flags"]=> - int(1) - ["OVars"]=> - array(5) { - ["pub2"]=> - int(1) - ["pro2"]=> - int(2) - ["pri2"]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - } - ["$this"]=> - object(ArrayIteratorEx)#%d (6) { - ["pub2"]=> - int(1) - ["pro2":protected]=> - int(2) - ["pri2":"ArrayIteratorEx":private]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - ["storage":"ArrayIterator":private]=> - object(ArrayObjectEx)#%d (6) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - ["storage":"ArrayObject":private]=> - array(3) { - [0]=> - int(1) - ["a"]=> - int(25) - ["pub1"]=> - int(42) - } - } - } -} -array(1) { - [0]=> - int(1) -} -array(1) { - ["a"]=> - int(25) -} -array(1) { - ["pub1"]=> - int(42) -} -===FOREACH=== -ArrayObjectEx::getIterator() -ArrayIteratorEx::__construct() -ArrayIteratorEx::dump() -array(3) { - ["Flags"]=> - int(1) - ["OVars"]=> - array(5) { - ["pub2"]=> - int(1) - ["pro2"]=> - int(2) - ["pri2"]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - } - ["$this"]=> - object(ArrayIteratorEx)#%d (6) { - ["pub2"]=> - int(1) - ["pro2":protected]=> - int(2) - ["pri2":"ArrayIteratorEx":private]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - ["storage":"ArrayIterator":private]=> - object(ArrayObjectEx)#%d (6) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - ["storage":"ArrayObject":private]=> - array(3) { - [0]=> - int(1) - ["a"]=> - int(25) - ["pub1"]=> - int(42) - } - } - } -} -array(1) { - [0]=> - int(1) -} -array(1) { - ["a"]=> - int(25) -} -array(1) { - ["pub1"]=> - int(42) -} -===PROPERTY=== -int(1) -bool(false) -ArrayObjectEx::setFlags(3) -int(1) -bool(true) -int(1) -bool(false) -ArrayIteratorEx::setFlags(3) -int(1) -bool(true) -#####EXCHANGE##### -ArrayObjectEx::exchange() -===CHECK=== -ArrayObjectEx::setFlags(0) -ArrayObjectEx::dump() -array(3) { - ["Flags"]=> - int(0) - ["OVars"]=> - array(5) { - ["pub1"]=> - int(1) - ["pro1"]=> - int(2) - ["pri1"]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } - ["$this"]=> - object(ArrayObjectEx)#%d (5) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } -} -ArrayObjectEx::show() -ArrayObjectEx::getIterator() -ArrayIteratorEx::__construct() -ArrayIteratorEx::dump() -array(3) { - ["Flags"]=> - int(0) - ["OVars"]=> - array(4) { - ["pub1"]=> - int(1) - ["pro1"]=> - int(2) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } - ["$this"]=> - object(ArrayIteratorEx)#%d (6) { - ["pub2"]=> - int(1) - ["pro2":protected]=> - int(2) - ["pri2":"ArrayIteratorEx":private]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - ["storage":"ArrayIterator":private]=> - object(ArrayObjectEx)#%d (5) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } - } -} -array(1) { - ["pub1"]=> - int(1) -} -array(1) { - ["imp1"]=> - int(4) -} -array(1) { - ["dyn1"]=> - int(5) -} -===FOREACH=== -ArrayObjectEx::getIterator() -ArrayIteratorEx::__construct() -ArrayIteratorEx::dump() -array(3) { - ["Flags"]=> - int(0) - ["OVars"]=> - array(4) { - ["pub1"]=> - int(1) - ["pro1"]=> - int(2) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } - ["$this"]=> - object(ArrayIteratorEx)#%d (6) { - ["pub2"]=> - int(1) - ["pro2":protected]=> - int(2) - ["pri2":"ArrayIteratorEx":private]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - ["storage":"ArrayIterator":private]=> - object(ArrayObjectEx)#%d (5) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } - } -} -array(1) { - ["pub1"]=> - int(1) -} -array(1) { - ["imp1"]=> - int(4) -} -array(1) { - ["dyn1"]=> - int(5) -} -===PROPERTY=== -int(1) -bool(false) -ArrayObjectEx::setFlags(2) -int(1) -bool(false) -int(1) -bool(false) -ArrayIteratorEx::setFlags(2) -int(1) -bool(true) -===CHECK=== -ArrayObjectEx::setFlags(1) -ArrayObjectEx::dump() -array(3) { - ["Flags"]=> - int(1) - ["OVars"]=> - array(5) { - ["pub1"]=> - int(1) - ["pro1"]=> - int(2) - ["pri1"]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } - ["$this"]=> - object(ArrayObjectEx)#%d (5) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } -} -ArrayObjectEx::show() -ArrayObjectEx::getIterator() -ArrayIteratorEx::__construct() -ArrayIteratorEx::dump() -array(3) { - ["Flags"]=> - int(1) - ["OVars"]=> - array(5) { - ["pub2"]=> - int(1) - ["pro2"]=> - int(2) - ["pri2"]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - } - ["$this"]=> - object(ArrayIteratorEx)#%d (6) { - ["pub2"]=> - int(1) - ["pro2":protected]=> - int(2) - ["pri2":"ArrayIteratorEx":private]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - ["storage":"ArrayIterator":private]=> - object(ArrayObjectEx)#%d (5) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } - } -} -array(1) { - ["pub1"]=> - int(1) -} -array(1) { - ["imp1"]=> - int(4) -} -array(1) { - ["dyn1"]=> - int(5) -} -===FOREACH=== -ArrayObjectEx::getIterator() -ArrayIteratorEx::__construct() -ArrayIteratorEx::dump() -array(3) { - ["Flags"]=> - int(1) - ["OVars"]=> - array(5) { - ["pub2"]=> - int(1) - ["pro2"]=> - int(2) - ["pri2"]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - } - ["$this"]=> - object(ArrayIteratorEx)#%d (6) { - ["pub2"]=> - int(1) - ["pro2":protected]=> - int(2) - ["pri2":"ArrayIteratorEx":private]=> - int(3) - ["imp2"]=> - int(4) - ["dyn2"]=> - int(5) - ["storage":"ArrayIterator":private]=> - object(ArrayObjectEx)#%d (5) { - ["pub1"]=> - int(1) - ["pro1":protected]=> - int(2) - ["pri1":"ArrayObjectEx":private]=> - int(3) - ["imp1"]=> - int(4) - ["dyn1"]=> - int(5) - } - } -} -array(1) { - ["pub1"]=> - int(1) -} -array(1) { - ["imp1"]=> - int(4) -} -array(1) { - ["dyn1"]=> - int(5) -} -===PROPERTY=== -int(1) -bool(false) -ArrayObjectEx::setFlags(3) -int(1) -bool(false) -int(1) -bool(false) -ArrayIteratorEx::setFlags(3) -int(1) -bool(true) -===DONE=== ---UEXPECTF-- -ArrayObjectEx::__construct() -===CHECK=== -ArrayObjectEx::setFlags(0) -ArrayObjectEx::dump() array(3) { [u"Flags"]=> int(0) diff --git a/ext/spl/tests/array_018.phpt b/ext/spl/tests/array_018.phpt index ae506b057b..89f4477919 100755 --- a/ext/spl/tests/array_018.phpt +++ b/ext/spl/tests/array_018.phpt @@ -31,20 +31,6 @@ var_dump($foo); ?> ===DONE=== --EXPECTF-- -string(44) "An offset must not begin with \0 or be empty" -object(ArrayObject)#%d (1) { - ["storage":"ArrayObject":private]=> - array(0) { - } -} -string(44) "An offset must not begin with \0 or be empty" -object(ArrayObject)#%d (1) { - ["storage":"ArrayObject":private]=> - array(0) { - } -} -===DONE=== ---UEXPECTF-- unicode(44) "An offset must not begin with \0 or be empty" object(ArrayObject)#%d (1) { [u"storage":u"ArrayObject":private]=> diff --git a/ext/spl/tests/array_022.phpt b/ext/spl/tests/array_022.phpt index b9d2396ef5..5364a42baa 100755 --- a/ext/spl/tests/array_022.phpt +++ b/ext/spl/tests/array_022.phpt @@ -46,40 +46,6 @@ var_dump($b); ===DONE=== --EXPECTF-- ==ArrayObject=== -object(MyArrayObject)#%d (1) { - ["bar"]=> - string(3) "baz" -} -object(MyArrayObject)#%d (3) { - ["bar"]=> - string(3) "baz" - ["baz"]=> - string(3) "Foo" - ["storage":"ArrayObject":private]=> - array(1) { - ["bar"]=> - string(3) "baz" - } -} -==ArrayIterator=== -object(MyArrayIterator)#%d (1) { - ["bar"]=> - string(3) "baz" -} -object(MyArrayIterator)#%d (3) { - ["bar"]=> - string(3) "baz" - ["baz"]=> - string(3) "Foo" - ["storage":"ArrayIterator":private]=> - object(MyArrayIterator)#%d (1) { - ["bar"]=> - string(3) "baz" - } -} -===DONE=== ---UEXPECTF-- -==ArrayObject=== object(MyArrayObject)#%d (1) { [u"bar"]=> unicode(3) "baz" diff --git a/ext/spl/tests/array_023.phpt b/ext/spl/tests/array_023.phpt index a3cfdc5245..ae5ffd06d9 100644 --- a/ext/spl/tests/array_023.phpt +++ b/ext/spl/tests/array_023.phpt @@ -37,55 +37,6 @@ var_dump($a->var); ?> --EXPECT-- -object(Name)#1 (4) { - ["var"]=> - string(1) "a" - ["bar":protected]=> - string(1) "b" - ["foo":"Name":private]=> - string(1) "c" - ["storage":"ArrayObject":private]=> - array(0) { - } -} -string(1) "a" -object(Name)#2 (4) { - ["var"]=> - string(1) "a" - ["bar":protected]=> - string(1) "b" - ["foo":"Name":private]=> - string(1) "c" - ["storage":"ArrayObject":private]=> - array(0) { - } -} -string(1) "a" -object(Bla)#1 (4) { - ["var"]=> - string(3) "aaa" - ["bar":protected]=> - string(3) "bbb" - ["foo":"Bla":private]=> - string(3) "ccc" - ["storage":"ArrayObject":private]=> - array(0) { - } -} -string(3) "aaa" -object(Bla)#2 (4) { - ["var"]=> - string(3) "aaa" - ["bar":protected]=> - string(3) "bbb" - ["foo":"Bla":private]=> - string(3) "ccc" - ["storage":"ArrayObject":private]=> - array(0) { - } -} -string(3) "aaa" ---UEXPECT-- object(Name)#1 (4) { [u"var"]=> unicode(1) "a" diff --git a/ext/spl/tests/bug31926.phpt b/ext/spl/tests/bug31926.phpt index bcc9ed3d2c..4c393c5c5b 100755 --- a/ext/spl/tests/bug31926.phpt +++ b/ext/spl/tests/bug31926.phpt @@ -13,7 +13,4 @@ foreach($it as $key => $val) { ?> --EXPECT-- int(0) -string(5) "world" ---UEXPECT-- -int(0) unicode(5) "world" diff --git a/ext/spl/tests/bug32134.phpt b/ext/spl/tests/bug32134.phpt index 84001984ac..eb65e40f5d 100755 --- a/ext/spl/tests/bug32134.phpt +++ b/ext/spl/tests/bug32134.phpt @@ -41,14 +41,6 @@ var_dump($myArray['two']); --EXPECT-- myArray::offsetSet(one,one) myArray::offsetGet(one) -string(3) "one" -myArray::offsetSet(two,two) -myArray::offsetGet(two) -string(3) "two" -===DONE=== ---UEXPECT-- -myArray::offsetSet(one,one) -myArray::offsetGet(one) unicode(3) "one" myArray::offsetSet(two,two) myArray::offsetGet(two) diff --git a/ext/spl/tests/bug33136.phpt b/ext/spl/tests/bug33136.phpt index 8429e75176..7391bab66c 100755 --- a/ext/spl/tests/bug33136.phpt +++ b/ext/spl/tests/bug33136.phpt @@ -53,36 +53,6 @@ Initiate Obj Assign values Collection::offsetSet(NULL,foo) Collection::offsetGet(0) -string(3) "foo" -Collection::offsetSet(NULL,bar) -Collection::offsetGet(0) -string(3) "foo" -Collection::offsetGet(1) -string(3) "bar" -Collection::offsetSet(foo,baz) -Collection::offsetGet(foo) -string(3) "baz" -Collection Object -( - [data:Collection:private] => Array - ( - ) - - [storage:ArrayObject:private] => Array - ( - [0] => foo - [1] => bar - [foo] => baz - ) - -) -int(3) -===DONE=== ---UEXPECT-- -Initiate Obj -Assign values -Collection::offsetSet(NULL,foo) -Collection::offsetGet(0) unicode(3) "foo" Collection::offsetSet(NULL,bar) Collection::offsetGet(0) diff --git a/ext/spl/tests/bug36258.phpt b/ext/spl/tests/bug36258.phpt index 920b7dfba8..ca40ac531f 100644 --- a/ext/spl/tests/bug36258.phpt +++ b/ext/spl/tests/bug36258.phpt @@ -14,10 +14,6 @@ foreach ($diriter as $key => $file) { ?> ===DONE=== --EXPECTF-- -string(%d) "%s" -string(%d) "%s" -===DONE=== ---UEXPECTF-- unicode(%d) "%s" unicode(%d) "%s" ===DONE=== diff --git a/ext/spl/tests/bug36287.phpt b/ext/spl/tests/bug36287.phpt index 94fdbe7ead..2d90341340 100755 --- a/ext/spl/tests/bug36287.phpt +++ b/ext/spl/tests/bug36287.phpt @@ -22,16 +22,6 @@ foreach($it as $file) ===DONE=== --EXPECTF-- First -string(%d) "%s" -Second -string(%d) "%s" -First -string(%d) "%s" -Second -string(%d) "%s" -===DONE=== ---UEXPECTF-- -First unicode(%d) "%s" Second unicode(%d) "%s" diff --git a/ext/spl/tests/bug37457.phpt b/ext/spl/tests/bug37457.phpt index 992958bd45..b913ea5af4 100755 --- a/ext/spl/tests/bug37457.phpt +++ b/ext/spl/tests/bug37457.phpt @@ -76,14 +76,5 @@ Collection::valid Collection::current Collection::key TestFilter::accept -string(17) "Failure in Accept" -===DONE=== ---UEXPECTF-- -Collection::__construct -Collection::rewind -Collection::valid -Collection::current -Collection::key -TestFilter::accept unicode(17) "Failure in Accept" ===DONE=== diff --git a/ext/spl/tests/bug41528.phpt b/ext/spl/tests/bug41528.phpt index 9dade28cce..a77dc6375a 100644 --- a/ext/spl/tests/bug41528.phpt +++ b/ext/spl/tests/bug41528.phpt @@ -19,23 +19,6 @@ var_dump($classOne); var_dump($classOne->a); ?> --EXPECT-- -object(ClassOne)#1 (2) { - ["a"]=> - int(1) - ["storage":"ArrayObject":private]=> - array(0) { - } -} -int(1) -object(ClassOne)#2 (2) { - ["a"]=> - int(1) - ["storage":"ArrayObject":private]=> - array(0) { - } -} -int(1) ---UEXPECT-- object(ClassOne)#1 (2) { [u"a"]=> int(1) diff --git a/ext/spl/tests/bug41691.phpt b/ext/spl/tests/bug41691.phpt index 81de4511f6..f92c299269 100644 --- a/ext/spl/tests/bug41691.phpt +++ b/ext/spl/tests/bug41691.phpt @@ -18,16 +18,6 @@ var_dump($a->exchangeArray(array('a'=>1,'b'=>1,'c'=>1))); echo "Done\n"; ?> --EXPECTF-- -array(3) { - ["a"]=> - NULL - ["b"]=> - NULL - ["c"]=> - NULL -} -Done ---UEXPECTF-- array(3) { [u"a"]=> NULL diff --git a/ext/spl/tests/bug41692.phpt b/ext/spl/tests/bug41692.phpt index 1729fd15d3..45ba1c9592 100644 --- a/ext/spl/tests/bug41692.phpt +++ b/ext/spl/tests/bug41692.phpt @@ -21,48 +21,6 @@ var_dump($bar); echo "Done\n"; ?> --EXPECTF-- -object(Bar)#%d (2) { - ["foo":"Bar":private]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["storage":"ArrayObject":private]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} -object(Bar)#%d (2) { - ["foo":"Bar":private]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["storage":"ArrayObject":private]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} -Done ---UEXPECTF-- object(Bar)#%d (2) { [u"foo":u"Bar":private]=> array(3) { diff --git a/ext/spl/tests/bug42654.phpt b/ext/spl/tests/bug42654.phpt index 55089ef28e..0f0e8e0ab3 100755 --- a/ext/spl/tests/bug42654.phpt +++ b/ext/spl/tests/bug42654.phpt @@ -23,141 +23,6 @@ var_dump($copy); ?> --EXPECTF-- update 1 -object(RecursiveArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(3) { - [1]=> - string(4) "val1" - [2]=> - array(2) { - [2]=> - string(4) "val2" - [3]=> - array(1) { - [3]=> - string(4) "val3" - } - } - [4]=> - string(4) "val4" - } -} -object(RecursiveArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(3) { - [1]=> - string(5) "alter" - [2]=> - array(2) { - [2]=> - string(4) "val2" - [3]=> - array(1) { - [3]=> - string(4) "val3" - } - } - [4]=> - string(4) "val4" - } -} -update 2 -object(RecursiveArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(2) { - [2]=> - string(4) "val2" - [3]=> - array(1) { - [3]=> - string(4) "val3" - } - } -} -object(RecursiveArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(2) { - [2]=> - string(5) "alter" - [3]=> - array(1) { - [3]=> - string(4) "val3" - } - } -} -update 3 -object(RecursiveArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(1) { - [3]=> - string(4) "val3" - } -} -object(RecursiveArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(1) { - [3]=> - string(5) "alter" - } -} -update 4 -object(RecursiveArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(3) { - [1]=> - string(5) "alter" - [2]=> - array(2) { - [2]=> - string(4) "val2" - [3]=> - array(1) { - [3]=> - string(4) "val3" - } - } - [4]=> - string(4) "val4" - } -} -object(RecursiveArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(3) { - [1]=> - string(5) "alter" - [2]=> - array(2) { - [2]=> - string(4) "val2" - [3]=> - array(1) { - [3]=> - string(4) "val3" - } - } - [4]=> - string(5) "alter" - } -} -array(3) { - [1]=> - string(5) "alter" - [2]=> - array(2) { - [2]=> - string(4) "val2" - [3]=> - array(1) { - [3]=> - string(4) "val3" - } - } - [4]=> - string(5) "alter" -} ---UEXPECTF-- -update 1 object(RecursiveArrayIterator)#%d (1) { [u"storage":u"ArrayIterator":private]=> array(3) { diff --git a/ext/spl/tests/bug42703.phpt b/ext/spl/tests/bug42703.phpt index 9ef29114cd..09b4531540 100755 --- a/ext/spl/tests/bug42703.phpt +++ b/ext/spl/tests/bug42703.phpt @@ -36,10 +36,6 @@ var_dump($itit->current()); var_dump($itit->key()); ?> --EXPECT-- -string(3) "boo" -NULL -NULL ---UEXPECT-- unicode(3) "boo" NULL NULL diff --git a/ext/spl/tests/fileobject_001.phpt b/ext/spl/tests/fileobject_001.phpt index 298e58920a..92a2fd1118 100755 --- a/ext/spl/tests/fileobject_001.phpt +++ b/ext/spl/tests/fileobject_001.phpt @@ -42,52 +42,6 @@ foreach($o as $n => $l) ===DONE=== --EXPECT-- int(0) -string(2) "0 -" -int(0) -string(2) "0 -" -int(0) -int(1) -string(1) "1" -int(1) -int(0) -string(1) "0" -int(0) -int(4) -string(1) "4" -int(4) -===A=== -int(0) -string(1) "0" -int(1) -string(1) "1" -int(2) -string(1) "2" -int(3) -string(1) "3" -int(4) -string(1) "4" -int(5) -string(1) "5" -int(6) -string(0) "" -===B=== -int(0) -string(1) "0" -int(1) -string(1) "1" -int(2) -string(1) "2" -int(3) -string(1) "3" -int(4) -string(1) "4" -int(5) -string(1) "5" -===DONE=== ---UEXPECT-- -int(0) unicode(2) "0 " int(0) diff --git a/ext/spl/tests/fileobject_002.phpt b/ext/spl/tests/fileobject_002.phpt index 3017b38278..48c455d173 100755 --- a/ext/spl/tests/fileobject_002.phpt +++ b/ext/spl/tests/fileobject_002.phpt @@ -30,100 +30,6 @@ test('fileobject_001b.txt'); ===fileobject_001a.txt=== int(0) int(0) -string(1) "0" -bool(false) -int(1) -string(1) " -" -bool(false) -int(1) -string(1) "1" -bool(false) -int(2) -string(1) " -" -bool(false) -int(2) -string(1) "2" -bool(false) -int(3) -string(1) " -" -bool(false) -int(3) -string(1) "3" -bool(false) -int(4) -string(1) " -" -bool(false) -int(4) -string(1) "4" -bool(false) -int(5) -string(1) " -" -bool(false) -int(5) -string(1) "5" -bool(false) -int(6) -string(1) " -" -bool(false) -===EOF?=== -bool(true) -int(6) -bool(true) -===fileobject_001b.txt=== -int(0) -int(0) -string(1) "0" -bool(false) -int(1) -string(1) " -" -bool(false) -int(1) -string(1) "1" -bool(false) -int(2) -string(1) " -" -bool(false) -int(2) -string(1) "2" -bool(false) -int(3) -string(1) " -" -bool(false) -int(3) -string(1) "3" -bool(false) -int(4) -string(1) " -" -bool(false) -int(4) -string(1) "4" -bool(false) -int(5) -string(1) " -" -bool(false) -int(5) -string(1) "5" -bool(false) -===EOF?=== -bool(true) -int(5) -bool(true) -===DONE=== ---UEXPECT-- -===fileobject_001a.txt=== -int(0) -int(0) unicode(1) "0" bool(false) int(1) diff --git a/ext/spl/tests/fileobject_003.phpt b/ext/spl/tests/fileobject_003.phpt index d738d68345..84e5710bf6 100755 --- a/ext/spl/tests/fileobject_003.phpt +++ b/ext/spl/tests/fileobject_003.phpt @@ -43,86 +43,6 @@ test(dirname(__FILE__), substr(dirname(__FILE__),-1), 'l'); --EXPECTF-- ===0=== -object(SplFileInfo)#%d (2) { - ["pathName":"SplFileInfo":private]=> - string(%d) "%s" - ["fileName":"SplFileInfo":private]=> - string(%d) "%sfileobject_001a.txt" -} -object(SplFileInfo)#%d (2) { - ["pathName":"SplFileInfo":private]=> - string(%d) "%s" - ["fileName":"SplFileInfo":private]=> - string(%d) "%sfileobject_001a.txt" -} -bool(false) -bool(true) -bool(true) -%s(%d) "%sfileobject_001a.txt" -string(%d) "%sfileobject_001a.txt" -bool(true) -string(19) "fileobject_001a.txt" -bool(true) -string(%d) "%stests" -bool(true) -string(%d) "%sfileobject_001a.txt" -string(19) "fileobject_001a.txt" -string(%d) "%stests" -===1=== -object(SplFileInfo)#%d (2) { - ["pathName":"SplFileInfo":private]=> - string(%d) "%s" - ["fileName":"SplFileInfo":private]=> - string(%d) "%s" -} -object(SplFileInfo)#%d (2) { - ["pathName":"SplFileInfo":private]=> - string(%d) "%s" - ["fileName":"SplFileInfo":private]=> - string(%d) "%s" -} -bool(false) -bool(true) -bool(true) -%s(%d) "%stests/" -string(%d) "%stests" -bool(true) -string(5) "tests" -bool(true) -string(%d) "%sspl" -bool(true) -string(%d) "%stests" -string(%d) "%stests" -string(%d) "%stests" -===2=== -object(SplFileInfo)#%d (2) { - ["pathName":"SplFileInfo":private]=> - string(%d) "%s" - ["fileName":"SplFileInfo":private]=> - string(%d) "%s" -} -object(SplFileInfo)#%d (2) { - ["pathName":"SplFileInfo":private]=> - string(%d) "%s" - ["fileName":"SplFileInfo":private]=> - string(%d) "%s" -} -bool(false) -bool(true) -bool(true) -%s(%d) "%stests" -string(%d) "%stests" -bool(true) -string(%d) "tests" -bool(true) -string(%d) "%sspl" -bool(true) -string(%d) "%stests" -string(5) "tests" -string(%d) "%sspl" -===DONE=== ---UEXPECTF-- -===0=== object(SplFileInfo)#%d (2) { [u"pathName":u"SplFileInfo":private]=> unicode(%d) "%s" diff --git a/ext/spl/tests/heap_008.phpt b/ext/spl/tests/heap_008.phpt index 521baf445d..a237d2fe5d 100644 --- a/ext/spl/tests/heap_008.phpt +++ b/ext/spl/tests/heap_008.phpt @@ -14,25 +14,6 @@ var_dump($h); ===DONE=== --EXPECTF-- -object(SplMaxHeap)#1 (3) { - ["flags":"SplHeap":private]=> - int(0) - ["isCorrupted":"SplHeap":private]=> - bool(false) - ["heap":"SplHeap":private]=> - array(4) { - [0]=> - int(5) - [1]=> - int(4) - [2]=> - int(0) - [3]=> - int(1) - } -} -===DONE=== ---UEXPECTF-- object(SplMaxHeap)#1 (3) { [u"flags":u"SplHeap":private]=> int(0) diff --git a/ext/spl/tests/iterator_024.phpt b/ext/spl/tests/iterator_024.phpt index cecf08e7a3..8daabcffc6 100755 --- a/ext/spl/tests/iterator_024.phpt +++ b/ext/spl/tests/iterator_024.phpt @@ -36,24 +36,6 @@ foreach(new RecursiveIteratorIterator($it) as $v) echo "$v\n"; 32 331 4 -string(13) "ArrayIterator" -An instance of RecursiveIterator or IteratorAggregate creating it is required -===MANUAL=== -string(22) "RecursiveArrayIterator" -1 -2 -31 -32 -331 -4 -===DONE=== ---UEXPECT-- -1 -2 -31 -32 -331 -4 unicode(13) "ArrayIterator" An instance of RecursiveIterator or IteratorAggregate creating it is required ===MANUAL=== diff --git a/ext/spl/tests/iterator_027.phpt b/ext/spl/tests/iterator_027.phpt index 3c2f722385..afb2edd354 100755 --- a/ext/spl/tests/iterator_027.phpt +++ b/ext/spl/tests/iterator_027.phpt @@ -67,34 +67,6 @@ int(1) int(32) int(3) int(4) -string(3) "foo" -string(3) "bar" -string(2) "25" -bool(false) -bool(true) -bool(false) -bool(true) -bool(false) -===REWIND=== -bool(true) -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" diff --git a/ext/spl/tests/iterator_028.phpt b/ext/spl/tests/iterator_028.phpt index 7ec76d8144..7c76d7617d 100755 --- a/ext/spl/tests/iterator_028.phpt +++ b/ext/spl/tests/iterator_028.phpt @@ -107,64 +107,6 @@ int(0) 0: 4 ===-1=== bool(false) -string(33) "Parameter max_depth must be >= -1" -int(4) -===DONE=== ---UEXPECT-- -===?=== -bool(false) -0: 1 -0: 2 -1: 31 -1: 32 -2: 331 -3: 3321 -4: 33221 -0: 4 -===2=== -int(2) -0: 1 -0: 2 -1: 31 -1: 32 -2: 331 -0: 4 -===X=== -bool(false) -0: 1 -0: 2 -1: 31 -1: 32 -2: 331 -3: 3321 -4: 33221 -0: 4 -===3=== -int(3) -0: 1 -0: 2 -1: 31 -1: 32 -2: 331 -3: 3321 -0: 4 -===5=== -int(5) -0: 1 -0: 2 -1: 31 -1: 32 -2: 331 -3: 3321 -4: 33221 -0: 4 -===0=== -int(0) -0: 1 -0: 2 -0: 4 -===-1=== -bool(false) unicode(33) "Parameter max_depth must be >= -1" int(4) ===DONE=== diff --git a/ext/spl/tests/iterator_037.phpt b/ext/spl/tests/iterator_037.phpt index d66c3598c4..de533ec96c 100755 --- a/ext/spl/tests/iterator_037.phpt +++ b/ext/spl/tests/iterator_037.phpt @@ -92,46 +92,6 @@ catch (Exception $e) --EXPECTF-- ===1=== int(1) -string(1) "1" -string(1) "2" -string(1) "3" -===2=== -int(2) -string(1) "0" -string(1) "1" -string(1) "2" -===4=== -int(4) -string(1) "1" -string(1) "2" -string(1) "3" -===8=== -int(8) -string(3) "0:1" -string(3) "1:2" -string(3) "2:3" -===3=== -Exception: Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER -int(0) -===5=== -Exception: Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER -int(0) -===9=== -Exception: Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER -int(0) -===6=== -Exception: Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER -int(0) -===10=== -Exception: Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER -int(0) -===X=== -Exception: Unsetting flag CALL_TO_STRING is not possible -Exception: Unsetting flag TOSTRING_USE_INNER is not possible -===DONE=== ---UEXPECTF-- -===1=== -int(1) unicode(1) "1" unicode(1) "2" unicode(1) "3" diff --git a/ext/spl/tests/iterator_038.phpt b/ext/spl/tests/iterator_038.phpt index dd276ddde5..c59189dfde 100755 --- a/ext/spl/tests/iterator_038.phpt +++ b/ext/spl/tests/iterator_038.phpt @@ -13,12 +13,6 @@ foreach(new NoRewindIterator(new ArrayIterator(array('Hello'=>0, 'World'=>1))) a ===DONE=== --EXPECT-- int(0) -string(5) "Hello" -int(1) -string(5) "World" -===DONE=== ---UEXPECT-- -int(0) unicode(5) "Hello" int(1) unicode(5) "World" diff --git a/ext/spl/tests/iterator_044.phpt b/ext/spl/tests/iterator_044.phpt index 9f6d5e47fc..c6f7f1ee5c 100755 --- a/ext/spl/tests/iterator_044.phpt +++ b/ext/spl/tests/iterator_044.phpt @@ -109,101 +109,6 @@ NULL int(2) bool(false) -Notice: Undefined index: 2 in %siterator_044.php on line %d -NULL -===5=== -string(3) "foo" -bool(false) - -Notice: Undefined index: foo in %siterator_044.php on line %d -NULL -===6=== -int(3) -bool(false) - -Notice: Undefined index: 3 in %siterator_044.php on line %d -NULL -===FILL=== -===0=== -int(0) -bool(true) -int(0) -===1=== -object(stdClass)#1 (0) { -} - -Warning: CachingIterator::offsetExists() expects parameter 1 to be string (Unicode or binary), object given in %siterator_044.php on line %d -NULL - -Warning: CachingIterator::offsetGet() expects parameter 1 to be string (Unicode or binary), object given in %siterator_044.php on line %d -NULL -===2=== -object(MyFoo)#2 (0) { -} -bool(true) -int(1) -===3=== -NULL -bool(false) - -Notice: Undefined index: in %siterator_044.php on line %d -NULL -===4=== -int(2) -bool(true) -int(4) -===5=== -string(3) "foo" -bool(true) -int(1) -===6=== -int(3) -bool(false) - -Notice: Undefined index: 3 in %siterator_044.php on line %d -NULL -===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::offsetExists() expects exactly 1 parameter, 0 given in %siterator_044.php on line %d -NULL - -Warning: CachingIterator::offsetGet() expects exactly 1 parameter, 0 given in %siterator_044.php on line %d -NULL -===0=== -int(0) -bool(false) - -Notice: Undefined index: 0 in %siterator_044.php on line %d -NULL -===1=== -object(stdClass)#%d (0) { -} - -Warning: CachingIterator::offsetExists() expects parameter 1 to be string (Unicode or binary), object given in %siterator_044.php on line %d -NULL - -Warning: CachingIterator::offsetGet() expects parameter 1 to be string (Unicode or binary), object given in %siterator_044.php on line %d -NULL -===2=== -object(MyFoo)#%d (0) { -} -bool(false) - -Notice: Undefined index: foo in %siterator_044.php on line %d -NULL -===3=== -NULL -bool(false) - -Notice: Undefined index: in %siterator_044.php on line %d -NULL -===4=== -int(2) -bool(false) - Notice: Undefined index: 2 in %siterator_044.php on line %d NULL ===5=== diff --git a/ext/spl/tests/iterator_045.phpt b/ext/spl/tests/iterator_045.phpt index d9d9e0d7ac..f91bcaccbe 100755 --- a/ext/spl/tests/iterator_045.phpt +++ b/ext/spl/tests/iterator_045.phpt @@ -104,79 +104,6 @@ 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]=> - string(6) "FooBar" -} -MyCachingIterator::testUnset() -unset(0) -unset(2) -MyCachingIterator::show() -array(2) { - [1]=> - int(42) - [3]=> - string(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]=> - string(6) "FooBar" -} -MyCachingIterator::testUnset() -unset(0) -unset(2) -MyCachingIterator::show() -array(2) { - [1]=> - int(42) - [3]=> - 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() diff --git a/ext/spl/tests/iterator_046.phpt b/ext/spl/tests/iterator_046.phpt index 0b7829c352..f0f16052a6 100755 --- a/ext/spl/tests/iterator_046.phpt +++ b/ext/spl/tests/iterator_046.phpt @@ -45,13 +45,6 @@ $it->show(); --EXPECTF-- MyCachingIterator::fill() MyCachingIterator::show() -string(1) "0" -string(3) "foo" -string(3) "bar" -===DONE=== ---UEXPECTF-- -MyCachingIterator::fill() -MyCachingIterator::show() unicode(1) "0" unicode(3) "foo" unicode(3) "bar" diff --git a/ext/spl/tests/iterator_048.phpt b/ext/spl/tests/iterator_048.phpt index d3dc84acae..f0cd6c7439 100755 --- a/ext/spl/tests/iterator_048.phpt +++ b/ext/spl/tests/iterator_048.phpt @@ -30,12 +30,6 @@ $it->show(); --EXPECTF-- int(0) -string(3) "Bar" -int(2) -string(6) "FooBar" -===DONE=== ---UEXPECTF-- -int(0) unicode(3) "Bar" int(2) unicode(6) "FooBar" diff --git a/ext/spl/tests/iterator_049.phpt b/ext/spl/tests/iterator_049.phpt index 2812b8bf42..0d57308d26 100755 --- a/ext/spl/tests/iterator_049.phpt +++ b/ext/spl/tests/iterator_049.phpt @@ -11,19 +11,6 @@ var_dump($ar->getArrayCopy()); ===DONE=== --EXPECTF-- -object(ArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(1) { - [""]=> - NULL - } -} -array(1) { - [""]=> - NULL -} -===DONE=== ---UEXPECTF-- object(ArrayIterator)#%d (1) { [u"storage":u"ArrayIterator":private]=> array(1) { diff --git a/ext/spl/tests/iterator_051.phpt b/ext/spl/tests/iterator_051.phpt index 770983b494..401978a245 100755 --- a/ext/spl/tests/iterator_051.phpt +++ b/ext/spl/tests/iterator_051.phpt @@ -28,73 +28,6 @@ var_dump($ar); ===DONE=== --EXPECTF-- -string(3) "1,2" -array(3) { - [0]=> - string(3) "1,2" - [1]=> - string(1) "1" - [2]=> - string(1) "2" -} -string(5) "1,2,3" -array(3) { - [0]=> - string(3) "1,2" - [1]=> - string(1) "1" - [2]=> - string(1) "2" -} -int(1) -array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" -} -string(3) "1,2" -array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" -} -string(5) "1,2,3" -array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" -} -int(0) -array(2) { - [0]=> - string(1) "0" - [1]=> - string(1) "0" -} -object(ArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(7) { - [1]=> - int(0) - ["1,2"]=> - int(1) - ["1,2,3"]=> - int(2) - [0]=> - int(3) - ["FooBar"]=> - int(4) - [","]=> - int(5) - [",,"]=> - int(6) - } -} -===DONE=== ---UEXPECTF-- unicode(3) "1,2" array(3) { [0]=> diff --git a/ext/spl/tests/iterator_052.phpt b/ext/spl/tests/iterator_052.phpt index b4c8626ccd..455eb6f1df 100755 --- a/ext/spl/tests/iterator_052.phpt +++ b/ext/spl/tests/iterator_052.phpt @@ -60,275 +60,6 @@ array(3) { } bool(true) int(1) -array(3) { - [0]=> - array(1) { - [0]=> - string(3) "1,2" - } - [1]=> - array(1) { - [0]=> - string(1) "1" - } - [2]=> - array(1) { - [0]=> - string(1) "2" - } -} -bool(true) -int(2) -array(3) { - [0]=> - array(1) { - [0]=> - string(3) "1,2" - } - [1]=> - array(1) { - [0]=> - string(1) "1" - } - [2]=> - array(1) { - [0]=> - string(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]=> - string(1) "1" - } - [1]=> - array(1) { - [0]=> - string(1) "1" - } -} -bool(true) -int(1) -array(2) { - [0]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - } - [1]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - } -} -bool(true) -int(2) -array(2) { - [0]=> - array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - } - [1]=> - array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(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 (1) { - ["storage":"ArrayIterator":private]=> - array(9) { - [0]=> - %s(1) "1" - [1]=> - %s(3) "1,2" - [2]=> - %s(5) "1,2,3" - [3]=> - %s(0) "" - [4]=> - NULL - [5]=> - array(0) { - } - [6]=> - %s(6) "FooBar" - [7]=> - %s(1) "," - [8]=> - %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) { diff --git a/ext/spl/tests/iterator_053.phpt b/ext/spl/tests/iterator_053.phpt index 0ca947a1e1..5c86e07d38 100755 --- a/ext/spl/tests/iterator_053.phpt +++ b/ext/spl/tests/iterator_053.phpt @@ -164,275 +164,6 @@ array(3) { } bool(true) int(0) -array(2) { - [0]=> - array(1) { - [0]=> - string(1) "0" - } - [1]=> - array(1) { - [0]=> - string(1) "0" - } -} -bool(true) -int(1) -array(2) { - [0]=> - array(1) { - [0]=> - string(1) "1" - } - [1]=> - array(1) { - [0]=> - string(1) "1" - } -} -bool(true) -int(2) -array(2) { - [0]=> - array(1) { - [0]=> - string(1) "2" - } - [1]=> - array(1) { - [0]=> - string(1) "2" - } -} -bool(true) -int(3) -array(2) { - [0]=> - array(1) { - [0]=> - string(1) "3" - } - [1]=> - array(1) { - [0]=> - string(1) "3" - } -} -bool(true) -int(4) -array(2) { - [0]=> - array(1) { - [0]=> - string(1) "4" - } - [1]=> - array(1) { - [0]=> - string(1) "4" - } -} -bool(true) -int(5) -array(2) { - [0]=> - array(1) { - [0]=> - string(1) "5" - } - [1]=> - array(1) { - [0]=> - string(1) "5" - } -} -bool(true) -int(6) -array(2) { - [0]=> - array(1) { - [0]=> - string(1) "6" - } - [1]=> - array(1) { - [0]=> - string(1) "6" - } -} -bool(true) -int(7) -array(2) { - [0]=> - array(1) { - [0]=> - string(1) "7" - } - [1]=> - array(1) { - [0]=> - string(1) "7" - } -} -bool(true) -int(8) -array(2) { - [0]=> - array(1) { - [0]=> - string(1) "8" - } - [1]=> - array(1) { - [0]=> - string(1) "8" - } -} -object(ArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(9) { - [0]=> - %s(1) "1" - [1]=> - %s(3) "1,2" - [2]=> - %s(5) "1,2,3" - [3]=> - %s(0) "" - [4]=> - NULL - [5]=> - array(0) { - } - [6]=> - %s(6) "FooBar" - [7]=> - %s(1) "," - [8]=> - %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) { diff --git a/ext/spl/tests/iterator_054.phpt b/ext/spl/tests/iterator_054.phpt index aeb8a5ce59..3954877f03 100755 --- a/ext/spl/tests/iterator_054.phpt +++ b/ext/spl/tests/iterator_054.phpt @@ -27,64 +27,6 @@ var_dump($ar); --EXPECTF-- int(1) -array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" -} -int(2) -array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" -} -int(7) -array(2) { - [0]=> - string(0) "" - [1]=> - string(0) "" -} -int(8) -array(3) { - [0]=> - string(0) "" - [1]=> - string(0) "" - [2]=> - string(0) "" -} -object(ArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(9) { - [0]=> - %s(1) "1" - [1]=> - %s(3) "1,2" - [2]=> - %s(5) "1,2,3" - [3]=> - %s(0) "" - [4]=> - NULL - [5]=> - array(0) { - } - [6]=> - %s(6) "FooBar" - [7]=> - %s(1) "," - [8]=> - %s(2) ",," - } -} -===DONE=== ---UEXPECTF-- -int(1) array(2) { [0]=> unicode(1) "1" diff --git a/ext/spl/tests/iterator_055.phpt b/ext/spl/tests/iterator_055.phpt index 21212c0a86..8d80f4d07f 100755 --- a/ext/spl/tests/iterator_055.phpt +++ b/ext/spl/tests/iterator_055.phpt @@ -26,41 +26,6 @@ var_dump($ar); ===DONE=== --EXPECTF-- -string(3) "1,2" -array(2) { - [0]=> - string(0) "" - [1]=> - string(0) "" -} -string(5) "1,2,3" -array(2) { - [0]=> - string(0) "" - [1]=> - string(2) ",3" -} -object(ArrayIterator)#%d (1) { - ["storage":"ArrayIterator":private]=> - array(7) { - [1]=> - int(0) - ["1,2"]=> - int(1) - ["1,2,3"]=> - int(2) - [0]=> - int(3) - ["FooBar"]=> - int(4) - [","]=> - int(5) - [",,"]=> - int(6) - } -} -===DONE=== ---UEXPECTF-- unicode(3) "1,2" array(2) { [0]=> diff --git a/ext/spl/tests/observer_003.phpt b/ext/spl/tests/observer_003.phpt index f5d022daf6..08595d0cc1 100755 --- a/ext/spl/tests/observer_003.phpt +++ b/ext/spl/tests/observer_003.phpt @@ -45,20 +45,6 @@ foreach($storage2 as $object) --EXPECTF-- int(4) int(1) -string(1) "2" -string(3) "foo" -bool(true) -string(%d) "%s" -===UNSERIALIZE=== -int(4) -int(1) -string(1) "2" -string(3) "foo" -bool(true) -===DONE=== ---UEXPECTF-- -int(4) -int(1) unicode(1) "2" unicode(3) "foo" bool(true) diff --git a/ext/spl/tests/observer_004.phpt b/ext/spl/tests/observer_004.phpt index 3f94f5ea23..112e81540b 100755 --- a/ext/spl/tests/observer_004.phpt +++ b/ext/spl/tests/observer_004.phpt @@ -60,70 +60,6 @@ var_dump($storage2); int(2) int(1) int(2) -object(MyStorage)#%d (2) { - ["bla"]=> - int(26) - ["storage":"SplObjectStorage":private]=> - array(2) { - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(1) - } - ["inf"]=> - NULL - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(2) - } - ["inf"]=> - NULL - } - } -} -string(%d) "%s" -===UNSERIALIZE=== -int(2) -int(1) -int(2) -object(MyStorage)#%d (2) { - ["bla"]=> - int(26) - ["storage":"SplObjectStorage":private]=> - array(2) { - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(1) - } - ["inf"]=> - NULL - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(2) - } - ["inf"]=> - NULL - } - } -} -===DONE=== ---UEXPECTF-- -int(2) -int(1) -int(2) object(MyStorage)#%d (2) { [u"bla"]=> int(26) diff --git a/ext/spl/tests/observer_005.phpt b/ext/spl/tests/observer_005.phpt index 3d906ca601..efc37bcada 100755 --- a/ext/spl/tests/observer_005.phpt +++ b/ext/spl/tests/observer_005.phpt @@ -76,142 +76,6 @@ var_dump($storage2); --EXPECTF-- int(2) -object(TestClass)#%d (4) { - ["def"]=> - int(24) - ["pub"]=> - int(4) - ["pro":protected]=> - int(5) - ["pri":"TestClass":private]=> - int(6) -} -object(TestClass)#%d (4) { - ["def"]=> - int(24) - ["pub"]=> - int(7) - ["pro":protected]=> - int(8) - ["pri":"TestClass":private]=> - int(9) -} -object(MyStorage)#%d (5) { - ["def"]=> - int(24) - ["pub"]=> - int(1) - ["pro":protected]=> - int(2) - ["pri":"MyStorage":private]=> - int(3) - ["storage":"SplObjectStorage":private]=> - array(2) { - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (4) { - ["def"]=> - int(24) - ["pub"]=> - int(4) - ["pro":protected]=> - int(5) - ["pri":"TestClass":private]=> - int(6) - } - ["inf"]=> - NULL - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (4) { - ["def"]=> - int(24) - ["pub"]=> - int(7) - ["pro":protected]=> - int(8) - ["pri":"TestClass":private]=> - int(9) - } - ["inf"]=> - NULL - } - } -} -string(%d) "%s" -===UNSERIALIZE=== -int(2) -object(TestClass)#%d (4) { - ["def"]=> - int(24) - ["pub"]=> - int(4) - ["pro":protected]=> - int(5) - ["pri":"TestClass":private]=> - int(6) -} -object(TestClass)#%d (4) { - ["def"]=> - int(24) - ["pub"]=> - int(7) - ["pro":protected]=> - int(8) - ["pri":"TestClass":private]=> - int(9) -} -object(MyStorage)#%d (5) { - ["def"]=> - int(24) - ["pub"]=> - int(1) - ["pro":protected]=> - int(2) - ["pri":"MyStorage":private]=> - int(3) - ["storage":"SplObjectStorage":private]=> - array(2) { - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (4) { - ["def"]=> - int(24) - ["pub"]=> - int(4) - ["pro":protected]=> - int(5) - ["pri":"TestClass":private]=> - int(6) - } - ["inf"]=> - NULL - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (4) { - ["def"]=> - int(24) - ["pub"]=> - int(7) - ["pro":protected]=> - int(8) - ["pri":"TestClass":private]=> - int(9) - } - ["inf"]=> - NULL - } - } -} -===DONE=== ---UEXPECTF-- -int(2) object(TestClass)#%d (4) { [u"def"]=> int(24) diff --git a/ext/spl/tests/observer_006.phpt b/ext/spl/tests/observer_006.phpt index e93965fa60..169bad81db 100755 --- a/ext/spl/tests/observer_006.phpt +++ b/ext/spl/tests/observer_006.phpt @@ -81,237 +81,6 @@ var_dump(unserialize(serialize($storage))); int(2) int(1) int(2) -object(MyStorage)#%d (2) { - ["bla"]=> - int(26) - ["storage":"SplObjectStorage":private]=> - array(2) { - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(1) - } - ["inf"]=> - string(3) "foo" - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(2) - } - ["inf"]=> - int(42) - } - } -} -string(%d) "%s" -===UNSERIALIZE=== -int(2) -int(1) -int(2) -object(MyStorage)#%d (2) { - ["bla"]=> - int(26) - ["storage":"SplObjectStorage":private]=> - array(2) { - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(1) - } - ["inf"]=> - string(3) "foo" - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(2) - } - ["inf"]=> - int(42) - } - } -} -===UNSERIALIZE2=== -object(MyStorage)#%d (2) { - ["bla"]=> - int(26) - ["storage":"SplObjectStorage":private]=> - array(4) { - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(1) - } - ["inf"]=> - string(3) "foo" - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(2) - } - ["inf"]=> - int(42) - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(3) - } - ["inf"]=> - object(stdClass)#%d (0) { - } - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(4) - } - ["inf"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(5) - } - } - } -} -int(1) -object(TestClass)#%d (1) { - ["test"]=> - int(2) -} -int(42) -string(3) "bar" -===UNSERIALIZE3=== -object(MyStorage)#%d (2) { - ["bla"]=> - int(26) - ["storage":"SplObjectStorage":private]=> - array(4) { - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(1) - } - ["inf"]=> - string(3) "foo" - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(2) - } - ["inf"]=> - string(3) "bar" - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(3) - } - ["inf"]=> - object(stdClass)#%d (0) { - } - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(4) - } - ["inf"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(5) - } - } - } -} -int(2) -object(TestClass)#7 (1) { - ["test"]=> - int(3) -} -===UNSERIALIZE4=== -object(MyStorage)#%d (2) { - ["bla"]=> - int(26) - ["storage":"SplObjectStorage":private]=> - array(4) { - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(1) - } - ["inf"]=> - string(3) "foo" - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(2) - } - ["inf"]=> - string(3) "bar" - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(3) - } - ["inf"]=> - string(8) "replaced" - } - ["%s"]=> - array(2) { - ["obj"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(4) - } - ["inf"]=> - object(TestClass)#%d (1) { - ["test"]=> - int(5) - } - } - } -} -===DONE=== ---UEXPECTF-- -int(2) -int(1) -int(2) object(MyStorage)#%d (2) { [u"bla"]=> int(26) diff --git a/ext/spl/tests/pqueue_004.phpt b/ext/spl/tests/pqueue_004.phpt index 4b51d204ba..8300b54299 100644 --- a/ext/spl/tests/pqueue_004.phpt +++ b/ext/spl/tests/pqueue_004.phpt @@ -14,45 +14,6 @@ var_dump($pq); ===DONE=== --EXPECTF-- -object(SplPriorityQueue)#1 (3) { - ["flags":"SplPriorityQueue":private]=> - int(1) - ["isCorrupted":"SplPriorityQueue":private]=> - bool(false) - ["heap":"SplPriorityQueue":private]=> - array(4) { - [0]=> - array(2) { - ["data"]=> - string(1) "c" - ["priority"]=> - int(5) - } - [1]=> - array(2) { - ["data"]=> - string(1) "a" - ["priority"]=> - int(0) - } - [2]=> - array(2) { - ["data"]=> - string(1) "b" - ["priority"]=> - int(1) - } - [3]=> - array(2) { - ["data"]=> - string(1) "d" - ["priority"]=> - int(-2) - } - } -} -===DONE=== ---UEXPECTF-- object(SplPriorityQueue)#1 (3) { [u"flags":u"SplPriorityQueue":private]=> int(1) diff --git a/ext/spl/tests/spl_003.phpt b/ext/spl/tests/spl_003.phpt index a05647eb8e..0c66534bc6 100755 --- a/ext/spl/tests/spl_003.phpt +++ b/ext/spl/tests/spl_003.phpt @@ -33,47 +33,6 @@ function __autoload($cname) { --EXPECTF-- Warning: class_parents(): Class foo does not exist in %sspl_003.php on line %d -string(3) "foo" - -Warning: class_parents(): Class foo does not exist and could not be loaded in %sspl_003.php on line %d -array(2) { - ["b"]=> - string(1) "b" - ["a"]=> - string(1) "a" -} -array(2) { - ["b"]=> - string(1) "b" - ["a"]=> - string(1) "a" -} -array(1) { - ["a"]=> - string(1) "a" -} -array(1) { - ["a"]=> - string(1) "a" -} -array(0) { -} -bool(false) -bool(false) -string(3) "aaa" - -Warning: class_implements(): Class aaa does not exist and could not be loaded in %sspl_003.php on line %d - -Warning: class_implements(): Class bbb does not exist in %sspl_003.php on line %d -array(0) { -} -array(0) { -} -bool(false) -bool(false) -===DONE=== ---UEXPECTF-- -Warning: class_parents(): Class foo does not exist in %sspl_003.php on line %d unicode(3) "foo" Warning: class_parents(): Class foo does not exist and could not be loaded in %sspl_003.php on line %d @@ -112,4 +71,4 @@ array(0) { } bool(false) bool(false) -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/spl/tests/spl_autoload_001.phpt b/ext/spl/tests/spl_autoload_001.phpt index 22e2e90f13..1ad2c079cb 100755 --- a/ext/spl/tests/spl_autoload_001.phpt +++ b/ext/spl/tests/spl_autoload_001.phpt @@ -105,37 +105,6 @@ catch(Exception $e) --EXPECTF-- ===EMPTY=== -string(9) ".inc,.php" -%stestclass.inc -Exception: Class TestClass could not be loaded -===()=== -Exception: Class TestClass could not be loaded -===(1)=== -Exception: Class TestClass could not be loaded -===(.inc,,.php.inc)=== -%stestclass -%stestclass.php.inc -Exception: Class TestClass could not be loaded -===()=== -Exception: Class TestClass could not be loaded -Exception: Class TestClass could not be loaded -===SPL_AUTOLOAD()=== -string(4) ".inc" -Exception: Class TestClass could not be loaded -===REGISTER=== -TestFunc1(TestClass) -TestFunc2(TestClass) -bool(false) -===LOAD=== -TestFunc1(TestClass) -TestFunc2(TestClass) -%stestclass.class.inc -bool(true) -===NOFUNCTION=== -Exception: Function 'unavailable_autoload_function' not found (function 'unavailable_autoload_function' not found or invalid function name) -===DONE=== ---UEXPECTF-- -===EMPTY=== unicode(9) ".inc,.php" %stestclass.inc Exception: Class TestClass could not be loaded diff --git a/ext/spl/tests/spl_autoload_002.phpt b/ext/spl/tests/spl_autoload_002.phpt index d46cb26bb8..7542cefbc1 100755 --- a/ext/spl/tests/spl_autoload_002.phpt +++ b/ext/spl/tests/spl_autoload_002.phpt @@ -43,33 +43,6 @@ var_dump(spl_autoload_functions()); --EXPECT-- bool(false) -array(1) { - [0]=> - string(12) "spl_autoload" -} -array(3) { - [0]=> - string(12) "spl_autoload" - [1]=> - string(16) "SplAutoloadTest1" - [2]=> - string(16) "SplAutoloadTest2" -} -array(2) { - [0]=> - string(12) "spl_autoload" - [1]=> - string(16) "SplAutoloadTest2" -} -bool(false) -array(1) { - [0]=> - string(12) "spl_autoload" -} -bool(false) -===DONE=== ---UEXPECT-- -bool(false) array(1) { [0]=> unicode(12) "spl_autoload" diff --git a/ext/spl/tests/spl_autoload_004.phpt b/ext/spl/tests/spl_autoload_004.phpt index d995961d7a..583838fa76 100755 --- a/ext/spl/tests/spl_autoload_004.phpt +++ b/ext/spl/tests/spl_autoload_004.phpt @@ -29,19 +29,6 @@ var_dump(class_exists("TestClass", true)); ===DONE=== --EXPECTF-- -array(1) { - [0]=> - array(2) { - [0]=> - string(12) "MyAutoLoader" - [1]=> - string(8) "autoLoad" - } -} -MyAutoLoader::autoLoad(TestClass) -bool(false) -===DONE=== ---UEXPECTF-- array(1) { [0]=> array(2) { diff --git a/ext/spl/tests/spl_autoload_006.phpt b/ext/spl/tests/spl_autoload_006.phpt index 7cd576f352..2237c6f925 100755 --- a/ext/spl/tests/spl_autoload_006.phpt +++ b/ext/spl/tests/spl_autoload_006.phpt @@ -23,19 +23,6 @@ var_dump(class_exists("TestClass", true)); ===DONE=== --EXPECTF-- -array(1) { - [0]=> - array(2) { - [0]=> - string(12) "MyAutoLoader" - [1]=> - string(8) "autoLoad" - } -} -MyAutoLoader::autoLoad(TestClass) -bool(false) -===DONE=== ---UEXPECTF-- array(1) { [0]=> array(2) { diff --git a/ext/spl/tests/spl_autoload_007.phpt b/ext/spl/tests/spl_autoload_007.phpt index 06b1a8060f..3b6b3b90c1 100755 --- a/ext/spl/tests/spl_autoload_007.phpt +++ b/ext/spl/tests/spl_autoload_007.phpt @@ -56,87 +56,6 @@ foreach($funcs as $idx => $func) ===DONE=== --EXPECTF-- -string(22) "MyAutoLoader::notExist" -Function 'MyAutoLoader::notExist' not found (class 'MyAutoLoader' does not have a method 'notexist') - -string(22) "MyAutoLoader::noAccess" -Function 'MyAutoLoader::noAccess' not callable (cannot access protected method MyAutoLoader::noAccess()) - -string(22) "MyAutoLoader::autoLoad" -ok - -string(22) "MyAutoLoader::dynaLoad" -Function 'MyAutoLoader::dynaLoad' not callable (non-static method MyAutoLoader::dynaLoad() should not be called statically) - -array(2) { - [0]=> - string(12) "MyAutoLoader" - [1]=> - string(8) "notExist" -} -Passed array does not specify an existing static method (class 'MyAutoLoader' does not have a method 'notexist') - -array(2) { - [0]=> - string(12) "MyAutoLoader" - [1]=> - string(8) "noAccess" -} -Passed array does not specify a callable static method (cannot access protected method MyAutoLoader::noAccess()) - -array(2) { - [0]=> - string(12) "MyAutoLoader" - [1]=> - string(8) "autoLoad" -} -ok - -array(2) { - [0]=> - string(12) "MyAutoLoader" - [1]=> - string(8) "dynaLoad" -} -Passed array specifies a non static method but no object (non-static method MyAutoLoader::dynaLoad() should not be called statically) - -array(2) { - [0]=> - object(MyAutoLoader)#%d (0) { - } - [1]=> - string(8) "notExist" -} -Passed array does not specify an existing method (class 'MyAutoLoader' does not have a method 'notexist') - -array(2) { - [0]=> - object(MyAutoLoader)#%d (0) { - } - [1]=> - string(8) "noAccess" -} -Passed array does not specify a callable method (cannot access protected method MyAutoLoader::noAccess()) - -array(2) { - [0]=> - object(MyAutoLoader)#%d (0) { - } - [1]=> - string(8) "autoLoad" -} -ok - -array(2) { - [0]=> - object(MyAutoLoader)#%d (0) { - } - [1]=> - string(8) "dynaLoad" -} -ok -===DONE=== ---UEXPECTF-- unicode(22) "MyAutoLoader::notExist" Function 'MyAutoLoader::notExist' not found (class 'MyAutoLoader' does not have a method 'notexist') diff --git a/ext/spl/tests/spl_autoload_008.phpt b/ext/spl/tests/spl_autoload_008.phpt index a5156d3654..cf75c7d58f 100755 --- a/ext/spl/tests/spl_autoload_008.phpt +++ b/ext/spl/tests/spl_autoload_008.phpt @@ -67,68 +67,6 @@ foreach($funcs as $idx => $func) --EXPECTF-- ====0==== -string(10) "MyAutoLoad" -registered -MyAutoLoad(NoExistingTestClass) -Exception: Bla -int(0) -====1==== -string(22) "MyAutoLoader::autoLoad" -registered -MyAutoLoader::autoLoad(NoExistingTestClass) -Exception: Bla -int(0) -====2==== -string(22) "MyAutoLoader::dynaLoad" -LogicException: Function 'MyAutoLoader::dynaLoad' not callable (non-static method MyAutoLoader::dynaLoad() should not be called statically) -int(0) -====3==== -array(2) { - [0]=> - string(12) "MyAutoLoader" - [1]=> - string(8) "autoLoad" -} -registered -MyAutoLoader::autoLoad(NoExistingTestClass) -Exception: Bla -int(0) -====4==== -array(2) { - [0]=> - string(12) "MyAutoLoader" - [1]=> - string(8) "dynaLoad" -} -LogicException: Passed array specifies a non static method but no object (non-static method MyAutoLoader::dynaLoad() should not be called statically) -int(0) -====5==== -array(2) { - [0]=> - object(MyAutoLoader)#%d (0) { - } - [1]=> - string(8) "autoLoad" -} -registered -MyAutoLoader::autoLoad(NoExistingTestClass) -Exception: Bla -int(0) -====6==== -array(2) { - [0]=> - object(MyAutoLoader)#%d (0) { - } - [1]=> - string(8) "dynaLoad" -} -registered -MyAutoLoader::dynaLoad(NoExistingTestClass) -Exception: Bla -int(0) -===DONE=== ---UEXPECTF-- -====0==== unicode(10) "MyAutoLoad" registered MyAutoLoad(NoExistingTestClass) diff --git a/ext/spl/tests/sxe_001.phpt b/ext/spl/tests/sxe_001.phpt index db9b786c03..b48621504f 100755 --- a/ext/spl/tests/sxe_001.phpt +++ b/ext/spl/tests/sxe_001.phpt @@ -30,38 +30,6 @@ var_dump(simplexml_load_string((binary)$xml, 'SimpleXMLIterator')); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLIterator)#%d (2) { - ["@attributes"]=> - array(1) { - ["id"]=> - string(5) "elem1" - } - ["elem1"]=> - object(SimpleXMLIterator)#%d (3) { - ["@attributes"]=> - array(1) { - ["attr1"]=> - string(5) "first" - } - ["comment"]=> - object(SimpleXMLIterator)#%d (0) { - } - ["elem2"]=> - object(SimpleXMLIterator)#%d (1) { - ["elem3"]=> - object(SimpleXMLIterator)#%d (1) { - ["elem4"]=> - object(SimpleXMLIterator)#%d (1) { - ["test"]=> - object(SimpleXMLIterator)#%d (0) { - } - } - } - } - } -} -===DONE=== ---UEXPECTF-- object(SimpleXMLIterator)#%d (2) { [u"@attributes"]=> array(1) { diff --git a/ext/spl/tests/sxe_002.phpt b/ext/spl/tests/sxe_002.phpt index 94179d1d6b..22e635f962 100755 --- a/ext/spl/tests/sxe_002.phpt +++ b/ext/spl/tests/sxe_002.phpt @@ -51,29 +51,6 @@ var_dump(trim($sxe->elem1)); ?> ===DONE=== --EXPECT-- -string(5) "elem1" -string(17) "SimpleXMLIterator" -string(10) "Bla bla 1." -string(5) "elem2" -string(17) "SimpleXMLIterator" -string(28) "Here we have some text data." -string(5) "elem3" -string(17) "SimpleXMLIterator" -string(19) "And here some more." -string(5) "elem4" -string(17) "SimpleXMLIterator" -string(15) "Wow once again." -string(6) "elem11" -string(17) "SimpleXMLIterator" -string(10) "Bla bla 2." -string(7) "elem111" -string(17) "SimpleXMLIterator" -string(7) "Foo Bar" -===DUMP=== -string(17) "SimpleXMLIterator" -string(10) "Bla bla 1." -===DONE=== ---UEXPECT-- unicode(5) "elem1" unicode(17) "SimpleXMLIterator" unicode(10) "Bla bla 1." diff --git a/ext/spl/tests/sxe_003.phpt b/ext/spl/tests/sxe_003.phpt index 402658c2e2..78105efb46 100755 --- a/ext/spl/tests/sxe_003.phpt +++ b/ext/spl/tests/sxe_003.phpt @@ -60,23 +60,6 @@ for ($sxe->rewind(); $sxe->valid(); $sxe->next()) { ===DONE=== --EXPECTF-- -Warning: Invalid argument supplied for foreach() in %ssxe_003.php on line %d -===RESET=== -bool(true) -string(5) "elem1" -string(10) "Bla bla 1." -string(5) "elem2" -string(17) "SimpleXMLIterator" -string(28) "Here we have some text data." -bool(true) -string(6) "elem11" -string(10) "Bla bla 2." -string(7) "elem111" -string(17) "SimpleXMLIterator" -string(7) "Foo Bar" -===DONE=== ---UEXPECTF-- - Warning: Invalid argument supplied for foreach() in %ssxe_003.php on line %d ===RESET=== bool(true) diff --git a/ext/spl/tests/sxe_004.phpt b/ext/spl/tests/sxe_004.phpt index f5ba0c3ecd..6c44133584 100755 --- a/ext/spl/tests/sxe_004.phpt +++ b/ext/spl/tests/sxe_004.phpt @@ -90,65 +90,6 @@ SXETest::valid SXETest::hasChildren SXETest::valid SXETest::current -string(7) "SXETest" -string(10) "Bla bla 1." -SXETest::getChildren -SXETest::rewind -SXETest::valid -SXETest::hasChildren -SXETest::valid -SXETest::current -string(7) "SXETest" -string(28) "Here we have some text data." -SXETest::getChildren -SXETest::rewind -SXETest::valid -SXETest::hasChildren -SXETest::valid -SXETest::current -string(7) "SXETest" -string(19) "And here some more." -SXETest::getChildren -SXETest::rewind -SXETest::valid -SXETest::hasChildren -SXETest::valid -SXETest::current -string(7) "SXETest" -string(15) "Wow once again." -SXETest::next -SXETest::valid -SXETest::next -SXETest::valid -SXETest::next -SXETest::valid -SXETest::next -SXETest::valid -SXETest::hasChildren -SXETest::valid -SXETest::current -string(7) "SXETest" -string(10) "Bla bla 2." -SXETest::getChildren -SXETest::rewind -SXETest::valid -SXETest::hasChildren -SXETest::valid -SXETest::current -string(7) "SXETest" -string(7) "Foo Bar" -SXETest::next -SXETest::valid -SXETest::next -SXETest::valid -SXETest::valid -===DONE=== ---UEXPECTF-- -SXETest::rewind -SXETest::valid -SXETest::hasChildren -SXETest::valid -SXETest::current unicode(7) "SXETest" unicode(10) "Bla bla 1." SXETest::getChildren diff --git a/ext/sqlite/tests/bug35248.phpt b/ext/sqlite/tests/bug35248.phpt index 89efc816c9..67b3a7fd60 100644 --- a/ext/sqlite/tests/bug35248.phpt +++ b/ext/sqlite/tests/bug35248.phpt @@ -11,8 +11,5 @@ Bug #35248 (sqlite_query does not return parse error message) var_dump($err); ?> --EXPECT-- -string(30) "near "asdfesdfa": syntax error" -string(30) "near "asdfesdfa": syntax error" ---UEXPECT-- unicode(30) "near "asdfesdfa": syntax error" unicode(30) "near "asdfesdfa": syntax error" diff --git a/ext/sqlite/tests/sqlite_002.phpt b/ext/sqlite/tests/sqlite_002.phpt index 325d798653..4054cd1db5 100755 --- a/ext/sqlite/tests/sqlite_002.phpt +++ b/ext/sqlite/tests/sqlite_002.phpt @@ -16,21 +16,6 @@ var_dump(sqlite_fetch_array($r)); sqlite_close($db); ?> --EXPECT-- -array(6) { - [0]=> - string(10) "2002-01-02" - ["c1"]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - ["c2"]=> - string(8) "12:49:00" - [2]=> - NULL - ["c3"]=> - NULL -} ---UEXPECT-- array(6) { [0]=> unicode(10) "2002-01-02" diff --git a/ext/sqlite/tests/sqlite_003.phpt b/ext/sqlite/tests/sqlite_003.phpt index 4269638470..04981b2137 100755 --- a/ext/sqlite/tests/sqlite_003.phpt +++ b/ext/sqlite/tests/sqlite_003.phpt @@ -20,37 +20,6 @@ var_dump(sqlite_fetch_array($r, SQLITE_ASSOC)); sqlite_close($db); ?> --EXPECT-- -array(6) { - [0]=> - string(10) "2002-01-02" - ["c1"]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - ["c2"]=> - string(8) "12:49:00" - [2]=> - NULL - ["c3"]=> - NULL -} -array(3) { - [0]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - [2]=> - NULL -} -array(3) { - ["c1"]=> - string(10) "2002-01-02" - ["c2"]=> - string(8) "12:49:00" - ["c3"]=> - NULL -} ---UEXPECT-- array(6) { [0]=> unicode(10) "2002-01-02" diff --git a/ext/sqlite/tests/sqlite_005.phpt b/ext/sqlite/tests/sqlite_005.phpt index 4acdebddf4..62f40b83ba 100644 --- a/ext/sqlite/tests/sqlite_005.phpt +++ b/ext/sqlite/tests/sqlite_005.phpt @@ -43,12 +43,6 @@ sqlite_close($db); echo "DONE!\n"; ?> --EXPECT-- -array(1) { - [0]=> - string(11) "onetwothree" -} -DONE! ---UEXPECT-- array(1) { [0]=> unicode(11) "onetwothree" diff --git a/ext/sqlite/tests/sqlite_006.phpt b/ext/sqlite/tests/sqlite_006.phpt index 409d7e49c0..ddd1d428cd 100644 --- a/ext/sqlite/tests/sqlite_006.phpt +++ b/ext/sqlite/tests/sqlite_006.phpt @@ -40,20 +40,6 @@ sqlite_close($db); echo "DONE!\n"; ?> --EXPECT-- -array(1) { - [0]=> - string(7) "one-uno" -} -array(1) { - [0]=> - string(7) "two-dos" -} -array(1) { - [0]=> - string(10) "three-tres" -} -DONE! ---UEXPECT-- array(1) { [0]=> unicode(7) "one-uno" diff --git a/ext/sqlite/tests/sqlite_007.phpt b/ext/sqlite/tests/sqlite_007.phpt index 5635e9e793..bd9c754557 100755 --- a/ext/sqlite/tests/sqlite_007.phpt +++ b/ext/sqlite/tests/sqlite_007.phpt @@ -20,37 +20,6 @@ var_dump(sqlite_fetch_array($r, SQLITE_ASSOC)); sqlite_close($db); ?> --EXPECT-- -array(6) { - [0]=> - string(10) "2002-01-02" - ["c1"]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - ["c2"]=> - string(8) "12:49:00" - [2]=> - NULL - ["c3"]=> - NULL -} -array(3) { - [0]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - [2]=> - NULL -} -array(3) { - ["c1"]=> - string(10) "2002-01-02" - ["c2"]=> - string(8) "12:49:00" - ["c3"]=> - NULL -} ---UEXPECT-- array(6) { [0]=> unicode(10) "2002-01-02" diff --git a/ext/sqlite/tests/sqlite_008.phpt b/ext/sqlite/tests/sqlite_008.phpt index 5e5950b34e..f22ec3604e 100755 --- a/ext/sqlite/tests/sqlite_008.phpt +++ b/ext/sqlite/tests/sqlite_008.phpt @@ -31,20 +31,6 @@ sqlite_close($db); echo "DONE!\n"; ?> --EXPECT-- -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -DONE! ---UEXPECT-- array(1) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_009.phpt b/ext/sqlite/tests/sqlite_009.phpt index de45b03be9..77f8894a29 100755 --- a/ext/sqlite/tests/sqlite_009.phpt +++ b/ext/sqlite/tests/sqlite_009.phpt @@ -31,20 +31,6 @@ sqlite_close($db); echo "DONE!\n"; ?> --EXPECT-- -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -DONE! ---UEXPECT-- array(1) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_010.phpt b/ext/sqlite/tests/sqlite_010.phpt index f13d95ffd9..1422baefd3 100755 --- a/ext/sqlite/tests/sqlite_010.phpt +++ b/ext/sqlite/tests/sqlite_010.phpt @@ -42,44 +42,6 @@ sqlite_close($db); echo "DONE!\n"; ?> --EXPECT-- -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -DONE! ---UEXPECT-- array(1) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_011.phpt b/ext/sqlite/tests/sqlite_011.phpt index e24d1d8639..f09bbf197f 100755 --- a/ext/sqlite/tests/sqlite_011.phpt +++ b/ext/sqlite/tests/sqlite_011.phpt @@ -18,21 +18,6 @@ var_dump(sqlite_fetch_array($r)); sqlite_close($db); ?> --EXPECT-- -array(6) { - ["foo.c1"]=> - string(1) "1" - ["foo.c2"]=> - string(1) "2" - ["foo.c3"]=> - string(1) "3" - ["bar.c1"]=> - string(1) "4" - ["bar.c2"]=> - string(1) "5" - ["bar.c3"]=> - string(1) "6" -} ---UEXPECT-- array(6) { [u"foo.c1"]=> unicode(1) "1" diff --git a/ext/sqlite/tests/sqlite_012.phpt b/ext/sqlite/tests/sqlite_012.phpt index b8b89e558e..cc4d8b47ba 100755 --- a/ext/sqlite/tests/sqlite_012.phpt +++ b/ext/sqlite/tests/sqlite_012.phpt @@ -28,16 +28,6 @@ echo "DONE!\n"; ?> --EXPECT-- Buffered -string(3) "foo" -string(3) "bar" -string(3) "baz" -Unbuffered -string(3) "foo" -string(3) "bar" -string(3) "baz" -DONE! ---UEXPECT-- -Buffered unicode(3) "foo" unicode(3) "bar" unicode(3) "baz" diff --git a/ext/sqlite/tests/sqlite_013.phpt b/ext/sqlite/tests/sqlite_013.phpt index 4ed0e7856a..543bc94147 100755 --- a/ext/sqlite/tests/sqlite_013.phpt +++ b/ext/sqlite/tests/sqlite_013.phpt @@ -46,38 +46,6 @@ echo "DONE!\n"; ?> --EXPECT-- ====BUFFERED==== -array(2) { - [0]=> - string(3) "one" - [1]=> - string(3) "two" -} -string(3) "one" -string(3) "two" -string(3) "one" -string(3) "two" -array(2) { - [0]=> - string(5) "three" - [1]=> - string(4) "four" -} -string(5) "three" -string(4) "four" -string(5) "three" -string(4) "four" -====UNBUFFERED==== -string(3) "one" -string(3) "two" -NULL -NULL -string(5) "three" -string(4) "four" -NULL -NULL -DONE! ---UEXPECT-- -====BUFFERED==== array(2) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_014.phpt b/ext/sqlite/tests/sqlite_014.phpt index 6ecad25e49..0a9de5dbf0 100755 --- a/ext/sqlite/tests/sqlite_014.phpt +++ b/ext/sqlite/tests/sqlite_014.phpt @@ -43,83 +43,6 @@ echo "DONE!\n"; ?> --EXPECTF-- unbuffered twice -array(3) { - [0]=> - array(1) { - [0]=> - string(3) "one" - } - [1]=> - array(1) { - [0]=> - string(3) "two" - } - [2]=> - array(1) { - [0]=> - string(5) "three" - } -} - -Warning: sqlite_fetch_all(): One or more rowsets were already returned; returning NULL this time in %ssqlite_014.php on line %d -array(0) { -} -unbuffered with fetch_array -array(1) { - [0]=> - string(3) "one" -} -array(2) { - [0]=> - array(1) { - [0]=> - string(3) "two" - } - [1]=> - array(1) { - [0]=> - string(5) "three" - } -} -buffered -array(3) { - [0]=> - array(1) { - [0]=> - string(3) "one" - } - [1]=> - array(1) { - [0]=> - string(3) "two" - } - [2]=> - array(1) { - [0]=> - string(5) "three" - } -} -bool(false) -array(3) { - [0]=> - array(1) { - [0]=> - string(3) "one" - } - [1]=> - array(1) { - [0]=> - string(3) "two" - } - [2]=> - array(1) { - [0]=> - string(5) "three" - } -} -DONE! ---UEXPECTF-- -unbuffered twice array(3) { [0]=> array(1) { diff --git a/ext/sqlite/tests/sqlite_015.phpt b/ext/sqlite/tests/sqlite_015.phpt index e78e02cf7a..0611e81ecc 100755 --- a/ext/sqlite/tests/sqlite_015.phpt +++ b/ext/sqlite/tests/sqlite_015.phpt @@ -29,25 +29,6 @@ $db = null; echo "DONE!\n"; ?> --EXPECTF-- -array(3) { - [0]=> - array(1) { - [0]=> - string(3) "one" - } - [1]=> - array(1) { - [0]=> - string(3) "two" - } - [2]=> - array(1) { - [0]=> - string(5) "three" - } -} -DONE! ---UEXPECTF-- array(3) { [0]=> array(1) { diff --git a/ext/sqlite/tests/sqlite_016.phpt b/ext/sqlite/tests/sqlite_016.phpt index 30c2ca7d6d..09fa5a8bd4 100755 --- a/ext/sqlite/tests/sqlite_016.phpt +++ b/ext/sqlite/tests/sqlite_016.phpt @@ -37,14 +37,6 @@ echo "DONE!\n"; ?> --EXPECT-- ====BUFFERED==== -string(3) "one" -string(5) "three" -====UNBUFFERED==== -string(3) "one" -string(5) "three" -DONE! ---UEXPECT-- -====BUFFERED==== unicode(3) "one" unicode(5) "three" ====UNBUFFERED==== diff --git a/ext/sqlite/tests/sqlite_019.phpt b/ext/sqlite/tests/sqlite_019.phpt index f03dac85b2..3afe95f11e 100755 --- a/ext/sqlite/tests/sqlite_019.phpt +++ b/ext/sqlite/tests/sqlite_019.phpt @@ -24,28 +24,6 @@ var_dump(sqlite_single_query($db, "SELECT id FROM test_db WHERE id=5", FALSE)); sqlite_close($db); ?> --EXPECTF-- -string(1) "5" -string(1) "4" -string(5) "5data" -array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" -} - -Warning: sqlite_single_query(): no such table: test in %s on line %d -bool(false) -NULL -array(1) { - [0]=> - string(1) "5" -} ---UEXPECTF-- unicode(1) "5" unicode(1) "4" unicode(5) "5data" diff --git a/ext/sqlite/tests/sqlite_022.phpt b/ext/sqlite/tests/sqlite_022.phpt index 492edbceee..de7c986fc5 100755 --- a/ext/sqlite/tests/sqlite_022.phpt +++ b/ext/sqlite/tests/sqlite_022.phpt @@ -41,67 +41,6 @@ echo "====DONE!====\n"; --EXPECTF-- ====SEEK:-1==== -Warning: sqlite_seek(): row -1 out of range in %ssqlite_022.php on line %d -array(1) { - [0]=> - string(3) "one" -} -====SEEK:0==== -array(1) { - [0]=> - string(3) "one" -} -====SEEK:1==== -array(1) { - [0]=> - string(3) "two" -} -====SEEK:2==== -array(1) { - [0]=> - string(5) "three" -} -====SEEK:3==== - -Warning: sqlite_seek(): row 3 out of range in %ssqlite_022.php on line %d -array(1) { - [0]=> - string(5) "three" -} -====AGAIN==== -====SEEK:-1==== - -Warning: sqlite_seek(): row -1 out of range in %ssqlite_022.php on line %d -array(1) { - [0]=> - string(5) "three" -} -====SEEK:0==== -array(1) { - [0]=> - string(3) "one" -} -====SEEK:1==== -array(1) { - [0]=> - string(3) "two" -} -====SEEK:2==== -array(1) { - [0]=> - string(5) "three" -} -====SEEK:3==== - -Warning: sqlite_seek(): row 3 out of range in %ssqlite_022.php on line %d -array(1) { - [0]=> - string(5) "three" -} -====DONE!==== ---UEXPECTF-- -====SEEK:-1==== - Warning: sqlite_seek(): row -1 out of range in %ssqlite_022.php on line %d array(1) { [0]=> diff --git a/ext/sqlite/tests/sqlite_023.phpt b/ext/sqlite/tests/sqlite_023.phpt index b36eed1815..828d5bae49 100644 --- a/ext/sqlite/tests/sqlite_023.phpt +++ b/ext/sqlite/tests/sqlite_023.phpt @@ -55,56 +55,6 @@ echo "====DONE!====\n"; ?> --EXPECTF-- ====TRAVERSE==== -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -====REVERSE==== -array(1) { - [0]=> - string(5) "three" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(3) "one" -} -====UNBUFFERED==== -====TRAVERSE==== - -Warning: sqlite_rewind(): Cannot rewind an unbuffered result set in %ssqlite_023.php on line %d -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -====REVERSE==== - -Warning: sqlite_prev(): you cannot use sqlite_prev on unbuffered querys in %ssqlite_023.php on line %d -bool(false) - -Warning: sqlite_has_prev(): you cannot use sqlite_has_prev on unbuffered querys in %ssqlite_023.php on line %d -====DONE!==== ---UEXPECTF-- -====TRAVERSE==== array(1) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_024.phpt b/ext/sqlite/tests/sqlite_024.phpt index 0912217737..6302ae375e 100755 --- a/ext/sqlite/tests/sqlite_024.phpt +++ b/ext/sqlite/tests/sqlite_024.phpt @@ -46,37 +46,6 @@ echo "====DONE!====\n"; --EXPECTF-- ====class24==== class24::__construct -object(class24)#%d (1) { - ["a"]=> - string(3) "one" -} -class24::__construct -object(class24)#%d (1) { - ["a"]=> - string(3) "two" -} -class24::__construct -object(class24)#%d (1) { - ["a"]=> - string(5) "three" -} -====stdclass==== -object(stdClass)#%d (1) { - ["a"]=> - string(3) "one" -} -object(stdClass)#%d (1) { - ["a"]=> - string(3) "two" -} -object(stdClass)#%d (1) { - ["a"]=> - string(5) "three" -} -====DONE!==== ---UEXPECTF-- -====class24==== -class24::__construct object(class24)#%d (1) { [u"a"]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_025.phpt b/ext/sqlite/tests/sqlite_025.phpt index a9b7829eea..de9a4e93a1 100755 --- a/ext/sqlite/tests/sqlite_025.phpt +++ b/ext/sqlite/tests/sqlite_025.phpt @@ -24,19 +24,6 @@ while (($obj = sqlite_fetch_object($res))) { sqlite_close($db); ?> --EXPECTF-- -object(stdClass)#1 (1) { - ["a"]=> - string(3) "one" -} -object(stdClass)#2 (1) { - ["a"]=> - string(3) "two" -} -object(stdClass)#1 (1) { - ["a"]=> - string(5) "three" -} ---UEXPECTF-- object(stdClass)#1 (1) { [u"a"]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_026.phpt b/ext/sqlite/tests/sqlite_026.phpt index 5b5c3504ec..ccc8cbd47d 100755 --- a/ext/sqlite/tests/sqlite_026.phpt +++ b/ext/sqlite/tests/sqlite_026.phpt @@ -15,17 +15,6 @@ var_dump(sqlite_fetch_column_types($db, "strings")); sqlite_close($db); ?> --EXPECT-- -array(4) { - ["a"]=> - string(0) "" - ["b"]=> - string(7) "INTEGER" - ["c"]=> - string(11) "VARCHAR(10)" - ["d"]=> - string(0) "" -} ---UEXPECT-- array(4) { [u"a"]=> unicode(0) "" diff --git a/ext/sqlite/tests/sqlite_oo_002.phpt b/ext/sqlite/tests/sqlite_oo_002.phpt index 6ab9996549..7b58234243 100755 --- a/ext/sqlite/tests/sqlite_oo_002.phpt +++ b/ext/sqlite/tests/sqlite_oo_002.phpt @@ -25,29 +25,6 @@ object(SQLiteResult)#%d (0) { } object(SQLiteResult)#%d (0) { } -array(6) { - [0]=> - string(10) "2002-01-02" - ["c1"]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - ["c2"]=> - string(8) "12:49:00" - [2]=> - NULL - ["c3"]=> - NULL -} ---UEXPECTF-- -object(SQLiteDatabase)#%d (0) { -} -object(SQLiteResult)#%d (0) { -} -object(SQLiteResult)#%d (0) { -} -object(SQLiteResult)#%d (0) { -} array(6) { [0]=> unicode(10) "2002-01-02" diff --git a/ext/sqlite/tests/sqlite_oo_003.phpt b/ext/sqlite/tests/sqlite_oo_003.phpt index 00d6465945..fa18daf3f5 100755 --- a/ext/sqlite/tests/sqlite_oo_003.phpt +++ b/ext/sqlite/tests/sqlite_oo_003.phpt @@ -19,37 +19,6 @@ $r = $db->query("SELECT * from foo"); var_dump($r->fetch(SQLITE_ASSOC)); ?> --EXPECT-- -array(6) { - [0]=> - string(10) "2002-01-02" - ["c1"]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - ["c2"]=> - string(8) "12:49:00" - [2]=> - NULL - ["c3"]=> - NULL -} -array(3) { - [0]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - [2]=> - NULL -} -array(3) { - ["c1"]=> - string(10) "2002-01-02" - ["c2"]=> - string(8) "12:49:00" - ["c3"]=> - NULL -} ---UEXPECT-- array(6) { [0]=> unicode(10) "2002-01-02" diff --git a/ext/sqlite/tests/sqlite_oo_008.phpt b/ext/sqlite/tests/sqlite_oo_008.phpt index bdff4fb1b8..5622aeda7c 100755 --- a/ext/sqlite/tests/sqlite_oo_008.phpt +++ b/ext/sqlite/tests/sqlite_oo_008.phpt @@ -28,20 +28,6 @@ while ($row = $r->fetch(SQLITE_NUM)) { echo "DONE!\n"; ?> --EXPECT-- -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -DONE! ---UEXPECT-- array(1) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_oo_009.phpt b/ext/sqlite/tests/sqlite_oo_009.phpt index cbc5f20d83..6da7fafd1a 100755 --- a/ext/sqlite/tests/sqlite_oo_009.phpt +++ b/ext/sqlite/tests/sqlite_oo_009.phpt @@ -28,20 +28,6 @@ while ($row = $r->fetch(SQLITE_NUM)) { echo "DONE!\n"; ?> --EXPECT-- -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -DONE! ---UEXPECT-- array(1) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_oo_010.phpt b/ext/sqlite/tests/sqlite_oo_010.phpt index e2eae2a707..84a1e8a05f 100755 --- a/ext/sqlite/tests/sqlite_oo_010.phpt +++ b/ext/sqlite/tests/sqlite_oo_010.phpt @@ -29,20 +29,6 @@ while ($row = $r->valid()) { echo "DONE!\n"; ?> --EXPECT-- -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -DONE! ---UEXPECT-- array(1) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_oo_011.phpt b/ext/sqlite/tests/sqlite_oo_011.phpt index 53225aa8ce..94a13e2be1 100755 --- a/ext/sqlite/tests/sqlite_oo_011.phpt +++ b/ext/sqlite/tests/sqlite_oo_011.phpt @@ -17,21 +17,6 @@ $r = $db->query("SELECT * from foo, bar", SQLITE_ASSOC); var_dump($r->fetch()); ?> --EXPECT-- -array(6) { - ["foo.c1"]=> - string(1) "1" - ["foo.c2"]=> - string(1) "2" - ["foo.c3"]=> - string(1) "3" - ["bar.c1"]=> - string(1) "4" - ["bar.c2"]=> - string(1) "5" - ["bar.c3"]=> - string(1) "6" -} ---UEXPECT-- array(6) { [u"foo.c1"]=> unicode(1) "1" diff --git a/ext/sqlite/tests/sqlite_oo_012.phpt b/ext/sqlite/tests/sqlite_oo_012.phpt index d6d3a00d0b..ece1673016 100755 --- a/ext/sqlite/tests/sqlite_oo_012.phpt +++ b/ext/sqlite/tests/sqlite_oo_012.phpt @@ -25,16 +25,6 @@ echo "DONE!\n"; ?> --EXPECT-- Buffered -string(3) "foo" -string(3) "bar" -string(3) "baz" -Unbuffered -string(3) "foo" -string(3) "bar" -string(3) "baz" -DONE! ---UEXPECT-- -Buffered unicode(3) "foo" unicode(3) "bar" unicode(3) "baz" diff --git a/ext/sqlite/tests/sqlite_oo_013.phpt b/ext/sqlite/tests/sqlite_oo_013.phpt index 5ecbd2e0c2..4dac4b2d7b 100755 --- a/ext/sqlite/tests/sqlite_oo_013.phpt +++ b/ext/sqlite/tests/sqlite_oo_013.phpt @@ -43,38 +43,6 @@ echo "DONE!\n"; ?> --EXPECT-- ====BUFFERED==== -array(2) { - [0]=> - string(3) "one" - [1]=> - string(3) "two" -} -string(3) "one" -string(3) "two" -string(3) "one" -string(3) "two" -array(2) { - [0]=> - string(5) "three" - [1]=> - string(4) "four" -} -string(5) "three" -string(4) "four" -string(5) "three" -string(4) "four" -====UNBUFFERED==== -string(3) "one" -string(3) "two" -NULL -NULL -string(5) "three" -string(4) "four" -NULL -NULL -DONE! ---UEXPECT-- -====BUFFERED==== array(2) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_oo_014.phpt b/ext/sqlite/tests/sqlite_oo_014.phpt index a1a200dd8b..580179d36d 100755 --- a/ext/sqlite/tests/sqlite_oo_014.phpt +++ b/ext/sqlite/tests/sqlite_oo_014.phpt @@ -41,83 +41,6 @@ echo "DONE!\n"; ?> --EXPECTF-- unbuffered twice -array(3) { - [0]=> - array(1) { - [0]=> - string(3) "one" - } - [1]=> - array(1) { - [0]=> - string(3) "two" - } - [2]=> - array(1) { - [0]=> - string(5) "three" - } -} - -Warning: SQLiteUnbuffered::fetchAll(): One or more rowsets were already returned; returning NULL this time in %ssqlite_oo_014.php on line %d -array(0) { -} -unbuffered with fetch_array -array(1) { - [0]=> - string(3) "one" -} -array(2) { - [0]=> - array(1) { - [0]=> - string(3) "two" - } - [1]=> - array(1) { - [0]=> - string(5) "three" - } -} -buffered -array(3) { - [0]=> - array(1) { - [0]=> - string(3) "one" - } - [1]=> - array(1) { - [0]=> - string(3) "two" - } - [2]=> - array(1) { - [0]=> - string(5) "three" - } -} -bool(false) -array(3) { - [0]=> - array(1) { - [0]=> - string(3) "one" - } - [1]=> - array(1) { - [0]=> - string(3) "two" - } - [2]=> - array(1) { - [0]=> - string(5) "three" - } -} -DONE! ---UEXPECTF-- -unbuffered twice array(3) { [0]=> array(1) { diff --git a/ext/sqlite/tests/sqlite_oo_015.phpt b/ext/sqlite/tests/sqlite_oo_015.phpt index 4359387860..ee58980356 100755 --- a/ext/sqlite/tests/sqlite_oo_015.phpt +++ b/ext/sqlite/tests/sqlite_oo_015.phpt @@ -27,25 +27,6 @@ var_dump($res); echo "DONE!\n"; ?> --EXPECTF-- -array(3) { - [0]=> - array(1) { - [0]=> - string(3) "one" - } - [1]=> - array(1) { - [0]=> - string(3) "two" - } - [2]=> - array(1) { - [0]=> - string(5) "three" - } -} -DONE! ---UEXPECTF-- array(3) { [0]=> array(1) { diff --git a/ext/sqlite/tests/sqlite_oo_016.phpt b/ext/sqlite/tests/sqlite_oo_016.phpt index bad1b65be0..2a970f5a40 100755 --- a/ext/sqlite/tests/sqlite_oo_016.phpt +++ b/ext/sqlite/tests/sqlite_oo_016.phpt @@ -34,14 +34,6 @@ echo "DONE!\n"; ?> --EXPECT-- ====BUFFERED==== -string(3) "one" -string(5) "three" -====UNBUFFERED==== -string(3) "one" -string(5) "three" -DONE! ---UEXPECT-- -====BUFFERED==== unicode(3) "one" unicode(5) "three" ====UNBUFFERED==== diff --git a/ext/sqlite/tests/sqlite_oo_020.phpt b/ext/sqlite/tests/sqlite_oo_020.phpt index 344caccafa..998fe4c169 100755 --- a/ext/sqlite/tests/sqlite_oo_020.phpt +++ b/ext/sqlite/tests/sqlite_oo_020.phpt @@ -51,22 +51,6 @@ echo "DONE!\n"; --EXPECTF-- Message: sqlite_factory() expects at least 1 parameter, 0 given File: %ssqlite_oo_020.php -array(2) { - [0]=> - string(3) "one" - [1]=> - string(3) "two" -} -array(2) { - [0]=> - string(5) "three" - [1]=> - string(4) "four" -} -DONE! ---UEXPECTF-- -Message: sqlite_factory() expects at least 1 parameter, 0 given -File: %ssqlite_oo_020.php array(2) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_oo_021.phpt b/ext/sqlite/tests/sqlite_oo_021.phpt index 34986cfdf7..d0e5fbd578 100755 --- a/ext/sqlite/tests/sqlite_oo_021.phpt +++ b/ext/sqlite/tests/sqlite_oo_021.phpt @@ -24,29 +24,6 @@ var_dump($db->singleQuery("SELECT id FROM test_db WHERE id=5", FALSE)); echo "DONE!\n"; ?> --EXPECTF-- -string(1) "5" -string(1) "4" -string(5) "5data" -array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" -} - -Warning: SQLiteDatabase::singleQuery(): no such table: test in %s on line %d -bool(false) -NULL -array(1) { - [0]=> - string(1) "5" -} -DONE! ---UEXPECTF-- unicode(1) "5" unicode(1) "4" unicode(5) "5data" diff --git a/ext/sqlite/tests/sqlite_oo_022.phpt b/ext/sqlite/tests/sqlite_oo_022.phpt index 902a9a1a4e..b9b38fb120 100755 --- a/ext/sqlite/tests/sqlite_oo_022.phpt +++ b/ext/sqlite/tests/sqlite_oo_022.phpt @@ -38,67 +38,6 @@ echo "====DONE!====\n"; --EXPECTF-- ====SEEK:-1==== -Warning: SQLiteResult::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d -array(1) { - [0]=> - string(3) "one" -} -====SEEK:0==== -array(1) { - [0]=> - string(3) "one" -} -====SEEK:1==== -array(1) { - [0]=> - string(3) "two" -} -====SEEK:2==== -array(1) { - [0]=> - string(5) "three" -} -====SEEK:3==== - -Warning: SQLiteResult::seek(): row 3 out of range in %ssqlite_oo_022.php on line %d -array(1) { - [0]=> - string(5) "three" -} -====AGAIN==== -====SEEK:-1==== - -Warning: SQLiteResult::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d -array(1) { - [0]=> - string(5) "three" -} -====SEEK:0==== -array(1) { - [0]=> - string(3) "one" -} -====SEEK:1==== -array(1) { - [0]=> - string(3) "two" -} -====SEEK:2==== -array(1) { - [0]=> - string(5) "three" -} -====SEEK:3==== - -Warning: SQLiteResult::seek(): row 3 out of range in %ssqlite_oo_022.php on line %d -array(1) { - [0]=> - string(5) "three" -} -====DONE!==== ---UEXPECTF-- -====SEEK:-1==== - Warning: SQLiteResult::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d array(1) { [0]=> diff --git a/ext/sqlite/tests/sqlite_oo_024.phpt b/ext/sqlite/tests/sqlite_oo_024.phpt index ffd8f07b60..145b920f72 100755 --- a/ext/sqlite/tests/sqlite_oo_024.phpt +++ b/ext/sqlite/tests/sqlite_oo_024.phpt @@ -44,37 +44,6 @@ echo "====DONE!====\n"; --EXPECTF-- ====class24==== class24::__construct -object(class24)#%d (1) { - ["a"]=> - string(3) "one" -} -class24::__construct -object(class24)#%d (1) { - ["a"]=> - string(3) "two" -} -class24::__construct -object(class24)#%d (1) { - ["a"]=> - string(5) "three" -} -====stdclass==== -object(stdClass)#%d (1) { - ["a"]=> - string(3) "one" -} -object(stdClass)#%d (1) { - ["a"]=> - string(3) "two" -} -object(stdClass)#%d (1) { - ["a"]=> - string(5) "three" -} -====DONE!==== ---UEXPECTF-- -====class24==== -class24::__construct object(class24)#%d (1) { [u"a"]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_oo_025.phpt b/ext/sqlite/tests/sqlite_oo_025.phpt index c2dd0029e3..7b107cf65a 100755 --- a/ext/sqlite/tests/sqlite_oo_025.phpt +++ b/ext/sqlite/tests/sqlite_oo_025.phpt @@ -49,60 +49,6 @@ echo "DONE!\n"; ?> --EXPECT-- ====UNBUFFERED==== -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -====NO-MORE==== -====DIRECT==== -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -====BUFFERED==== -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -array(1) { - [0]=> - string(3) "one" -} -array(1) { - [0]=> - string(3) "two" -} -array(1) { - [0]=> - string(5) "three" -} -DONE! ---UEXPECT-- -====UNBUFFERED==== array(1) { [0]=> unicode(3) "one" diff --git a/ext/sqlite/tests/sqlite_oo_026.phpt b/ext/sqlite/tests/sqlite_oo_026.phpt index 0385268a67..e0bf601900 100755 --- a/ext/sqlite/tests/sqlite_oo_026.phpt +++ b/ext/sqlite/tests/sqlite_oo_026.phpt @@ -40,22 +40,6 @@ echo "===DONE===\n"; ?> --EXPECT-- ====FOREACH==== -string(3) "one" -string(3) "one" -string(3) "two" -string(3) "two" -string(5) "three" -string(5) "three" -====FOR==== -string(3) "one" -bool(true) -string(3) "two" -bool(true) -string(5) "three" -bool(true) -===DONE=== ---UEXPECT-- -====FOREACH==== unicode(3) "one" unicode(3) "one" unicode(3) "two" diff --git a/ext/sqlite/tests/sqlite_oo_028.phpt b/ext/sqlite/tests/sqlite_oo_028.phpt index d6ee4b75db..be9f4bfd71 100755 --- a/ext/sqlite/tests/sqlite_oo_028.phpt +++ b/ext/sqlite/tests/sqlite_oo_028.phpt @@ -13,17 +13,6 @@ $db->query("INSERT INTO strings VALUES('1', '2', '3', 'abc')"); var_dump($db->fetchColumnTypes("strings")); ?> --EXPECT-- -array(4) { - ["a"]=> - string(0) "" - ["b"]=> - string(7) "INTEGER" - ["c"]=> - string(11) "VARCHAR(10)" - ["d"]=> - string(0) "" -} ---UEXPECT-- array(4) { [u"a"]=> unicode(0) "" diff --git a/ext/sqlite/tests/sqlite_oo_030.phpt b/ext/sqlite/tests/sqlite_oo_030.phpt index 07ce84f9d6..46902306cf 100755 --- a/ext/sqlite/tests/sqlite_oo_030.phpt +++ b/ext/sqlite/tests/sqlite_oo_030.phpt @@ -33,17 +33,6 @@ var_dump($db->singleQuery("select php('foo::bar(\"PHP\")')", 1)); ===DONE=== --EXPECTF-- NULL -string(1) "1" -string(3) "PHP" -NULL -string(1) "1" -string(3) "PHP" - -Warning: SQLiteDatabase::singleQuery(): function `foo::bar("PHP")' is not a function name in %s on line %d -bool(false) -===DONE=== ---UEXPECTF-- -NULL unicode(1) "1" unicode(3) "PHP" NULL diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt index 56b21e240a..9a40fc7421 100644 --- a/ext/sysvshm/tests/005.phpt +++ b/ext/sysvshm/tests/005.phpt @@ -51,37 +51,6 @@ bool(false) Warning: shm_get_var(): variable key -10000 doesn't exist in %s005.php on line %d bool(false) -Warning: shm_get_var() expects parameter 2 to be long, array given in %s005.php on line %d -bool(false) -string(11) "test string" -object(stdClass)#%d (0) { -} -array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) -} -bool(false) -NULL -NULL -Done ---UEXPECTF-- - -Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s005.php on line %d -bool(false) - -Warning: shm_get_var() expects parameter 1 to be resource, integer given in %s005.php on line %d -bool(false) - -Warning: shm_get_var(): variable key 1000 doesn't exist in %s005.php on line %d -bool(false) - -Warning: shm_get_var(): variable key -10000 doesn't exist in %s005.php on line %d -bool(false) - Warning: shm_get_var() expects parameter 2 to be long, array given in %s005.php on line %d bool(false) unicode(11) "test string" diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt index 80638bd762..e0754693b1 100644 --- a/ext/sysvshm/tests/006.phpt +++ b/ext/sysvshm/tests/006.phpt @@ -33,28 +33,6 @@ bool(false) Warning: shm_remove_var() expects parameter 1 to be resource, integer given in %s006.php on line %d bool(false) -Warning: shm_remove_var(): variable key -10 doesn't exist in %s006.php on line %d -bool(false) -string(11) "test string" -bool(true) - -Warning: shm_get_var(): variable key 1 doesn't exist in %s006.php on line %d -bool(false) - -Warning: shm_remove_var(): variable key 1 doesn't exist in %s006.php on line %d -bool(false) - -Warning: shm_get_var(): variable key 1 doesn't exist in %s006.php on line %d -bool(false) -Done ---UEXPECTF-- - -Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s006.php on line %d -bool(false) - -Warning: shm_remove_var() expects parameter 1 to be resource, integer given in %s006.php on line %d -bool(false) - Warning: shm_remove_var(): variable key -10 doesn't exist in %s006.php on line %d bool(false) unicode(11) "test string" diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt index 0fb9cfc2c6..2b6f00a1df 100644 --- a/ext/sysvshm/tests/007.phpt +++ b/ext/sysvshm/tests/007.phpt @@ -32,25 +32,6 @@ bool(false) Warning: shm_remove() expects parameter 1 to be resource, integer given in %s007.php on line %d bool(false) -Warning: shm_remove() expects parameter 1 to be resource, string given in %s007.php on line %d -bool(false) -bool(true) -bool(true) - -Warning: shm_remove(): %d is not a valid sysvshm resource in %s007.php on line %d -bool(false) -Done ---UEXPECTF-- - -Warning: shm_remove() expects exactly 1 parameter, 0 given in %s007.php on line %d -bool(false) - -Warning: shm_remove() expects parameter 1 to be resource, integer given in %s007.php on line %d -bool(false) - -Warning: shm_remove() expects parameter 1 to be resource, integer given in %s007.php on line %d -bool(false) - Warning: shm_remove() expects parameter 1 to be resource, Unicode string given in %s007.php on line %d bool(false) bool(true) diff --git a/ext/tidy/tests/007.phpt b/ext/tidy/tests/007.phpt index fb3b1fece6..cc152076e4 100644 --- a/ext/tidy/tests/007.phpt +++ b/ext/tidy/tests/007.phpt @@ -20,16 +20,6 @@ unicode.script_encoding=latin1 ?> --EXPECTF-- Current Value of 'tidy-mark': bool(false) -Current Value of 'error-file': string(0) "" -Current Value of 'tab-size': int(8) - -Warning: tidy::getOpt(): Unknown Tidy Configuration Option 'bogus-opt' in %s007.php on line 10 -bool(false) - -Warning: tidy_getopt(): Unknown Tidy Configuration Option 'non-ASCII string àáç' in %s007.php on line 11 -bool(false) ---UEXPECTF-- -Current Value of 'tidy-mark': bool(false) Current Value of 'error-file': unicode(0) "" Current Value of 'tab-size': int(8) diff --git a/ext/tidy/tests/010.phpt b/ext/tidy/tests/010.phpt index 0a68fc649c..e01ea33e5e 100644 --- a/ext/tidy/tests/010.phpt +++ b/ext/tidy/tests/010.phpt @@ -12,310 +12,6 @@ Accessing root, body, html, and head nodes.. ?> --EXPECT-- -object(tidyNode)#2 (8) { - ["value"]=> - string(94) " - - - - - -" - ["name"]=> - string(0) "" - ["type"]=> - int(0) - ["line"]=> - int(1) - ["column"]=> - int(1) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - array(1) { - [0]=> - &object(tidyNode)#3 (9) { - ["value"]=> - string(94) " - - - - - -" - ["name"]=> - string(4) "html" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(1) - ["proprietary"]=> - bool(false) - ["id"]=> - int(48) - ["attribute"]=> - NULL - ["child"]=> - array(2) { - [0]=> - &object(tidyNode)#4 (9) { - ["value"]=> - string(31) " - - -" - ["name"]=> - string(4) "head" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(7) - ["proprietary"]=> - bool(false) - ["id"]=> - int(46) - ["attribute"]=> - NULL - ["child"]=> - array(1) { - [0]=> - &object(tidyNode)#5 (9) { - ["value"]=> - string(16) " -" - ["name"]=> - string(5) "title" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(57) - ["proprietary"]=> - bool(false) - ["id"]=> - int(111) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - } - } - [1]=> - &object(tidyNode)#6 (9) { - ["value"]=> - string(49) " - -" - ["name"]=> - string(4) "body" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(7) - ["proprietary"]=> - bool(false) - ["id"]=> - int(16) - ["attribute"]=> - array(2) { - ["bgcolor"]=> - string(7) "#FFFFFF" - ["alink"]=> - string(7) "#000000" - } - ["child"]=> - NULL - } - } - } - } -} -object(tidyNode)#2 (9) { - ["value"]=> - string(49) " - -" - ["name"]=> - string(4) "body" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(7) - ["proprietary"]=> - bool(false) - ["id"]=> - int(16) - ["attribute"]=> - array(2) { - ["bgcolor"]=> - string(7) "#FFFFFF" - ["alink"]=> - string(7) "#000000" - } - ["child"]=> - NULL -} -object(tidyNode)#2 (9) { - ["value"]=> - string(94) " - - - - - -" - ["name"]=> - string(4) "html" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(1) - ["proprietary"]=> - bool(false) - ["id"]=> - int(48) - ["attribute"]=> - NULL - ["child"]=> - array(2) { - [0]=> - &object(tidyNode)#3 (9) { - ["value"]=> - string(31) " - - -" - ["name"]=> - string(4) "head" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(7) - ["proprietary"]=> - bool(false) - ["id"]=> - int(46) - ["attribute"]=> - NULL - ["child"]=> - array(1) { - [0]=> - &object(tidyNode)#6 (9) { - ["value"]=> - string(16) " -" - ["name"]=> - string(5) "title" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(57) - ["proprietary"]=> - bool(false) - ["id"]=> - int(111) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - } - } - [1]=> - &object(tidyNode)#4 (9) { - ["value"]=> - string(49) " - -" - ["name"]=> - string(4) "body" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(7) - ["proprietary"]=> - bool(false) - ["id"]=> - int(16) - ["attribute"]=> - array(2) { - ["bgcolor"]=> - string(7) "#FFFFFF" - ["alink"]=> - string(7) "#000000" - } - ["child"]=> - NULL - } - } -} -object(tidyNode)#2 (9) { - ["value"]=> - string(31) " - - -" - ["name"]=> - string(4) "head" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(7) - ["proprietary"]=> - bool(false) - ["id"]=> - int(46) - ["attribute"]=> - NULL - ["child"]=> - array(1) { - [0]=> - &object(tidyNode)#4 (9) { - ["value"]=> - string(16) " -" - ["name"]=> - string(5) "title" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(57) - ["proprietary"]=> - bool(false) - ["id"]=> - int(111) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - } -} ---UEXPECT-- object(tidyNode)#2 (8) { [u"value"]=> unicode(94) " diff --git a/ext/tidy/tests/011.phpt b/ext/tidy/tests/011.phpt index d576a4764a..15f9f9c36c 100644 --- a/ext/tidy/tests/011.phpt +++ b/ext/tidy/tests/011.phpt @@ -12,15 +12,6 @@ Accessing attributes of a node } ?> --EXPECT-- -array(2) { - ["bgcolor"]=> - string(7) "#FFFFFF" - ["alink"]=> - string(7) "#000000" -} -Attrib 'bgcolor': #FFFFFF -Attrib 'alink': #000000 ---UEXPECT-- array(2) { [u"bgcolor"]=> unicode(7) "#FFFFFF" diff --git a/ext/tidy/tests/012.phpt b/ext/tidy/tests/012.phpt index 61e525e8e3..dcdab65758 100644 --- a/ext/tidy/tests/012.phpt +++ b/ext/tidy/tests/012.phpt @@ -32,447 +32,6 @@ Accessing children nodes ?> --EXPECT-- bool(true) -object(tidyNode)#3 (9) { - ["value"]=> - string(31) " - - -" - ["name"]=> - string(4) "head" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(7) - ["proprietary"]=> - bool(false) - ["id"]=> - int(46) - ["attribute"]=> - NULL - ["child"]=> - array(1) { - [0]=> - &object(tidyNode)#4 (9) { - ["value"]=> - string(16) " -" - ["name"]=> - string(5) "title" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(87) - ["proprietary"]=> - bool(false) - ["id"]=> - int(111) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - } -} -bool(true) -object(tidyNode)#4 (9) { - ["value"]=> - string(16) " -" - ["name"]=> - string(5) "title" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(87) - ["proprietary"]=> - bool(false) - ["id"]=> - int(111) - ["attribute"]=> - NULL - ["child"]=> - NULL -} -object(tidyNode)#5 (9) { - ["value"]=> - string(80) " -HiByeTest - -" - ["name"]=> - string(4) "body" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(7) - ["proprietary"]=> - bool(false) - ["id"]=> - int(16) - ["attribute"]=> - array(2) { - ["bgcolor"]=> - string(7) "#FFFFFF" - ["alink"]=> - string(7) "#000000" - } - ["child"]=> - array(2) { - [0]=> - &object(tidyNode)#6 (9) { - ["value"]=> - string(9) "Hi" - ["name"]=> - string(1) "b" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(43) - ["proprietary"]=> - bool(false) - ["id"]=> - int(8) - ["attribute"]=> - NULL - ["child"]=> - array(1) { - [0]=> - &object(tidyNode)#7 (8) { - ["value"]=> - string(2) "Hi" - ["name"]=> - string(0) "" - ["type"]=> - int(4) - ["line"]=> - int(1) - ["column"]=> - int(46) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - } - } - [1]=> - &object(tidyNode)#8 (9) { - ["value"]=> - string(21) "ByeTest" - ["name"]=> - string(1) "i" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(52) - ["proprietary"]=> - bool(false) - ["id"]=> - int(49) - ["attribute"]=> - NULL - ["child"]=> - array(2) { - [0]=> - &object(tidyNode)#9 (8) { - ["value"]=> - string(3) "Bye" - ["name"]=> - string(0) "" - ["type"]=> - int(4) - ["line"]=> - int(1) - ["column"]=> - int(55) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - [1]=> - &object(tidyNode)#10 (9) { - ["value"]=> - string(11) "Test" - ["name"]=> - string(1) "u" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(58) - ["proprietary"]=> - bool(false) - ["id"]=> - int(114) - ["attribute"]=> - NULL - ["child"]=> - array(1) { - [0]=> - &object(tidyNode)#11 (8) { - ["value"]=> - string(4) "Test" - ["name"]=> - string(0) "" - ["type"]=> - int(4) - ["line"]=> - int(1) - ["column"]=> - int(61) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - } - } - } - } - } -} -bool(true) -object(tidyNode)#6 (9) { - ["value"]=> - string(9) "Hi" - ["name"]=> - string(1) "b" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(43) - ["proprietary"]=> - bool(false) - ["id"]=> - int(8) - ["attribute"]=> - NULL - ["child"]=> - array(1) { - [0]=> - &object(tidyNode)#7 (8) { - ["value"]=> - string(2) "Hi" - ["name"]=> - string(0) "" - ["type"]=> - int(4) - ["line"]=> - int(1) - ["column"]=> - int(46) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - } -} -bool(true) -object(tidyNode)#7 (8) { - ["value"]=> - string(2) "Hi" - ["name"]=> - string(0) "" - ["type"]=> - int(4) - ["line"]=> - int(1) - ["column"]=> - int(46) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - NULL -} -object(tidyNode)#8 (9) { - ["value"]=> - string(21) "ByeTest" - ["name"]=> - string(1) "i" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(52) - ["proprietary"]=> - bool(false) - ["id"]=> - int(49) - ["attribute"]=> - NULL - ["child"]=> - array(2) { - [0]=> - &object(tidyNode)#9 (8) { - ["value"]=> - string(3) "Bye" - ["name"]=> - string(0) "" - ["type"]=> - int(4) - ["line"]=> - int(1) - ["column"]=> - int(55) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - [1]=> - &object(tidyNode)#10 (9) { - ["value"]=> - string(11) "Test" - ["name"]=> - string(1) "u" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(58) - ["proprietary"]=> - bool(false) - ["id"]=> - int(114) - ["attribute"]=> - NULL - ["child"]=> - array(1) { - [0]=> - &object(tidyNode)#11 (8) { - ["value"]=> - string(4) "Test" - ["name"]=> - string(0) "" - ["type"]=> - int(4) - ["line"]=> - int(1) - ["column"]=> - int(61) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - } - } - } -} -bool(true) -object(tidyNode)#9 (8) { - ["value"]=> - string(3) "Bye" - ["name"]=> - string(0) "" - ["type"]=> - int(4) - ["line"]=> - int(1) - ["column"]=> - int(55) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - NULL -} -object(tidyNode)#10 (9) { - ["value"]=> - string(11) "Test" - ["name"]=> - string(1) "u" - ["type"]=> - int(5) - ["line"]=> - int(1) - ["column"]=> - int(58) - ["proprietary"]=> - bool(false) - ["id"]=> - int(114) - ["attribute"]=> - NULL - ["child"]=> - array(1) { - [0]=> - &object(tidyNode)#11 (8) { - ["value"]=> - string(4) "Test" - ["name"]=> - string(0) "" - ["type"]=> - int(4) - ["line"]=> - int(1) - ["column"]=> - int(61) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - NULL - } - } -} -bool(true) -object(tidyNode)#11 (8) { - ["value"]=> - string(4) "Test" - ["name"]=> - string(0) "" - ["type"]=> - int(4) - ["line"]=> - int(1) - ["column"]=> - int(61) - ["proprietary"]=> - bool(false) - ["attribute"]=> - NULL - ["child"]=> - NULL -} ---UEXPECT-- -bool(true) object(tidyNode)#3 (9) { [u"value"]=> unicode(31) " diff --git a/ext/tidy/tests/019.phpt b/ext/tidy/tests/019.phpt index 5f6bab4f98..fedca2a709 100644 --- a/ext/tidy/tests/019.phpt +++ b/ext/tidy/tests/019.phpt @@ -22,21 +22,6 @@ tidy_repair_file($a, $a, $a, $a); echo "Done\n"; ?> --EXPECTF-- -Warning: tidy_repair_string(): Could not load configuration file '1' in %s on line %d - -Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d - -Warning: tidy_repair_string(): Could not load configuration file '' in %s on line %d - -Warning: tidy_repair_string(): Could not load configuration file '1' in %s on line %d - -Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d - -Warning: tidy_repair_string() expects parameter 1 to be string, array given in %s on line %d - -Warning: tidy_repair_file() expects parameter 1 to be string, array given in %s on line %d -Done ---UEXPECTF-- Warning: tidy_repair_string(): Could not load configuration file '1' in %s019.php on line 7 Warning: tidy_repair_string(): Could not set encoding '1' in %s019.php on line 7 diff --git a/ext/tidy/tests/021.phpt b/ext/tidy/tests/021.phpt index 6e222cb80e..56c7748494 100644 --- a/ext/tidy/tests/021.phpt +++ b/ext/tidy/tests/021.phpt @@ -14,10 +14,5 @@ var_dump(strlen(tidy_get_opt_doc($t, 'wrap')) > 99); --EXPECTF-- Warning: tidy_get_opt_doc(): Unknown Tidy Configuration Option 'some_bogus_cfg' in %s021.php on line 3 bool(false) -string(73) "This option specifies if Tidy should allow numeric character references. " -bool(true) ---UEXPECTF-- -Warning: tidy_get_opt_doc(): Unknown Tidy Configuration Option 'some_bogus_cfg' in %s021.php on line 3 -bool(false) unicode(73) "This option specifies if Tidy should allow numeric character references. " bool(true) diff --git a/ext/tidy/tests/022.phpt b/ext/tidy/tests/022.phpt index a644ec1c5a..af20e37e63 100644 --- a/ext/tidy/tests/022.phpt +++ b/ext/tidy/tests/022.phpt @@ -21,22 +21,7 @@ tidy_repair_file($a, $a, $a, $a); echo "Done\n"; ?> ---EXPECTF-- -Warning: tidy_repair_string(): Could not load configuration file '1' in %s on line %d - -Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d - -Warning: tidy_repair_string(): Could not load configuration file '' in %s on line %d - -Warning: tidy_repair_string(): Could not load configuration file '1' in %s on line %d - -Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d - -Warning: tidy_repair_string() expects parameter 1 to be string, array given in %s on line %d - -Warning: tidy_repair_file() expects parameter 1 to be string, array given in %s on line %d -Done ---UEXPECTF-- +--EXPECTF-- Warning: tidy_repair_string(): Could not load configuration file '1' in %s on line %d Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d diff --git a/ext/tidy/tests/023.phpt b/ext/tidy/tests/023.phpt index dd33b78368..fd299f9cfe 100644 --- a/ext/tidy/tests/023.phpt +++ b/ext/tidy/tests/023.phpt @@ -32,24 +32,6 @@ var_dump(tidy_get_root($tidy)->child[0]->child[0]->hasChildren()); --EXPECT-- object(tidyNode)#1 (0) { } -object(tidy)#1 (2) { - ["errorBuffer"]=> - NULL - ["value"]=> - NULL -} -------- -bool(false) -bool(true) -bool(true) -bool(false) -bool(false) -bool(true) -bool(true) -bool(false) ---UEXPECT-- -object(tidyNode)#1 (0) { -} object(tidy)#1 (2) { [u"errorBuffer"]=> NULL diff --git a/ext/tidy/tests/025.phpt b/ext/tidy/tests/025.phpt index 335aeef4ff..66e47e4a87 100644 --- a/ext/tidy/tests/025.phpt +++ b/ext/tidy/tests/025.phpt @@ -38,21 +38,6 @@ bool(false) bool(false) bool(false) bool(false) -string(0) "" -bool(true) -bool(true) -bool(true) -bool(true) -string(16) "" -bool(true) -float(0) -int(0) -bool(true) ---UEXPECT-- -bool(false) -bool(false) -bool(false) -bool(false) unicode(0) "" bool(true) bool(true) diff --git a/ext/tidy/tests/027.phpt b/ext/tidy/tests/027.phpt index 8fef13720f..f0065d23e1 100644 --- a/ext/tidy/tests/027.phpt +++ b/ext/tidy/tests/027.phpt @@ -56,6 +56,4 @@ $instance->run(); ?> --EXPECT-- -string(0) "" ---UEXPECT-- unicode(0) "" diff --git a/ext/tidy/tests/028.phpt b/ext/tidy/tests/028.phpt index 0c3928c7a7..0a972601ca 100644 --- a/ext/tidy/tests/028.phpt +++ b/ext/tidy/tests/028.phpt @@ -10,10 +10,6 @@ var_dump($x->body()->child[0]->getParent()->name); var_dump($x->root()->getParent()); ?> --EXPECT-- -string(3) "div" -string(4) "body" -NULL ---UEXPECT-- unicode(3) "div" unicode(4) "body" NULL diff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt index 7bac6b96e5..c1c1625ef5 100644 --- a/ext/tokenizer/tests/001.phpt +++ b/ext/tokenizer/tests/001.phpt @@ -130,134 +130,7 @@ echo token_name(array()), "\n"; echo "Done\n"; ?> ---EXPECTF-- -T_INCLUDE -T_INCLUDE_ONCE -T_EVAL -T_REQUIRE -T_REQUIRE_ONCE -T_LOGICAL_OR -T_LOGICAL_XOR -T_LOGICAL_AND -T_PRINT -T_PLUS_EQUAL -T_MINUS_EQUAL -T_MUL_EQUAL -T_DIV_EQUAL -T_CONCAT_EQUAL -T_MOD_EQUAL -T_AND_EQUAL -T_OR_EQUAL -T_XOR_EQUAL -T_SL_EQUAL -T_SR_EQUAL -T_BOOLEAN_OR -T_BOOLEAN_AND -T_IS_EQUAL -T_IS_NOT_EQUAL -T_IS_IDENTICAL -T_IS_NOT_IDENTICAL -T_IS_SMALLER_OR_EQUAL -T_IS_GREATER_OR_EQUAL -T_SL -T_SR -T_INC -T_DEC -T_INT_CAST -T_DOUBLE_CAST -T_STRING_CAST -T_ARRAY_CAST -T_OBJECT_CAST -T_BOOL_CAST -T_UNSET_CAST -T_NEW -T_EXIT -T_IF -T_ELSEIF -T_ELSE -T_ENDIF -T_LNUMBER -T_DNUMBER -T_STRING -T_STRING_VARNAME -T_VARIABLE -T_NUM_STRING -T_INLINE_HTML -T_ENCAPSED_AND_WHITESPACE -T_CONSTANT_ENCAPSED_STRING -T_ECHO -T_DO -T_WHILE -T_ENDWHILE -T_FOR -T_ENDFOR -T_FOREACH -T_ENDFOREACH -T_DECLARE -T_ENDDECLARE -T_AS -T_SWITCH -T_ENDSWITCH -T_CASE -T_DEFAULT -T_BREAK -T_CONTINUE -T_FUNCTION -T_CONST -T_RETURN -T_USE -T_GLOBAL -T_STATIC -T_VAR -T_UNSET -T_ISSET -T_EMPTY -T_CLASS -T_EXTENDS -T_INTERFACE -T_IMPLEMENTS -T_OBJECT_OPERATOR -T_DOUBLE_ARROW -T_LIST -T_ARRAY -T_CLASS_C -T_FUNC_C -T_METHOD_C -T_LINE -T_FILE -T_COMMENT -T_DOC_COMMENT -T_OPEN_TAG -T_OPEN_TAG_WITH_ECHO -T_CLOSE_TAG -T_WHITESPACE -T_START_HEREDOC -T_END_HEREDOC -T_DOLLAR_OPEN_CURLY_BRACES -T_CURLY_OPEN -T_DOUBLE_COLON -T_DOUBLE_COLON -T_ABSTRACT -T_CATCH -T_FINAL -T_INSTANCEOF -T_PRIVATE -T_PROTECTED -T_PUBLIC -T_THROW -T_TRY -T_CLONE -T_HALT_COMPILER -UNKNOWN -UNKNOWN - -Warning: token_name() expects parameter 1 to be long, string given in %s on line %d - - -Warning: token_name() expects parameter 1 to be long, array given in %s on line %d - -Done ---UEXPECTF-- +--EXPECTF-- T_INCLUDE T_INCLUDE_ONCE T_EVAL diff --git a/ext/tokenizer/tests/003.phpt b/ext/tokenizer/tests/003.phpt index 780983410b..034c142c48 100644 --- a/ext/tokenizer/tests/003.phpt +++ b/ext/tokenizer/tests/003.phpt @@ -13,38 +13,7 @@ var_dump(token_get_all(-1)); echo "Done\n"; ?> ---EXPECTF-- -Warning: token_get_all() expects parameter 1 to be string, array given in %s on line %d -NULL - -Warning: token_get_all() expects parameter 1 to be string, object given in %s on line %d -NULL -array(0) { -} -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(1) "0" - [2]=> - int(1) - } -} -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(2) "-1" - [2]=> - int(1) - } -} -Done ---UEXPECTF-- +--EXPECTF-- Warning: token_get_all() expects parameter 1 to be binary string, array given in %s on line %d NULL diff --git a/ext/tokenizer/tests/bug26463.phpt b/ext/tokenizer/tests/bug26463.phpt index de32769617..d07476b204 100644 --- a/ext/tokenizer/tests/bug26463.phpt +++ b/ext/tokenizer/tests/bug26463.phpt @@ -162,150 +162,3 @@ array(19) { int(9) } } ---UEXPECTF-- -array(19) { - [0]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(2) "$x" - [2]=> - int(2) - } - [2]=> - string(1) "=" - [3]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(6) "<<
- int(2) - } - [4]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(13) "jhdsjkfhjdsh -" - [2]=> - int(3) - } - [5]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(2) "DD" - [2]=> - int(4) - } - [6]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(1) " -" - [2]=> - int(4) - } - [7]=> - string(1) "." - [8]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(2) """" - [2]=> - int(5) - } - [9]=> - string(1) ";" - [10]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(1) " -" - [2]=> - int(5) - } - [11]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(2) "$a" - [2]=> - int(6) - } - [12]=> - string(1) "=" - [13]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(8) "<< - int(6) - } - [14]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(13) "jhdsjkfhjdsh -" - [2]=> - int(7) - } - [15]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(4) "DDDD" - [2]=> - int(8) - } - [16]=> - string(1) ";" - [17]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(1) " -" - [2]=> - int(8) - } - [18]=> - array(3) { - [0]=> - int(%d) - [1]=> - string(2) "?>" - [2]=> - int(9) - } -} diff --git a/ext/tokenizer/tests/token_get_all_basic.phpt b/ext/tokenizer/tests/token_get_all_basic.phpt index 32e21f9c0f..e60afbc8b9 100644 --- a/ext/tokenizer/tests/token_get_all_basic.phpt +++ b/ext/tokenizer/tests/token_get_all_basic.phpt @@ -95,77 +95,3 @@ array(1) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : basic functionality *** --- source string with PHP open and close tags -- -array(7) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - array(3) { - [0]=> - int(317) - [1]=> - string(13) ""Hello World"" - [2]=> - int(1) - } - [4]=> - string(1) ";" - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- source string without PHP open and close tags -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(19) "echo 'Hello World';" - [2]=> - int(1) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_error.phpt b/ext/tokenizer/tests/token_get_all_error.phpt index 798bfaf4ab..1368c14d8f 100644 --- a/ext/tokenizer/tests/token_get_all_error.phpt +++ b/ext/tokenizer/tests/token_get_all_error.phpt @@ -32,14 +32,3 @@ NULL Warning: token_get_all() expects exactly 1 parameter, 2 given in %s on line %d NULL Done ---UEXPECTF-- -*** Testing token_get_all() : error conditions *** --- Testing token_get_all() function with zero arguments -- - -Warning: token_get_all() expects exactly 1 parameter, 0 given in %s on line %d -NULL --- Testing token_get_all() function with more than expected no. of arguments -- - -Warning: token_get_all() expects exactly 1 parameter, 2 given in %s on line %d -NULL -Done diff --git a/ext/tokenizer/tests/token_get_all_variation1.phpt b/ext/tokenizer/tests/token_get_all_variation1.phpt index fc4250abd2..1dca1c4a5f 100644 --- a/ext/tokenizer/tests/token_get_all_variation1.phpt +++ b/ext/tokenizer/tests/token_get_all_variation1.phpt @@ -200,201 +200,6 @@ array(1) { } --Iteration 10 -- -Warning: token_get_all() expects parameter 1 to be string, array given in %s on line %d -NULL ---Iteration 11 -- - -Warning: token_get_all() expects parameter 1 to be string, array given in %s on line %d -NULL ---Iteration 12 -- - -Warning: token_get_all() expects parameter 1 to be string, array given in %s on line %d -NULL ---Iteration 13 -- - -Warning: token_get_all() expects parameter 1 to be string, array given in %s on line %d -NULL ---Iteration 14 -- - -Warning: token_get_all() expects parameter 1 to be string, array given in %s on line %d -NULL ---Iteration 15 -- -array(0) { -} ---Iteration 16 -- -array(0) { -} ---Iteration 17 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(1) "1" - [2]=> - int(1) - } -} ---Iteration 18 -- -array(0) { -} ---Iteration 19 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(1) "1" - [2]=> - int(1) - } -} ---Iteration 20 -- -array(0) { -} ---Iteration 21 -- -array(0) { -} ---Iteration 22 -- -array(0) { -} ---Iteration 23 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(6) "object" - [2]=> - int(1) - } -} ---Iteration 24 -- - -Warning: token_get_all() expects parameter 1 to be string, resource given in %s on line %d -NULL ---Iteration 25 -- -array(0) { -} ---Iteration 26 -- -array(0) { -} -Done ---UEXPECTF-- -*** Testing token_get_all() : unexpected values for 'source' argument *** ---Iteration 1 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(1) "0" - [2]=> - int(1) - } -} ---Iteration 2 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(1) "1" - [2]=> - int(1) - } -} ---Iteration 3 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(5) "12345" - [2]=> - int(1) - } -} ---Iteration 4 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(5) "-2345" - [2]=> - int(1) - } -} ---Iteration 5 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(4) "10.5" - [2]=> - int(1) - } -} ---Iteration 6 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(5) "-10.5" - [2]=> - int(1) - } -} ---Iteration 7 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(10) "1012345670" - [2]=> - int(1) - } -} ---Iteration 8 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(13) "1.07654321E-7" - [2]=> - int(1) - } -} ---Iteration 9 -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(3) "0.5" - [2]=> - int(1) - } -} ---Iteration 10 -- - Warning: token_get_all() expects parameter 1 to be binary string, array given in %s on line %d NULL --Iteration 11 -- diff --git a/ext/tokenizer/tests/token_get_all_variation10.phpt b/ext/tokenizer/tests/token_get_all_variation10.phpt index a042390294..2ccb71fb4b 100644 --- a/ext/tokenizer/tests/token_get_all_variation10.phpt +++ b/ext/tokenizer/tests/token_get_all_variation10.phpt @@ -779,737 +779,3 @@ array(13) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : 'source' string with different constants *** --- Iteration 1 -- -array(24) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - string(1) "+" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(307) - [1]=> - string(3) "034" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [13]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [14]=> - string(1) "=" - [15]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [16]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [17]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [18]=> - string(1) "+" - [19]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [20]=> - array(3) { - [0]=> - int(307) - [1]=> - string(4) "0x3F" - [2]=> - int(1) - } - [21]=> - string(1) ";" - [22]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [23]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 2 -- -array(17) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(308) - [1]=> - string(7) "0.23E-2" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - string(1) "+" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(308) - [1]=> - string(6) "0.43e2" - [2]=> - int(1) - } - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [11]=> - string(1) "+" - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [13]=> - array(3) { - [0]=> - int(308) - [1]=> - string(3) "0.5" - [2]=> - int(1) - } - [14]=> - string(1) ";" - [15]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [16]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 3 -- -array(11) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(317) - [1]=> - string(8) ""hello "" - [2]=> - int(1) - } - [6]=> - string(1) "." - [7]=> - array(3) { - [0]=> - int(317) - [1]=> - string(7) "'world'" - [2]=> - int(1) - } - [8]=> - string(1) ";" - [9]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [10]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 4 -- -array(18) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - string(1) "(" - [6]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [7]=> - string(1) ")" - [8]=> - string(1) "?" - [9]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [10]=> - array(3) { - [0]=> - int(309) - [1]=> - string(4) "true" - [2]=> - int(1) - } - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - string(1) ":" - [13]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [14]=> - array(3) { - [0]=> - int(309) - [1]=> - string(5) "false" - [2]=> - int(1) - } - [15]=> - string(1) ";" - [16]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [17]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 5 -- -array(18) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - string(1) "(" - [6]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [7]=> - string(1) ")" - [8]=> - string(1) "?" - [9]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [10]=> - array(3) { - [0]=> - int(309) - [1]=> - string(5) "FALSE" - [2]=> - int(1) - } - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - string(1) ":" - [13]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [14]=> - array(3) { - [0]=> - int(309) - [1]=> - string(4) "TRUE" - [2]=> - int(1) - } - [15]=> - string(1) ";" - [16]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [17]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 6 -- -array(13) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(309) - [1]=> - string(4) "null" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - string(1) "|" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(309) - [1]=> - string(4) "NULL" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation11.phpt b/ext/tokenizer/tests/token_get_all_variation11.phpt index e0f6a42bd6..ec93e7df81 100644 --- a/ext/tokenizer/tests/token_get_all_variation11.phpt +++ b/ext/tokenizer/tests/token_get_all_variation11.phpt @@ -1145,1075 +1145,3 @@ array(23) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : for control structure tokens *** --- with if..elseif..else..tokens -- -array(49) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(303) - [1]=> - string(2) "if" - [2]=> - int(2) - } - [3]=> - string(1) "(" - [4]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(2) - } - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [6]=> - array(3) { - [0]=> - int(283) - [1]=> - string(2) "==" - [2]=> - int(2) - } - [7]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [8]=> - array(3) { - [0]=> - int(309) - [1]=> - string(4) "true" - [2]=> - int(2) - } - [9]=> - string(1) ")" - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [11]=> - string(1) "{" - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(6) " - " - [2]=> - int(2) - } - [13]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(3) - } - [14]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [15]=> - string(1) """ - [16]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(3) - } - [17]=> - array(3) { - [0]=> - int(316) - [1]=> - string(7) " = true" - [2]=> - int(3) - } - [18]=> - string(1) """ - [19]=> - string(1) ";" - [20]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(3) - } - [21]=> - string(1) "}" - [22]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(4) - } - [23]=> - array(3) { - [0]=> - int(304) - [1]=> - string(6) "elseif" - [2]=> - int(5) - } - [24]=> - string(1) "(" - [25]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(5) - } - [26]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [27]=> - array(3) { - [0]=> - int(283) - [1]=> - string(2) "==" - [2]=> - int(5) - } - [28]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [29]=> - array(3) { - [0]=> - int(309) - [1]=> - string(5) "false" - [2]=> - int(5) - } - [30]=> - string(1) ")" - [31]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [32]=> - string(1) "{" - [33]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(5) - } - [34]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(6) - } - [35]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [36]=> - array(3) { - [0]=> - int(309) - [1]=> - string(5) "false" - [2]=> - int(6) - } - [37]=> - string(1) ";" - [38]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(6) - } - [39]=> - string(1) "}" - [40]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(7) - } - [41]=> - array(3) { - [0]=> - int(305) - [1]=> - string(4) "else" - [2]=> - int(8) - } - [42]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(8) - } - [43]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(9) - } - [44]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [45]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(9) - } - [46]=> - string(1) ";" - [47]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(9) - } - [48]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(10) - } -} --- with while..., do..while, switch & continue tokens -- -array(33) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(320) - [1]=> - string(5) "while" - [2]=> - int(1) - } - [2]=> - string(1) "(" - [3]=> - array(3) { - [0]=> - int(309) - [1]=> - string(4) "true" - [2]=> - int(1) - } - [4]=> - string(1) ")" - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [6]=> - string(1) "{" - [7]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [8]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(2) - } - [9]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [10]=> - array(3) { - [0]=> - int(317) - [1]=> - string(6) "'True'" - [2]=> - int(2) - } - [11]=> - string(1) ";" - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [13]=> - array(3) { - [0]=> - int(333) - [1]=> - string(5) "break" - [2]=> - int(3) - } - [14]=> - string(1) ";" - [15]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(3) - } - [16]=> - string(1) "}" - [17]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(4) - } - [18]=> - array(3) { - [0]=> - int(319) - [1]=> - string(2) "do" - [2]=> - int(5) - } - [19]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [20]=> - string(1) "{" - [21]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(5) - } - [22]=> - array(3) { - [0]=> - int(334) - [1]=> - string(8) "continue" - [2]=> - int(6) - } - [23]=> - string(1) ";" - [24]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(6) - } - [25]=> - string(1) "}" - [26]=> - array(3) { - [0]=> - int(320) - [1]=> - string(5) "while" - [2]=> - int(7) - } - [27]=> - string(1) "(" - [28]=> - array(3) { - [0]=> - int(309) - [1]=> - string(5) "false" - [2]=> - int(7) - } - [29]=> - string(1) ")" - [30]=> - string(1) ";" - [31]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(7) - } - [32]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(7) - } -} --- with for..foreach( as ) tokens -- -array(45) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(322) - [1]=> - string(3) "for" - [2]=> - int(1) - } - [2]=> - string(1) "(" - [3]=> - array(3) { - [0]=> - int(311) - [1]=> - string(6) "$count" - [2]=> - int(1) - } - [4]=> - string(1) "=" - [5]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "0" - [2]=> - int(1) - } - [6]=> - string(1) ";" - [7]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [8]=> - array(3) { - [0]=> - int(311) - [1]=> - string(6) "$count" - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [10]=> - string(1) "<" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "5" - [2]=> - int(1) - } - [13]=> - string(1) ";" - [14]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [15]=> - array(3) { - [0]=> - int(311) - [1]=> - string(6) "$count" - [2]=> - int(1) - } - [16]=> - array(3) { - [0]=> - int(299) - [1]=> - string(2) "++" - [2]=> - int(1) - } - [17]=> - string(1) ")" - [18]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [19]=> - string(1) "{" - [20]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [21]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(2) - } - [22]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [23]=> - array(3) { - [0]=> - int(311) - [1]=> - string(6) "$count" - [2]=> - int(2) - } - [24]=> - string(1) ";" - [25]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [26]=> - string(1) "}" - [27]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(3) - } - [28]=> - array(3) { - [0]=> - int(324) - [1]=> - string(7) "foreach" - [2]=> - int(4) - } - [29]=> - string(1) "(" - [30]=> - array(3) { - [0]=> - int(311) - [1]=> - string(7) "$values" - [2]=> - int(4) - } - [31]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [32]=> - array(3) { - [0]=> - int(328) - [1]=> - string(2) "as" - [2]=> - int(4) - } - [33]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [34]=> - array(3) { - [0]=> - int(311) - [1]=> - string(6) "$index" - [2]=> - int(4) - } - [35]=> - string(1) ")" - [36]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [37]=> - string(1) "{" - [38]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(4) - } - [39]=> - array(3) { - [0]=> - int(334) - [1]=> - string(8) "continue" - [2]=> - int(5) - } - [40]=> - string(1) ";" - [41]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(5) - } - [42]=> - string(1) "}" - [43]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [44]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(6) - } -} --- with switch...case tokens -- -array(23) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(329) - [1]=> - string(6) "switch" - [2]=> - int(1) - } - [2]=> - string(1) "(" - [3]=> - array(3) { - [0]=> - int(311) - [1]=> - string(4) "$var" - [2]=> - int(1) - } - [4]=> - string(1) ")" - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(331) - [1]=> - string(4) "case" - [2]=> - int(2) - } - [7]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [8]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(2) - } - [9]=> - string(1) ":" - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [11]=> - array(3) { - [0]=> - int(333) - [1]=> - string(5) "break" - [2]=> - int(2) - } - [12]=> - string(1) ";" - [13]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [14]=> - array(3) { - [0]=> - int(332) - [1]=> - string(7) "default" - [2]=> - int(3) - } - [15]=> - string(1) ":" - [16]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [17]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(3) - } - [18]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [19]=> - array(3) { - [0]=> - int(317) - [1]=> - string(9) ""default"" - [2]=> - int(3) - } - [20]=> - string(1) ";" - [21]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [22]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(3) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation12.phpt b/ext/tokenizer/tests/token_get_all_variation12.phpt index f6fea7bd95..a522117b66 100644 --- a/ext/tokenizer/tests/token_get_all_variation12.phpt +++ b/ext/tokenizer/tests/token_get_all_variation12.phpt @@ -530,486 +530,3 @@ array(19) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : with language constants *** --- with FILE -- -array(16) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(311) - [1]=> - string(3) "$fp" - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [4]=> - string(1) "=" - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(2) " " - [2]=> - int(2) - } - [6]=> - array(3) { - [0]=> - int(309) - [1]=> - string(5) "fopen" - [2]=> - int(2) - } - [7]=> - string(1) "(" - [8]=> - array(3) { - [0]=> - int(367) - [1]=> - string(8) "__FILE__" - [2]=> - int(2) - } - [9]=> - string(1) "," - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [11]=> - array(3) { - [0]=> - int(317) - [1]=> - string(3) "'r'" - [2]=> - int(2) - } - [12]=> - string(1) ")" - [13]=> - string(1) ";" - [14]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [15]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(3) - } -} --- with CLASS and FUNCTION -- -array(30) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(355) - [1]=> - string(5) "class" - [2]=> - int(2) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(309) - [1]=> - string(7) "MyClass" - [2]=> - int(2) - } - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [5]=> - string(1) "{" - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(3) - } - [7]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(4) - } - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(2) " " - [2]=> - int(4) - } - [9]=> - array(3) { - [0]=> - int(363) - [1]=> - string(9) "__CLASS__" - [2]=> - int(4) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(4) - } - [12]=> - array(3) { - [0]=> - int(336) - [1]=> - string(8) "function" - [2]=> - int(5) - } - [13]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [14]=> - array(3) { - [0]=> - int(309) - [1]=> - string(10) "myFunction" - [2]=> - int(5) - } - [15]=> - string(1) "(" - [16]=> - string(1) ")" - [17]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(5) - } - [18]=> - string(1) "{" - [19]=> - array(3) { - [0]=> - int(373) - [1]=> - string(2) " " - [2]=> - int(6) - } - [20]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(6) - } - [21]=> - array(3) { - [0]=> - int(373) - [1]=> - string(2) " " - [2]=> - int(6) - } - [22]=> - array(3) { - [0]=> - int(365) - [1]=> - string(12) "__FUNCTION__" - [2]=> - int(6) - } - [23]=> - string(1) ";" - [24]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [25]=> - string(1) "}" - [26]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(6) - } - [27]=> - string(1) "}" - [28]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(7) - } - [29]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(8) - } -} --- with LINE and METHOD -- -array(19) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(373) - [1]=> - string(2) " " - [2]=> - int(2) - } - [2]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [4]=> - string(1) "=" - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [6]=> - array(3) { - [0]=> - int(366) - [1]=> - string(8) "__LINE__" - [2]=> - int(2) - } - [7]=> - string(1) ";" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(2) - } - [9]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(3) - } - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [11]=> - string(1) "=" - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [13]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(3) - } - [14]=> - string(1) "." - [15]=> - array(3) { - [0]=> - int(364) - [1]=> - string(10) "__METHOD__" - [2]=> - int(3) - } - [16]=> - string(1) ";" - [17]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(3) - } - [18]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(4) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation13.phpt b/ext/tokenizer/tests/token_get_all_variation13.phpt index 740bc3cd92..552de8193d 100644 --- a/ext/tokenizer/tests/token_get_all_variation13.phpt +++ b/ext/tokenizer/tests/token_get_all_variation13.phpt @@ -1165,1115 +1165,3 @@ array(145) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : with class/object constructs *** -array(145) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(356) - [1]=> - string(9) "interface" - [2]=> - int(2) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(309) - [1]=> - string(11) "MyInterface" - [2]=> - int(2) - } - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [5]=> - string(1) "{" - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(3) - } - [7]=> - array(3) { - [0]=> - int(344) - [1]=> - string(6) "public" - [2]=> - int(4) - } - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [9]=> - array(3) { - [0]=> - int(337) - [1]=> - string(5) "const" - [2]=> - int(4) - } - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [11]=> - array(3) { - [0]=> - int(350) - [1]=> - string(3) "var" - [2]=> - int(4) - } - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [13]=> - array(3) { - [0]=> - int(311) - [1]=> - string(4) "$var" - [2]=> - int(4) - } - [14]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [15]=> - string(1) "=" - [16]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [17]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "10" - [2]=> - int(4) - } - [18]=> - string(1) ";" - [19]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(4) - } - [20]=> - string(1) "}" - [21]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(5) - } - [22]=> - array(3) { - [0]=> - int(348) - [1]=> - string(8) "abstract" - [2]=> - int(6) - } - [23]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [24]=> - array(3) { - [0]=> - int(355) - [1]=> - string(5) "class" - [2]=> - int(6) - } - [25]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [26]=> - array(3) { - [0]=> - int(309) - [1]=> - string(7) "MyClass" - [2]=> - int(6) - } - [27]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(6) - } - [28]=> - string(1) "{" - [29]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(7) - } - [30]=> - array(3) { - [0]=> - int(346) - [1]=> - string(7) "private" - [2]=> - int(8) - } - [31]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [32]=> - array(3) { - [0]=> - int(350) - [1]=> - string(3) "var" - [2]=> - int(8) - } - [33]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [34]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(8) - } - [35]=> - string(1) ";" - [36]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(8) - } - [37]=> - array(3) { - [0]=> - int(344) - [1]=> - string(6) "public" - [2]=> - int(9) - } - [38]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [39]=> - array(3) { - [0]=> - int(350) - [1]=> - string(3) "var" - [2]=> - int(9) - } - [40]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [41]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(9) - } - [42]=> - string(1) ";" - [43]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(9) - } - [44]=> - array(3) { - [0]=> - int(345) - [1]=> - string(9) "protected" - [2]=> - int(10) - } - [45]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(10) - } - [46]=> - array(3) { - [0]=> - int(350) - [1]=> - string(3) "var" - [2]=> - int(10) - } - [47]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(10) - } - [48]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(10) - } - [49]=> - string(1) ";" - [50]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(10) - } - [51]=> - array(3) { - [0]=> - int(349) - [1]=> - string(6) "static" - [2]=> - int(11) - } - [52]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(11) - } - [53]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$d" - [2]=> - int(11) - } - [54]=> - string(1) ";" - [55]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(11) - } - [56]=> - array(3) { - [0]=> - int(347) - [1]=> - string(5) "final" - [2]=> - int(12) - } - [57]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(12) - } - [58]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$e" - [2]=> - int(12) - } - [59]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(12) - } - [60]=> - string(1) "=" - [61]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(12) - } - [62]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "10" - [2]=> - int(12) - } - [63]=> - string(1) ";" - [64]=> - array(3) { - [0]=> - int(373) - [1]=> - string(6) " - - " - [2]=> - int(12) - } - [65]=> - array(3) { - [0]=> - int(348) - [1]=> - string(8) "abstract" - [2]=> - int(14) - } - [66]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(14) - } - [67]=> - array(3) { - [0]=> - int(344) - [1]=> - string(6) "public" - [2]=> - int(14) - } - [68]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(14) - } - [69]=> - array(3) { - [0]=> - int(336) - [1]=> - string(8) "function" - [2]=> - int(14) - } - [70]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(14) - } - [71]=> - array(3) { - [0]=> - int(309) - [1]=> - string(10) "myFunction" - [2]=> - int(14) - } - [72]=> - string(1) "(" - [73]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(14) - } - [74]=> - string(1) ")" - [75]=> - string(1) ";" - [76]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(14) - } - [77]=> - string(1) "}" - [78]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(15) - } - [79]=> - array(3) { - [0]=> - int(355) - [1]=> - string(5) "class" - [2]=> - int(16) - } - [80]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(16) - } - [81]=> - array(3) { - [0]=> - int(309) - [1]=> - string(10) "ChildClass" - [2]=> - int(16) - } - [82]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(16) - } - [83]=> - array(3) { - [0]=> - int(357) - [1]=> - string(7) "extends" - [2]=> - int(16) - } - [84]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(16) - } - [85]=> - array(3) { - [0]=> - int(309) - [1]=> - string(7) "MyClass" - [2]=> - int(16) - } - [86]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(16) - } - [87]=> - array(3) { - [0]=> - int(358) - [1]=> - string(10) "implements" - [2]=> - int(16) - } - [88]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(16) - } - [89]=> - array(3) { - [0]=> - int(309) - [1]=> - string(11) "MyInterface" - [2]=> - int(16) - } - [90]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(16) - } - [91]=> - string(1) "{" - [92]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(17) - } - [93]=> - array(3) { - [0]=> - int(343) - [1]=> - string(6) "global" - [2]=> - int(18) - } - [94]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(18) - } - [95]=> - array(3) { - [0]=> - int(311) - [1]=> - string(6) "$value" - [2]=> - int(18) - } - [96]=> - string(1) ";" - [97]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(18) - } - [98]=> - array(3) { - [0]=> - int(336) - [1]=> - string(8) "function" - [2]=> - int(19) - } - [99]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(19) - } - [100]=> - array(3) { - [0]=> - int(309) - [1]=> - string(10) "myFunction" - [2]=> - int(19) - } - [101]=> - string(1) "(" - [102]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(19) - } - [103]=> - string(1) ")" - [104]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(19) - } - [105]=> - string(1) "{" - [106]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(20) - } - [107]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(21) - } - [108]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(21) - } - [109]=> - string(1) "=" - [110]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(21) - } - [111]=> - array(3) { - [0]=> - int(301) - [1]=> - string(3) "new" - [2]=> - int(21) - } - [112]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(21) - } - [113]=> - array(3) { - [0]=> - int(309) - [1]=> - string(10) "ChildClass" - [2]=> - int(21) - } - [114]=> - string(1) "(" - [115]=> - string(1) ")" - [116]=> - string(1) ";" - [117]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(21) - } - [118]=> - array(3) { - [0]=> - int(303) - [1]=> - string(2) "if" - [2]=> - int(22) - } - [119]=> - string(1) "(" - [120]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(22) - } - [121]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(22) - } - [122]=> - array(3) { - [0]=> - int(288) - [1]=> - string(10) "instanceof" - [2]=> - int(22) - } - [123]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(22) - } - [124]=> - array(3) { - [0]=> - int(309) - [1]=> - string(7) "MyClass" - [2]=> - int(22) - } - [125]=> - string(1) ")" - [126]=> - array(3) { - [0]=> - int(373) - [1]=> - string(7) " - " - [2]=> - int(22) - } - [127]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(23) - } - [128]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(23) - } - [129]=> - array(3) { - [0]=> - int(317) - [1]=> - string(16) ""object created"" - [2]=> - int(23) - } - [130]=> - string(1) ";" - [131]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(23) - } - [132]=> - string(1) "}" - [133]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(24) - } - [134]=> - string(1) "}" - [135]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(25) - } - [136]=> - array(3) { - [0]=> - int(309) - [1]=> - string(10) "ChildClass" - [2]=> - int(26) - } - [137]=> - array(3) { - [0]=> - int(378) - [1]=> - string(2) "::" - [2]=> - int(26) - } - [138]=> - array(3) { - [0]=> - int(309) - [1]=> - string(10) "myFunction" - [2]=> - int(26) - } - [139]=> - string(1) "(" - [140]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "10" - [2]=> - int(26) - } - [141]=> - string(1) ")" - [142]=> - string(1) ";" - [143]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(26) - } - [144]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(27) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation14.phpt b/ext/tokenizer/tests/token_get_all_variation14.phpt index 40a3c2c5de..71ed4efa64 100644 --- a/ext/tokenizer/tests/token_get_all_variation14.phpt +++ b/ext/tokenizer/tests/token_get_all_variation14.phpt @@ -266,256 +266,6 @@ echo "hello world"; ?>" } } -- with invalid PHP tags and tokens -- -array(2) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(18) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(313) - [1]=> - string(1) "<" - [2]=> - int(1) - } -} -Done ---UEXPECTF-- -*** Testing token_get_all() : with invalid/unknown tokens *** --- with valid PHP tags & invlid tokens -- -array(29) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(309) - [1]=> - string(6) "struct" - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [4]=> - array(3) { - [0]=> - int(309) - [1]=> - string(8) "myStruct" - [2]=> - int(2) - } - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [6]=> - string(1) "{" - [7]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(2) - } - [8]=> - array(3) { - [0]=> - int(309) - [1]=> - string(8) "variable" - [2]=> - int(3) - } - [9]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [10]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(3) - } - [11]=> - string(1) ";" - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(3) - } - [13]=> - array(3) { - [0]=> - int(309) - [1]=> - string(6) "method" - [2]=> - int(4) - } - [14]=> - string(1) "(" - [15]=> - string(1) ")" - [16]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [17]=> - string(1) "{" - [18]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [19]=> - array(3) { - [0]=> - int(309) - [1]=> - string(7) "display" - [2]=> - int(4) - } - [20]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [21]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(4) - } - [22]=> - string(1) ";" - [23]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [24]=> - string(1) "}" - [25]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(4) - } - [26]=> - string(1) "}" - [27]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(5) - } - [28]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(6) - } -} --- with invlalid PHP open tag & valid tokens -- -array(1) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(28) "" - [2]=> - int(1) - } -} --- with invalid PHP tags and tokens -- array(1) { [0]=> array(3) { diff --git a/ext/tokenizer/tests/token_get_all_variation15.phpt b/ext/tokenizer/tests/token_get_all_variation15.phpt index 2743c90491..26e98df2d5 100644 --- a/ext/tokenizer/tests/token_get_all_variation15.phpt +++ b/ext/tokenizer/tests/token_get_all_variation15.phpt @@ -776,733 +776,3 @@ array(103) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : with heredoc source string *** -array(103) { - [0]=> - array(3) { - [0]=> - int(371) - [1]=> - string(3) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(373) - [1]=> - string(4) " - " - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [4]=> - string(1) "=" - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [6]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(2) - } - [7]=> - string(1) ";" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(2) - } - [9]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(3) - } - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [11]=> - string(1) "=" - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [13]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(3) - } - [14]=> - string(1) ";" - [15]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(3) - } - [16]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(4) - } - [17]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [18]=> - string(1) "=" - [19]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [20]=> - array(3) { - [0]=> - int(374) - [1]=> - string(7) "<< - int(4) - } - [21]=> - array(3) { - [0]=> - int(316) - [1]=> - string(36) " This is to test - heredoc string -" - [2]=> - int(5) - } - [22]=> - array(3) { - [0]=> - int(375) - [1]=> - string(3) "EOS" - [2]=> - int(7) - } - [23]=> - string(1) ";" - [24]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(7) - } - [25]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(8) - } - [26]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [27]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(8) - } - [28]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [29]=> - string(1) "+" - [30]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [31]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(8) - } - [32]=> - string(1) ";" - [33]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(8) - } - [34]=> - array(3) { - [0]=> - int(336) - [1]=> - string(8) "function" - [2]=> - int(9) - } - [35]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [36]=> - array(3) { - [0]=> - int(309) - [1]=> - string(10) "myFunction" - [2]=> - int(9) - } - [37]=> - string(1) "(" - [38]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(9) - } - [39]=> - string(1) ")" - [40]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(9) - } - [41]=> - string(1) "{" - [42]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(10) - } - [43]=> - array(3) { - [0]=> - int(309) - [1]=> - string(8) "var_dump" - [2]=> - int(11) - } - [44]=> - string(1) "(" - [45]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(11) - } - [46]=> - string(1) ")" - [47]=> - string(1) ";" - [48]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(11) - } - [49]=> - string(1) "}" - [50]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(12) - } - [51]=> - array(3) { - [0]=> - int(303) - [1]=> - string(2) "if" - [2]=> - int(13) - } - [52]=> - string(1) "(" - [53]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(13) - } - [54]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(13) - } - [55]=> - string(1) "<" - [56]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(13) - } - [57]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "10" - [2]=> - int(13) - } - [58]=> - string(1) ")" - [59]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(13) - } - [60]=> - string(1) "{" - [61]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(13) - } - [62]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(14) - } - [63]=> - array(3) { - [0]=> - int(299) - [1]=> - string(2) "++" - [2]=> - int(14) - } - [64]=> - string(1) ";" - [65]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(14) - } - [66]=> - string(1) "}" - [67]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(15) - } - [68]=> - array(3) { - [0]=> - int(305) - [1]=> - string(4) "else" - [2]=> - int(16) - } - [69]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(16) - } - [70]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(17) - } - [71]=> - array(3) { - [0]=> - int(298) - [1]=> - string(2) "--" - [2]=> - int(17) - } - [72]=> - string(1) ";" - [73]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(17) - } - [74]=> - array(3) { - [0]=> - int(320) - [1]=> - string(5) "while" - [2]=> - int(18) - } - [75]=> - string(1) "(" - [76]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(18) - } - [77]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(18) - } - [78]=> - string(1) ">" - [79]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(18) - } - [80]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "0" - [2]=> - int(18) - } - [81]=> - string(1) ")" - [82]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(18) - } - [83]=> - string(1) "{" - [84]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(18) - } - [85]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(19) - } - [86]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(19) - } - [87]=> - array(3) { - [0]=> - int(317) - [1]=> - string(3) ""*"" - [2]=> - int(19) - } - [88]=> - string(1) ";" - [89]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(19) - } - [90]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(20) - } - [91]=> - array(3) { - [0]=> - int(298) - [1]=> - string(2) "--" - [2]=> - int(20) - } - [92]=> - string(1) ";" - [93]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(20) - } - [94]=> - string(1) "}" - [95]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(21) - } - [96]=> - array(3) { - [0]=> - int(309) - [1]=> - string(10) "myFunction" - [2]=> - int(22) - } - [97]=> - string(1) "(" - [98]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "10" - [2]=> - int(22) - } - [99]=> - string(1) ")" - [100]=> - string(1) ";" - [101]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(22) - } - [102]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(23) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation16.phpt b/ext/tokenizer/tests/token_get_all_variation16.phpt index 13b3c2d1c7..d99fa48e45 100644 --- a/ext/tokenizer/tests/token_get_all_variation16.phpt +++ b/ext/tokenizer/tests/token_get_all_variation16.phpt @@ -999,949 +999,3 @@ array(142) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : with different function constructs *** -array(142) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(326) - [1]=> - string(7) "declare" - [2]=> - int(2) - } - [2]=> - string(1) "(" - [3]=> - array(3) { - [0]=> - int(309) - [1]=> - string(5) "VALUE" - [2]=> - int(2) - } - [4]=> - string(1) "=" - [5]=> - array(3) { - [0]=> - int(307) - [1]=> - string(3) "100" - [2]=> - int(2) - } - [6]=> - string(1) ")" - [7]=> - string(1) ";" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [9]=> - array(3) { - [0]=> - int(262) - [1]=> - string(7) "include" - [2]=> - int(3) - } - [10]=> - string(1) "(" - [11]=> - array(3) { - [0]=> - int(317) - [1]=> - string(13) ""addfile.php"" - [2]=> - int(3) - } - [12]=> - string(1) ")" - [13]=> - string(1) ";" - [14]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(3) - } - [15]=> - array(3) { - [0]=> - int(259) - [1]=> - string(7) "require" - [2]=> - int(4) - } - [16]=> - string(1) "(" - [17]=> - array(3) { - [0]=> - int(317) - [1]=> - string(13) ""sumfile.php"" - [2]=> - int(4) - } - [18]=> - string(1) ")" - [19]=> - string(1) ";" - [20]=> - array(3) { - [0]=> - int(373) - [1]=> - string(2) " - -" - [2]=> - int(4) - } - [21]=> - array(3) { - [0]=> - int(336) - [1]=> - string(8) "function" - [2]=> - int(6) - } - [22]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [23]=> - array(3) { - [0]=> - int(309) - [1]=> - string(10) "myFunction" - [2]=> - int(6) - } - [24]=> - string(1) "(" - [25]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(6) - } - [26]=> - string(1) ")" - [27]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(6) - } - [28]=> - string(1) "{" - [29]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(7) - } - [30]=> - array(3) { - [0]=> - int(303) - [1]=> - string(2) "if" - [2]=> - int(8) - } - [31]=> - string(1) "(" - [32]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(8) - } - [33]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [34]=> - string(1) "%" - [35]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [36]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(8) - } - [37]=> - string(1) ")" - [38]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(8) - } - [39]=> - array(3) { - [0]=> - int(338) - [1]=> - string(6) "return" - [2]=> - int(9) - } - [40]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [41]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(9) - } - [42]=> - string(1) ";" - [43]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(9) - } - [44]=> - array(3) { - [0]=> - int(305) - [1]=> - string(4) "else" - [2]=> - int(10) - } - [45]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(10) - } - [46]=> - array(3) { - [0]=> - int(302) - [1]=> - string(4) "exit" - [2]=> - int(11) - } - [47]=> - string(1) ";" - [48]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(11) - } - [49]=> - string(1) "}" - [50]=> - array(3) { - [0]=> - int(373) - [1]=> - string(2) " - -" - [2]=> - int(12) - } - [51]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(14) - } - [52]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(14) - } - [53]=> - string(1) "=" - [54]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(14) - } - [55]=> - array(3) { - [0]=> - int(309) - [1]=> - string(5) "VALUE" - [2]=> - int(14) - } - [56]=> - string(1) ";" - [57]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(14) - } - [58]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(15) - } - [59]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(15) - } - [60]=> - string(1) "=" - [61]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(15) - } - [62]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "20" - [2]=> - int(15) - } - [63]=> - string(1) ";" - [64]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(15) - } - [65]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(16) - } - [66]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(16) - } - [67]=> - string(1) "=" - [68]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(16) - } - [69]=> - array(3) { - [0]=> - int(362) - [1]=> - string(5) "array" - [2]=> - int(16) - } - [70]=> - string(1) "(" - [71]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(16) - } - [72]=> - string(1) "," - [73]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(16) - } - [74]=> - string(1) ")" - [75]=> - string(1) ";" - [76]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(16) - } - [77]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(17) - } - [78]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(17) - } - [79]=> - array(3) { - [0]=> - int(267) - [1]=> - string(3) ">>=" - [2]=> - int(17) - } - [80]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(17) - } - [81]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(17) - } - [82]=> - string(1) ";" - [83]=> - array(3) { - [0]=> - int(373) - [1]=> - string(2) " - -" - [2]=> - int(17) - } - [84]=> - array(3) { - [0]=> - int(303) - [1]=> - string(2) "if" - [2]=> - int(19) - } - [85]=> - string(1) "(" - [86]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(19) - } - [87]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(19) - } - [88]=> - array(3) { - [0]=> - int(285) - [1]=> - string(2) "<=" - [2]=> - int(19) - } - [89]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(19) - } - [90]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "0" - [2]=> - int(19) - } - [91]=> - string(1) ")" - [92]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(19) - } - [93]=> - array(3) { - [0]=> - int(302) - [1]=> - string(3) "die" - [2]=> - int(20) - } - [94]=> - string(1) ";" - [95]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(20) - } - [96]=> - array(3) { - [0]=> - int(305) - [1]=> - string(4) "else" - [2]=> - int(21) - } - [97]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(21) - } - [98]=> - array(3) { - [0]=> - int(266) - [1]=> - string(5) "print" - [2]=> - int(22) - } - [99]=> - string(1) "(" - [100]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(22) - } - [101]=> - string(1) ")" - [102]=> - string(1) ";" - [103]=> - array(3) { - [0]=> - int(373) - [1]=> - string(2) " - -" - [2]=> - int(22) - } - [104]=> - array(3) { - [0]=> - int(361) - [1]=> - string(4) "list" - [2]=> - int(24) - } - [105]=> - string(1) "(" - [106]=> - array(3) { - [0]=> - int(311) - [1]=> - string(7) "$value1" - [2]=> - int(24) - } - [107]=> - string(1) "," - [108]=> - array(3) { - [0]=> - int(311) - [1]=> - string(7) "$value2" - [2]=> - int(24) - } - [109]=> - string(1) ")" - [110]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(24) - } - [111]=> - string(1) "=" - [112]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(24) - } - [113]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(24) - } - [114]=> - string(1) ";" - [115]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(24) - } - [116]=> - array(3) { - [0]=> - int(303) - [1]=> - string(2) "if" - [2]=> - int(25) - } - [117]=> - string(1) "(" - [118]=> - array(3) { - [0]=> - int(353) - [1]=> - string(5) "empty" - [2]=> - int(25) - } - [119]=> - string(1) "(" - [120]=> - array(3) { - [0]=> - int(311) - [1]=> - string(7) "$value1" - [2]=> - int(25) - } - [121]=> - string(1) ")" - [122]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(25) - } - [123]=> - array(3) { - [0]=> - int(279) - [1]=> - string(2) "&&" - [2]=> - int(25) - } - [124]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(25) - } - [125]=> - string(1) "!" - [126]=> - array(3) { - [0]=> - int(352) - [1]=> - string(5) "isset" - [2]=> - int(25) - } - [127]=> - string(1) "(" - [128]=> - array(3) { - [0]=> - int(311) - [1]=> - string(7) "$value1" - [2]=> - int(25) - } - [129]=> - string(1) ")" - [130]=> - string(1) ")" - [131]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(25) - } - [132]=> - string(1) "{" - [133]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(25) - } - [134]=> - array(3) { - [0]=> - int(354) - [1]=> - string(15) "__halt_compiler" - [2]=> - int(26) - } - [135]=> - string(1) "(" - [136]=> - string(1) ")" - [137]=> - string(1) ";" - [138]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(26) - } - [139]=> - string(1) "}" - [140]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(27) - } - [141]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(28) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation17.phpt b/ext/tokenizer/tests/token_get_all_variation17.phpt index 728a257240..97161b17f4 100644 --- a/ext/tokenizer/tests/token_get_all_variation17.phpt +++ b/ext/tokenizer/tests/token_get_all_variation17.phpt @@ -609,576 +609,3 @@ array(81) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : with exception keywords *** -array(81) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(336) - [1]=> - string(8) "function" - [2]=> - int(2) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(309) - [1]=> - string(7) "inverse" - [2]=> - int(2) - } - [4]=> - string(1) "(" - [5]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$x" - [2]=> - int(2) - } - [6]=> - string(1) ")" - [7]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [8]=> - string(1) "{" - [9]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(3) - } - [10]=> - array(3) { - [0]=> - int(303) - [1]=> - string(2) "if" - [2]=> - int(4) - } - [11]=> - string(1) "(" - [12]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$x" - [2]=> - int(4) - } - [13]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [14]=> - array(3) { - [0]=> - int(283) - [1]=> - string(2) "==" - [2]=> - int(4) - } - [15]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [16]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "0" - [2]=> - int(4) - } - [17]=> - string(1) ")" - [18]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [19]=> - string(1) "{" - [20]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(4) - } - [21]=> - array(3) { - [0]=> - int(341) - [1]=> - string(5) "throw" - [2]=> - int(5) - } - [22]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [23]=> - array(3) { - [0]=> - int(301) - [1]=> - string(3) "new" - [2]=> - int(5) - } - [24]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [25]=> - array(3) { - [0]=> - int(309) - [1]=> - string(9) "Exception" - [2]=> - int(5) - } - [26]=> - string(1) "(" - [27]=> - array(3) { - [0]=> - int(317) - [1]=> - string(17) ""Divison by zero"" - [2]=> - int(5) - } - [28]=> - string(1) ")" - [29]=> - string(1) ";" - [30]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(5) - } - [31]=> - array(3) { - [0]=> - int(305) - [1]=> - string(4) "else" - [2]=> - int(6) - } - [32]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(6) - } - [33]=> - array(3) { - [0]=> - int(338) - [1]=> - string(6) "return" - [2]=> - int(7) - } - [34]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(7) - } - [35]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(7) - } - [36]=> - string(1) "/" - [37]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$x" - [2]=> - int(7) - } - [38]=> - string(1) ";" - [39]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(7) - } - [40]=> - string(1) "}" - [41]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(8) - } - [42]=> - array(3) { - [0]=> - int(339) - [1]=> - string(3) "try" - [2]=> - int(9) - } - [43]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [44]=> - string(1) "{" - [45]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(9) - } - [46]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(10) - } - [47]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(10) - } - [48]=> - array(3) { - [0]=> - int(309) - [1]=> - string(7) "inverse" - [2]=> - int(10) - } - [49]=> - string(1) "(" - [50]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "0" - [2]=> - int(10) - } - [51]=> - string(1) ")" - [52]=> - string(1) ";" - [53]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(10) - } - [54]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(11) - } - [55]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(11) - } - [56]=> - array(3) { - [0]=> - int(309) - [1]=> - string(7) "inverse" - [2]=> - int(11) - } - [57]=> - string(1) "(" - [58]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "5" - [2]=> - int(11) - } - [59]=> - string(1) ")" - [60]=> - string(1) ";" - [61]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(11) - } - [62]=> - string(1) "}" - [63]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(12) - } - [64]=> - array(3) { - [0]=> - int(340) - [1]=> - string(5) "catch" - [2]=> - int(12) - } - [65]=> - string(1) "(" - [66]=> - array(3) { - [0]=> - int(309) - [1]=> - string(9) "Exception" - [2]=> - int(12) - } - [67]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(12) - } - [68]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$e" - [2]=> - int(12) - } - [69]=> - string(1) ")" - [70]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(12) - } - [71]=> - string(1) "{" - [72]=> - array(3) { - [0]=> - int(373) - [1]=> - string(5) " - " - [2]=> - int(12) - } - [73]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(13) - } - [74]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(13) - } - [75]=> - array(3) { - [0]=> - int(317) - [1]=> - string(19) ""caught exception:"" - [2]=> - int(13) - } - [76]=> - string(1) ";" - [77]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(13) - } - [78]=> - string(1) "}" - [79]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(14) - } - [80]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(15) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation18.phpt b/ext/tokenizer/tests/token_get_all_variation18.phpt index b32d901ccd..ab1a5ae14e 100644 --- a/ext/tokenizer/tests/token_get_all_variation18.phpt +++ b/ext/tokenizer/tests/token_get_all_variation18.phpt @@ -116,91 +116,3 @@ array(9) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : 'source' string with HTML tags *** -array(9) { - [0]=> - array(3) { - [0]=> - int(313) - [1]=> - string(48) " - - - Testing HTML - -" - -" - [2]=> - int(1) - } - [1]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(8) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(8) - } - [3]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(9) - } - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [5]=> - array(3) { - [0]=> - int(317) - [1]=> - string(20) ""php code with HTML"" - [2]=> - int(9) - } - [6]=> - string(1) ";" - [7]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(9) - } - [8]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(10) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation19.phpt b/ext/tokenizer/tests/token_get_all_variation19.phpt index 35aaa33928..2e9113b265 100644 --- a/ext/tokenizer/tests/token_get_all_variation19.phpt +++ b/ext/tokenizer/tests/token_get_all_variation19.phpt @@ -52,41 +52,6 @@ eval($script); ?> --EXPECT-- -string(259) " - -// A php script to test token_get_all() - -/* a different -type of -comment */ - -// a class -class TestClass { - public function foo() { - echo "Called foo()\n"; - } -} - -$a = new TestClass(); -$a->foo(); - -for ($i = 0; $i < 10; $i++) { - echo "Loop iteration $i\n"; -} - -" -Called foo() -Loop iteration 0 -Loop iteration 1 -Loop iteration 2 -Loop iteration 3 -Loop iteration 4 -Loop iteration 5 -Loop iteration 6 -Loop iteration 7 -Loop iteration 8 -Loop iteration 9 ---UEXPECT-- unicode(259) " // A php script to test token_get_all() diff --git a/ext/tokenizer/tests/token_get_all_variation2.phpt b/ext/tokenizer/tests/token_get_all_variation2.phpt index 3dce43ee40..61c19b1bcd 100644 --- a/ext/tokenizer/tests/token_get_all_variation2.phpt +++ b/ext/tokenizer/tests/token_get_all_variation2.phpt @@ -427,402 +427,3 @@ array(13) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : 'source' string with different arithmetic operators *** --- Iteration 1 -- -array(13) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - string(1) "+" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 2 -- -array(13) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - string(1) "-" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 3 -- -array(13) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - string(1) "*" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 4 -- -array(13) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - string(1) "%" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation3.phpt b/ext/tokenizer/tests/token_get_all_variation3.phpt index d1e70eb3e2..68a0f3024d 100644 --- a/ext/tokenizer/tests/token_get_all_variation3.phpt +++ b/ext/tokenizer/tests/token_get_all_variation3.phpt @@ -566,536 +566,3 @@ array(13) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : 'source' string with different logical operators *** --- Iteration 1 -- -array(13) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - array(3) { - [0]=> - int(265) - [1]=> - string(3) "and" - [2]=> - int(1) - } - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(307) - [1]=> - string(3) "024" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 2 -- -array(13) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - array(3) { - [0]=> - int(263) - [1]=> - string(2) "or" - [2]=> - int(1) - } - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(307) - [1]=> - string(4) "0X1E" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 3 -- -array(13) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - array(3) { - [0]=> - int(264) - [1]=> - string(3) "xor" - [2]=> - int(1) - } - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 4 -- -array(13) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - array(3) { - [0]=> - int(279) - [1]=> - string(2) "&&" - [2]=> - int(1) - } - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} --- Iteration 5 -- -array(13) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [5]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(1) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [7]=> - array(3) { - [0]=> - int(278) - [1]=> - string(2) "||" - [2]=> - int(1) - } - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [9]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(1) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(1) - } - [12]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(1) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation4.phpt b/ext/tokenizer/tests/token_get_all_variation4.phpt index f98aea58b0..c813934af8 100644 --- a/ext/tokenizer/tests/token_get_all_variation4.phpt +++ b/ext/tokenizer/tests/token_get_all_variation4.phpt @@ -745,715 +745,3 @@ array(89) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : 'source' string with different comparison operators *** -array(89) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(303) - [1]=> - string(2) "if" - [2]=> - int(2) - } - [3]=> - string(1) "(" - [4]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(2) - } - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [6]=> - array(3) { - [0]=> - int(283) - [1]=> - string(2) "==" - [2]=> - int(2) - } - [7]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [8]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "0" - [2]=> - int(2) - } - [9]=> - string(1) ")" - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(4) " - " - [2]=> - int(2) - } - [11]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(3) - } - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [13]=> - array(3) { - [0]=> - int(317) - [1]=> - string(6) ""== 0"" - [2]=> - int(3) - } - [14]=> - string(1) ";" - [15]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(3) - } - [16]=> - array(3) { - [0]=> - int(304) - [1]=> - string(6) "elseif" - [2]=> - int(4) - } - [17]=> - string(1) "(" - [18]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(4) - } - [19]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [20]=> - array(3) { - [0]=> - int(281) - [1]=> - string(3) "===" - [2]=> - int(4) - } - [21]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [22]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(4) - } - [23]=> - string(1) ")" - [24]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(4) - } - [25]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(5) - } - [26]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [27]=> - array(3) { - [0]=> - int(317) - [1]=> - string(7) ""=== 2"" - [2]=> - int(5) - } - [28]=> - string(1) ";" - [29]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(5) - } - [30]=> - array(3) { - [0]=> - int(304) - [1]=> - string(6) "elseif" - [2]=> - int(6) - } - [31]=> - string(1) "(" - [32]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(6) - } - [33]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [34]=> - array(3) { - [0]=> - int(284) - [1]=> - string(2) ">=" - [2]=> - int(6) - } - [35]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [36]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "10" - [2]=> - int(6) - } - [37]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [38]=> - array(3) { - [0]=> - int(279) - [1]=> - string(2) "&&" - [2]=> - int(6) - } - [39]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [40]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(6) - } - [41]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [42]=> - array(3) { - [0]=> - int(285) - [1]=> - string(2) "<=" - [2]=> - int(6) - } - [43]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [44]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "20" - [2]=> - int(6) - } - [45]=> - string(1) ")" - [46]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(6) - } - [47]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(7) - } - [48]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(7) - } - [49]=> - array(3) { - [0]=> - int(317) - [1]=> - string(14) "">= 10 & <=20"" - [2]=> - int(7) - } - [50]=> - string(1) ";" - [51]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(7) - } - [52]=> - array(3) { - [0]=> - int(304) - [1]=> - string(6) "elseif" - [2]=> - int(8) - } - [53]=> - string(1) "(" - [54]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(8) - } - [55]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [56]=> - array(3) { - [0]=> - int(282) - [1]=> - string(2) "!=" - [2]=> - int(8) - } - [57]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [58]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(8) - } - [59]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [60]=> - array(3) { - [0]=> - int(278) - [1]=> - string(2) "||" - [2]=> - int(8) - } - [61]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [62]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(8) - } - [63]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [64]=> - array(3) { - [0]=> - int(282) - [1]=> - string(2) "<>" - [2]=> - int(8) - } - [65]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [66]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(8) - } - [67]=> - string(1) ")" - [68]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(8) - } - [69]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(9) - } - [70]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [71]=> - array(3) { - [0]=> - int(317) - [1]=> - string(6) ""!= 1"" - [2]=> - int(9) - } - [72]=> - string(1) ";" - [73]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(9) - } - [74]=> - array(3) { - [0]=> - int(304) - [1]=> - string(6) "elseif" - [2]=> - int(10) - } - [75]=> - string(1) "(" - [76]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(10) - } - [77]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(10) - } - [78]=> - array(3) { - [0]=> - int(280) - [1]=> - string(3) "!==" - [2]=> - int(10) - } - [79]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(10) - } - [80]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(10) - } - [81]=> - string(1) ")" - [82]=> - array(3) { - [0]=> - int(373) - [1]=> - string(3) " - " - [2]=> - int(10) - } - [83]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(11) - } - [84]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(11) - } - [85]=> - array(3) { - [0]=> - int(317) - [1]=> - string(6) ""!==1"" - [2]=> - int(11) - } - [86]=> - string(1) ";" - [87]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(11) - } - [88]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(12) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation5.phpt b/ext/tokenizer/tests/token_get_all_variation5.phpt index 94eb24565e..e3041f4c14 100644 --- a/ext/tokenizer/tests/token_get_all_variation5.phpt +++ b/ext/tokenizer/tests/token_get_all_variation5.phpt @@ -796,762 +796,3 @@ array(94) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : 'source' string with different assignment operators *** -array(94) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [4]=> - string(1) "=" - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [6]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(2) - } - [7]=> - string(1) "," - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [9]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(2) - } - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [11]=> - string(1) "=" - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [13]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(2) - } - [14]=> - string(1) ";" - [15]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [16]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(3) - } - [17]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [18]=> - array(3) { - [0]=> - int(277) - [1]=> - string(2) "+=" - [2]=> - int(3) - } - [19]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [20]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(3) - } - [21]=> - string(1) ";" - [22]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(3) - } - [23]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(4) - } - [24]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [25]=> - array(3) { - [0]=> - int(276) - [1]=> - string(2) "-=" - [2]=> - int(4) - } - [26]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [27]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(4) - } - [28]=> - string(1) ";" - [29]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(4) - } - [30]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(5) - } - [31]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [32]=> - array(3) { - [0]=> - int(275) - [1]=> - string(2) "*=" - [2]=> - int(5) - } - [33]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [34]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(5) - } - [35]=> - string(1) ";" - [36]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(5) - } - [37]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$d" - [2]=> - int(6) - } - [38]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [39]=> - array(3) { - [0]=> - int(274) - [1]=> - string(2) "/=" - [2]=> - int(6) - } - [40]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [41]=> - array(3) { - [0]=> - int(308) - [1]=> - string(5) "10.50" - [2]=> - int(6) - } - [42]=> - string(1) ";" - [43]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(6) - } - [44]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(7) - } - [45]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(7) - } - [46]=> - array(3) { - [0]=> - int(272) - [1]=> - string(2) "%=" - [2]=> - int(7) - } - [47]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(7) - } - [48]=> - array(3) { - [0]=> - int(308) - [1]=> - string(5) "10.50" - [2]=> - int(7) - } - [49]=> - string(1) ";" - [50]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(7) - } - [51]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(8) - } - [52]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [53]=> - array(3) { - [0]=> - int(271) - [1]=> - string(2) "&=" - [2]=> - int(8) - } - [54]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [55]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(8) - } - [56]=> - string(1) ";" - [57]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(8) - } - [58]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(9) - } - [59]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [60]=> - array(3) { - [0]=> - int(270) - [1]=> - string(2) "|=" - [2]=> - int(9) - } - [61]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [62]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(9) - } - [63]=> - string(1) ";" - [64]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(9) - } - [65]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$d" - [2]=> - int(10) - } - [66]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(10) - } - [67]=> - array(3) { - [0]=> - int(269) - [1]=> - string(2) "^=" - [2]=> - int(10) - } - [68]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(10) - } - [69]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "5" - [2]=> - int(10) - } - [70]=> - string(1) ";" - [71]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(10) - } - [72]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(11) - } - [73]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(11) - } - [74]=> - array(3) { - [0]=> - int(267) - [1]=> - string(3) ">>=" - [2]=> - int(11) - } - [75]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(11) - } - [76]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(11) - } - [77]=> - string(1) ";" - [78]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(11) - } - [79]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(12) - } - [80]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(12) - } - [81]=> - array(3) { - [0]=> - int(268) - [1]=> - string(3) "<<=" - [2]=> - int(12) - } - [82]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(12) - } - [83]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(12) - } - [84]=> - string(1) ";" - [85]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(12) - } - [86]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$d" - [2]=> - int(13) - } - [87]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(13) - } - [88]=> - array(3) { - [0]=> - int(273) - [1]=> - string(2) ".=" - [2]=> - int(13) - } - [89]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(13) - } - [90]=> - array(3) { - [0]=> - int(317) - [1]=> - string(13) ""hello world"" - [2]=> - int(13) - } - [91]=> - string(1) ";" - [92]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(13) - } - [93]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(14) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation6.phpt b/ext/tokenizer/tests/token_get_all_variation6.phpt index 871a8dc685..a073fd5fa4 100644 --- a/ext/tokenizer/tests/token_get_all_variation6.phpt +++ b/ext/tokenizer/tests/token_get_all_variation6.phpt @@ -390,366 +390,3 @@ array(50) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : 'source' string with different bitwise operators *** -array(50) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(2) - } - [2]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [3]=> - string(1) "=" - [4]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [5]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(2) - } - [6]=> - string(1) "," - [7]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [8]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(2) - } - [9]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [10]=> - string(1) "=" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [12]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "4" - [2]=> - int(2) - } - [13]=> - string(1) ";" - [14]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [15]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(3) - } - [16]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [17]=> - string(1) "=" - [18]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [19]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(3) - } - [20]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [21]=> - array(3) { - [0]=> - int(287) - [1]=> - string(2) "<<" - [2]=> - int(3) - } - [22]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [23]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(3) - } - [24]=> - string(1) ";" - [25]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(3) - } - [26]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(4) - } - [27]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [28]=> - string(1) "=" - [29]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [30]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(4) - } - [31]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [32]=> - array(3) { - [0]=> - int(286) - [1]=> - string(2) ">>" - [2]=> - int(4) - } - [33]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [34]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "2" - [2]=> - int(4) - } - [35]=> - string(1) ";" - [36]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(4) - } - [37]=> - array(3) { - [0]=> - int(309) - [1]=> - string(8) "var_dump" - [2]=> - int(5) - } - [38]=> - string(1) "(" - [39]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(5) - } - [40]=> - string(1) ")" - [41]=> - string(1) ";" - [42]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(5) - } - [43]=> - array(3) { - [0]=> - int(309) - [1]=> - string(8) "var_dump" - [2]=> - int(6) - } - [44]=> - string(1) "(" - [45]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(6) - } - [46]=> - string(1) ")" - [47]=> - string(1) ";" - [48]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(6) - } - [49]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(7) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation7.phpt b/ext/tokenizer/tests/token_get_all_variation7.phpt index 544a69cfd9..9aac0d8ee6 100644 --- a/ext/tokenizer/tests/token_get_all_variation7.phpt +++ b/ext/tokenizer/tests/token_get_all_variation7.phpt @@ -257,234 +257,3 @@ array(30) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : 'source' string with different increment/decrement operators *** -array(30) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [4]=> - string(1) "=" - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [6]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "10" - [2]=> - int(2) - } - [7]=> - string(1) "," - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [9]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(2) - } - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [11]=> - string(1) "=" - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [13]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "5" - [2]=> - int(2) - } - [14]=> - string(1) ";" - [15]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [16]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(3) - } - [17]=> - array(3) { - [0]=> - int(299) - [1]=> - string(2) "++" - [2]=> - int(3) - } - [18]=> - string(1) ";" - [19]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(3) - } - [20]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(4) - } - [21]=> - array(3) { - [0]=> - int(298) - [1]=> - string(2) "--" - [2]=> - int(4) - } - [22]=> - string(1) ";" - [23]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(4) - } - [24]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(5) - } - [25]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [26]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(5) - } - [27]=> - string(1) ";" - [28]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(5) - } - [29]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(6) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation8.phpt b/ext/tokenizer/tests/token_get_all_variation8.phpt index abeefb6cbf..d43b0f5a82 100644 --- a/ext/tokenizer/tests/token_get_all_variation8.phpt +++ b/ext/tokenizer/tests/token_get_all_variation8.phpt @@ -830,801 +830,3 @@ array(108) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : 'source' string with different type casting operators *** -array(108) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [4]=> - string(1) "=" - [5]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [6]=> - array(3) { - [0]=> - int(307) - [1]=> - string(1) "1" - [2]=> - int(2) - } - [7]=> - string(1) "," - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [9]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(2) - } - [10]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [11]=> - string(1) "=" - [12]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(2) - } - [13]=> - array(3) { - [0]=> - int(308) - [1]=> - string(4) "10.5" - [2]=> - int(2) - } - [14]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(2) - } - [15]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(3) - } - [16]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [17]=> - string(1) "=" - [18]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [19]=> - array(3) { - [0]=> - int(297) - [1]=> - string(5) "(int)" - [2]=> - int(3) - } - [20]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(3) - } - [21]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [22]=> - string(1) "+" - [23]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(3) - } - [24]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(3) - } - [25]=> - string(1) ";" - [26]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(3) - } - [27]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$d" - [2]=> - int(4) - } - [28]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [29]=> - string(1) "=" - [30]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [31]=> - array(3) { - [0]=> - int(296) - [1]=> - string(7) "(float)" - [2]=> - int(4) - } - [32]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(4) - } - [33]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [34]=> - string(1) "+" - [35]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(4) - } - [36]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(4) - } - [37]=> - string(1) ";" - [38]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(4) - } - [39]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$e" - [2]=> - int(5) - } - [40]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [41]=> - string(1) "=" - [42]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(5) - } - [43]=> - array(3) { - [0]=> - int(295) - [1]=> - string(8) "(string)" - [2]=> - int(5) - } - [44]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(5) - } - [45]=> - string(1) "." - [46]=> - array(3) { - [0]=> - int(295) - [1]=> - string(8) "(string)" - [2]=> - int(5) - } - [47]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(5) - } - [48]=> - string(1) ";" - [49]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(5) - } - [50]=> - array(3) { - [0]=> - int(303) - [1]=> - string(2) "if" - [2]=> - int(6) - } - [51]=> - string(1) "(" - [52]=> - array(3) { - [0]=> - int(290) - [1]=> - string(6) "(bool)" - [2]=> - int(6) - } - [53]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(6) - } - [54]=> - string(1) ")" - [55]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [56]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(6) - } - [57]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(6) - } - [58]=> - array(3) { - [0]=> - int(317) - [1]=> - string(6) ""true"" - [2]=> - int(6) - } - [59]=> - string(1) ";" - [60]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(6) - } - [61]=> - array(3) { - [0]=> - int(303) - [1]=> - string(2) "if" - [2]=> - int(7) - } - [62]=> - string(1) "(" - [63]=> - string(1) "!" - [64]=> - array(3) { - [0]=> - int(290) - [1]=> - string(9) "(boolean)" - [2]=> - int(7) - } - [65]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(7) - } - [66]=> - string(1) ")" - [67]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(7) - } - [68]=> - array(3) { - [0]=> - int(318) - [1]=> - string(4) "echo" - [2]=> - int(7) - } - [69]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(7) - } - [70]=> - array(3) { - [0]=> - int(317) - [1]=> - string(7) ""false"" - [2]=> - int(7) - } - [71]=> - string(1) ";" - [72]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(7) - } - [73]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(8) - } - [74]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [75]=> - string(1) "=" - [76]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [77]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(8) - } - [78]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [79]=> - string(1) "+" - [80]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [81]=> - array(3) { - [0]=> - int(297) - [1]=> - string(9) "(integer)" - [2]=> - int(8) - } - [82]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [83]=> - array(3) { - [0]=> - int(308) - [1]=> - string(7) "123.4e2" - [2]=> - int(8) - } - [84]=> - string(1) ";" - [85]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(8) - } - [86]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$d" - [2]=> - int(9) - } - [87]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [88]=> - string(1) "=" - [89]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [90]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(9) - } - [91]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [92]=> - string(1) "-" - [93]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [94]=> - array(3) { - [0]=> - int(296) - [1]=> - string(6) "(real)" - [2]=> - int(9) - } - [95]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [96]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "12" - [2]=> - int(9) - } - [97]=> - string(1) ";" - [98]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(9) - } - [99]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(10) - } - [100]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(10) - } - [101]=> - string(1) "=" - [102]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(10) - } - [103]=> - array(3) { - [0]=> - int(289) - [1]=> - string(7) "(unset)" - [2]=> - int(10) - } - [104]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(10) - } - [105]=> - string(1) ";" - [106]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(10) - } - [107]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(11) - } -} -Done diff --git a/ext/tokenizer/tests/token_get_all_variation9.phpt b/ext/tokenizer/tests/token_get_all_variation9.phpt index 01713ce767..6a3f03e6ad 100644 --- a/ext/tokenizer/tests/token_get_all_variation9.phpt +++ b/ext/tokenizer/tests/token_get_all_variation9.phpt @@ -439,401 +439,3 @@ array(51) { } } Done ---UEXPECTF-- -*** Testing token_get_all() : 'source' string with different comments *** -array(51) { - [0]=> - array(3) { - [0]=> - int(370) - [1]=> - string(6) " - int(1) - } - [1]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(1) - } - [2]=> - array(3) { - [0]=> - int(369) - [1]=> - string(65) "/** Performing addition operation on given values : - * a, b - */" - [2]=> - int(2) - } - [3]=> - array(3) { - [0]=> - int(373) - [1]=> - string(2) " - -" - [2]=> - int(4) - } - [4]=> - array(3) { - [0]=> - int(368) - [1]=> - string(13) "// int value -" - [2]=> - int(6) - } - [5]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(7) - } - [6]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(7) - } - [7]=> - string(1) "=" - [8]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(7) - } - [9]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "10" - [2]=> - int(7) - } - [10]=> - string(1) ";" - [11]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(7) - } - [12]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(8) - } - [13]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [14]=> - string(1) "=" - [15]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(8) - } - [16]=> - array(3) { - [0]=> - int(307) - [1]=> - string(2) "20" - [2]=> - int(8) - } - [17]=> - string(1) ";" - [18]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(8) - } - [19]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(9) - } - [20]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [21]=> - string(1) "=" - [22]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [23]=> - array(3) { - [0]=> - int(309) - [1]=> - string(4) "true" - [2]=> - int(9) - } - [24]=> - string(1) ";" - [25]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(9) - } - [26]=> - array(3) { - [0]=> - int(368) - [1]=> - string(14) "// bool value -" - [2]=> - int(9) - } - [27]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(10) - } - [28]=> - array(3) { - [0]=> - int(368) - [1]=> - string(59) "/* - * Performing operation on $a,$b - * display result - */" - [2]=> - int(11) - } - [29]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(14) - } - [30]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(15) - } - [31]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(15) - } - [32]=> - string(1) "=" - [33]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(15) - } - [34]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$a" - [2]=> - int(15) - } - [35]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(15) - } - [36]=> - string(1) "+" - [37]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(15) - } - [38]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$b" - [2]=> - int(15) - } - [39]=> - string(1) ";" - [40]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(15) - } - [41]=> - array(3) { - [0]=> - int(309) - [1]=> - string(8) "var_dump" - [2]=> - int(16) - } - [42]=> - string(1) "(" - [43]=> - array(3) { - [0]=> - int(311) - [1]=> - string(2) "$c" - [2]=> - int(16) - } - [44]=> - string(1) ")" - [45]=> - string(1) ";" - [46]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " " - [2]=> - int(16) - } - [47]=> - array(3) { - [0]=> - int(368) - [1]=> - string(20) "# expected: int(30) -" - [2]=> - int(16) - } - [48]=> - array(3) { - [0]=> - int(373) - [1]=> - string(1) " -" - [2]=> - int(17) - } - [49]=> - array(3) { - [0]=> - int(368) - [1]=> - string(17) "# end of program -" - [2]=> - int(18) - } - [50]=> - array(3) { - [0]=> - int(372) - [1]=> - string(2) "?>" - [2]=> - int(19) - } -} -Done diff --git a/ext/wddx/tests/001.phpt b/ext/wddx/tests/001.phpt index 80d96ec7e6..33e07ddfe6 100644 --- a/ext/wddx/tests/001.phpt +++ b/ext/wddx/tests/001.phpt @@ -11,56 +11,6 @@ precision=14 var_dump(wddx_unserialize(file_get_contents("{$path}/wddx.xml"))); ?> --EXPECT-- -array(11) { - ["aNull"]=> - NULL - ["aString"]=> - string(8) "a string" - ["aNumber"]=> - float(-12.456) - ["aDateTime"]=> - int(897625932) - ["aDateTime2"]=> - int(329632332) - ["aDateTime3"]=> - string(22) "2040-06-12T04:32:12+00" - ["aBoolean"]=> - bool(true) - ["anArray"]=> - array(2) { - [0]=> - int(10) - [1]=> - string(14) "second element" - } - ["aBinary"]=> - string(11) "binary data" - ["anObject"]=> - array(2) { - ["s"]=> - string(8) "a string" - ["n"]=> - float(-12.456) - } - ["aRecordset"]=> - array(2) { - ["NAME"]=> - array(2) { - [0]=> - string(8) "John Doe" - [1]=> - string(8) "Jane Doe" - } - ["AGE"]=> - array(2) { - [0]=> - int(34) - [1]=> - int(31) - } - } -} ---UEXPECT-- array(11) { [u"aNull"]=> NULL diff --git a/ext/wddx/tests/bug37587.phpt b/ext/wddx/tests/bug37587.phpt index 2b5d5f3994..cb3fafe676 100755 --- a/ext/wddx/tests/bug37587.phpt +++ b/ext/wddx/tests/bug37587.phpt @@ -24,15 +24,6 @@ EOF ?> ===DONE=== --EXPECT-- -array(1) { - [0]=> - array(1) { - ["test"]=> - string(11) "Hello World" - } -} -===DONE=== ---UEXPECT-- array(1) { [0]=> array(1) { diff --git a/ext/xml/tests/bug25666.phpt b/ext/xml/tests/bug25666.phpt index 2cccc9593e..e6d376403a 100644 --- a/ext/xml/tests/bug25666.phpt +++ b/ext/xml/tests/bug25666.phpt @@ -30,10 +30,6 @@ xml_parse($parser, $xml); xml_parser_free($parser); ?> --EXPECT-- -string(24) "http://example.com/foo@a" -string(24) "http://example.com/bar@b" -string(24) "http://example.com/baz@c" ---UEXPECT-- unicode(24) "http://example.com/foo@a" unicode(24) "http://example.com/bar@b" unicode(24) "http://example.com/baz@c" diff --git a/ext/xml/tests/bug26528.phpt b/ext/xml/tests/bug26528.phpt index d39def703f..6bc75e92c4 100644 --- a/ext/xml/tests/bug26528.phpt +++ b/ext/xml/tests/bug26528.phpt @@ -13,23 +13,6 @@ require_once("skipif.inc"); var_dump($vals); ?> --EXPECT-- -array(1) { - [0]=> - array(4) { - ["tag"]=> - string(4) "TEST" - ["type"]=> - string(8) "complete" - ["level"]=> - int(1) - ["attributes"]=> - array(1) { - ["ATTR"]=> - string(13) "angle array(4) { diff --git a/ext/xml/tests/bug35447.phpt b/ext/xml/tests/bug35447.phpt index d6bfe3daf8..28a08a7c91 100644 --- a/ext/xml/tests/bug35447.phpt +++ b/ext/xml/tests/bug35447.phpt @@ -27,27 +27,6 @@ xml_parser_free($parser); var_dump($vals); ?> --EXPECT-- -array(1) { - [0]=> - array(5) { - ["tag"]=> - string(8) "resource" - ["type"]=> - string(8) "complete" - ["level"]=> - int(1) - ["attributes"]=> - array(2) { - ["key"]=> - string(7) "rSeeYou" - ["type"]=> - string(7) "literal" - } - ["value"]=> - string(13) "A bient&244;t" - } -} ---UEXPECT-- array(1) { [0]=> array(5) { diff --git a/ext/xml/tests/xml009.phpt b/ext/xml/tests/xml009.phpt index b425e486a2..8b243f1cba 100644 --- a/ext/xml/tests/xml009.phpt +++ b/ext/xml/tests/xml009.phpt @@ -30,10 +30,6 @@ xml_parse($parser, $xml); xml_parser_free($parser); ?> --EXPECT-- -string(24) "http://example.com/foo@a" -string(24) "http://example.com/bar@b" -string(24) "http://example.com/foo@c" ---UEXPECT-- unicode(24) "http://example.com/foo@a" unicode(24) "http://example.com/bar@b" unicode(24) "http://example.com/foo@c" diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt index 7cd4023523..61eae8757a 100755 --- a/ext/xmlreader/tests/012.phpt +++ b/ext/xmlreader/tests/012.phpt @@ -57,17 +57,6 @@ $reader->close(); ?> ===DONE=== --EXPECT-- -string(0) "" -NULL -string(0) "" -string(0) "" -===FILE=== -string(0) "" -NULL -string(0) "" -string(0) "" -===DONE=== ---UEXPECT-- unicode(0) "" NULL unicode(0) "" diff --git a/ext/xmlreader/tests/013.phpt b/ext/xmlreader/tests/013.phpt index 4db4c9b6f9..873522a4e6 100755 --- a/ext/xmlreader/tests/013.phpt +++ b/ext/xmlreader/tests/013.phpt @@ -44,13 +44,6 @@ $reader->close(); ?> ===DONE=== --EXPECTF-- -string(3) "123" -string(3) "456" -===FAIL=== - -Warning: XMLReader::read(): Element 'foo': %s -===DONE=== ---UEXPECTF-- unicode(3) "123" unicode(3) "456" ===FAIL=== diff --git a/ext/xsl/tests/bug33853.phpt b/ext/xsl/tests/bug33853.phpt index e03b9764f8..cc17d1d5c0 100755 --- a/ext/xsl/tests/bug33853.phpt +++ b/ext/xsl/tests/bug33853.phpt @@ -30,7 +30,4 @@ $newdom = $proc->transformToDoc($inputdom); ?> ===DONE=== --EXPECT-- -string(4) "TeSt" - ---UEXPECT-- -unicode(4) "TeSt" \ No newline at end of file +unicode(4) "TeSt" diff --git a/ext/zip/tests/bug38943.phpt b/ext/zip/tests/bug38943.phpt index b3f582ce19..daa2ce699e 100644 --- a/ext/zip/tests/bug38943.phpt +++ b/ext/zip/tests/bug38943.phpt @@ -27,32 +27,6 @@ array(1) { [0]=> int(1) } -object(myZip)#1 (%d) { - ["test":"myZip":private]=> - int(0) - ["testp"]=> - string(6) "foobar" - ["testarray":"myZip":private]=> - array(1) { - [0]=> - int(1) - } - ["status"]=> - int(0) - ["statusSys"]=> - int(0) - ["numFiles"]=> - int(0) - ["filename"]=> - string(0) "" - ["comment"]=> - string(0) "" -} ---UEXPECTF-- -array(1) { - [0]=> - int(1) -} object(myZip)#1 (8) { [u"test":u"myZip":private]=> int(0) diff --git a/ext/zip/tests/bug38944.phpt b/ext/zip/tests/bug38944.phpt index 0fc01eb3d2..ec382ec536 100644 --- a/ext/zip/tests/bug38944.phpt +++ b/ext/zip/tests/bug38944.phpt @@ -25,25 +25,6 @@ int(0) int(0) string(0) "" string(0) "" -object(ZipArchive)#%d (5) { - ["status"]=> - int(0) - ["statusSys"]=> - int(0) - ["numFiles"]=> - int(0) - ["filename"]=> - string(0) "" - ["comment"]=> - string(0) "" -} -Done ---UEXPECTF-- -int(0) -int(0) -int(0) -string(0) "" -string(0) "" object(ZipArchive)#1 (5) { [u"status"]=> int(0) diff --git a/ext/zip/tests/oo_extract.phpt b/ext/zip/tests/oo_extract.phpt index 7ca39eeab8..d27014e4ba 100644 --- a/ext/zip/tests/oo_extract.phpt +++ b/ext/zip/tests/oo_extract.phpt @@ -68,19 +68,6 @@ if (!file_exists($dirname . '__oo_extract_tmp/foo')) { rmdir_rf($dirname . '__oo_extract_tmp'); ?> --EXPECTF-- -blabla laber rababer sülz - -bar - -foo - - -bar - -bar - -foo ---UEXPECTF-- blabla laber rababer sülz bar diff --git a/ext/zip/tests/oo_stream.phpt b/ext/zip/tests/oo_stream.phpt index d851413c70..ef7030dc58 100644 --- a/ext/zip/tests/oo_stream.phpt +++ b/ext/zip/tests/oo_stream.phpt @@ -42,14 +42,6 @@ fclose($fp); ?> --EXPECTF-- resource(%d) of type (stream) -string(5) "foo - -" -string(5) "foo - -" ---UEXPECTF-- -resource(%d) of type (stream) unicode(5) "foo "