diff options
138 files changed, 10 insertions, 3915 deletions
diff --git a/ext/pdo/tests/bug_36428.phpt b/ext/pdo/tests/bug_36428.phpt index b414c6c5dd..2c8521b938 100755 --- a/ext/pdo/tests/bug_36428.phpt +++ b/ext/pdo/tests/bug_36428.phpt @@ -25,15 +25,6 @@ var_dump($res->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_PROPS_LATE, 'SimpleXMLElemen --EXPECTF-- array(1) { [0]=> - object(SimpleXMLElement)#%d (1) { - ["a"]=> - string(3) "xyz" - } -} -===DONE=== ---UEXPECTF-- -array(1) { - [0]=> object(SimpleXMLElement)#3 (1) { [u"a"]=> unicode(3) "xyz" diff --git a/ext/pdo/tests/pdo_001.phpt b/ext/pdo/tests/pdo_001.phpt index cc6a90f791..8ab643f184 100644 --- a/ext/pdo/tests/pdo_001.phpt +++ b/ext/pdo/tests/pdo_001.phpt @@ -28,30 +28,6 @@ var_dump($stmt->fetchAll(PDO::FETCH_ASSOC)); array(3) { [0]=> array(2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - array(2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - array(2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } -} ---UEXPECT-- -array(3) { - [0]=> - array(2) { [u"id"]=> unicode(1) "1" [u"val"]=> diff --git a/ext/pdo/tests/pdo_002.phpt b/ext/pdo/tests/pdo_002.phpt index 60bfffd743..1095f8d458 100644 --- a/ext/pdo/tests/pdo_002.phpt +++ b/ext/pdo/tests/pdo_002.phpt @@ -29,30 +29,6 @@ array(3) { [0]=> array(2) { [0]=> - string(1) "1" - [1]=> - string(1) "A" - } - [1]=> - array(2) { - [0]=> - string(1) "2" - [1]=> - string(1) "B" - } - [2]=> - array(2) { - [0]=> - string(1) "3" - [1]=> - string(1) "C" - } -} ---UEXPECT-- -array(3) { - [0]=> - array(2) { - [0]=> unicode(1) "1" [1]=> unicode(1) "A" diff --git a/ext/pdo/tests/pdo_003.phpt b/ext/pdo/tests/pdo_003.phpt index 617ebbc18b..d1f9be391b 100644 --- a/ext/pdo/tests/pdo_003.phpt +++ b/ext/pdo/tests/pdo_003.phpt @@ -28,42 +28,6 @@ var_dump($stmt->fetchAll(PDO::FETCH_BOTH)); array(3) { [0]=> array(4) { - ["id"]=> - string(1) "1" - [0]=> - string(1) "1" - ["val"]=> - string(1) "A" - [1]=> - string(1) "A" - } - [1]=> - array(4) { - ["id"]=> - string(1) "2" - [0]=> - string(1) "2" - ["val"]=> - string(1) "B" - [1]=> - string(1) "B" - } - [2]=> - array(4) { - ["id"]=> - string(1) "3" - [0]=> - string(1) "3" - ["val"]=> - string(1) "C" - [1]=> - string(1) "C" - } -} ---UEXPECT-- -array(3) { - [0]=> - array(4) { [u"id"]=> unicode(1) "1" [0]=> diff --git a/ext/pdo/tests/pdo_004.phpt b/ext/pdo/tests/pdo_004.phpt index 558eef4a5a..df22cc2d70 100644 --- a/ext/pdo/tests/pdo_004.phpt +++ b/ext/pdo/tests/pdo_004.phpt @@ -28,30 +28,6 @@ var_dump($stmt->fetchAll(PDO::FETCH_OBJ)); array(3) { [0]=> object(stdClass)#%d (2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - object(stdClass)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - object(stdClass)#%d (2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } -} ---UEXPECTF-- -array(3) { - [0]=> - object(stdClass)#%d (2) { [u"id"]=> unicode(1) "1" [u"val"]=> diff --git a/ext/pdo/tests/pdo_005.phpt b/ext/pdo/tests/pdo_005.phpt index 3d20159bac..06421a1ccb 100644 --- a/ext/pdo/tests/pdo_005.phpt +++ b/ext/pdo/tests/pdo_005.phpt @@ -53,109 +53,6 @@ var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestDerived', array(0))); array(3) { [0]=> object(stdClass)#%d (3) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - ["val2"]=> - string(2) "AA" - } - [1]=> - object(stdClass)#%d (3) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - ["val2"]=> - string(2) "BB" - } - [2]=> - object(stdClass)#%d (3) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - ["val2"]=> - string(2) "CC" - } -} -array(3) { - [0]=> - object(TestBase)#%d (3) { - ["id"]=> - string(1) "1" - ["val":protected]=> - string(1) "A" - ["val2":"TestBase":private]=> - string(2) "AA" - } - [1]=> - object(TestBase)#%d (3) { - ["id"]=> - string(1) "2" - ["val":protected]=> - string(1) "B" - ["val2":"TestBase":private]=> - string(2) "BB" - } - [2]=> - object(TestBase)#%d (3) { - ["id"]=> - string(1) "3" - ["val":protected]=> - string(1) "C" - ["val2":"TestBase":private]=> - string(2) "CC" - } -} -TestDerived::__construct(0,1) -TestDerived::__construct(1,2) -TestDerived::__construct(2,3) -array(3) { - [0]=> - object(TestDerived)#%d (5) { - ["row":protected]=> - int(0) - ["id"]=> - string(1) "1" - ["val":protected]=> - string(1) "A" - ["val2":"TestBase":private]=> - NULL - ["val2"]=> - string(2) "AA" - } - [1]=> - object(TestDerived)#%d (5) { - ["row":protected]=> - int(1) - ["id"]=> - string(1) "2" - ["val":protected]=> - string(1) "B" - ["val2":"TestBase":private]=> - NULL - ["val2"]=> - string(2) "BB" - } - [2]=> - object(TestDerived)#%d (5) { - ["row":protected]=> - int(2) - ["id"]=> - string(1) "3" - ["val":protected]=> - string(1) "C" - ["val2":"TestBase":private]=> - NULL - ["val2"]=> - string(2) "CC" - } -} ---UEXPECTF-- -array(3) { - [0]=> - object(stdClass)#%d (3) { [u"id"]=> unicode(1) "1" [u"val"]=> diff --git a/ext/pdo/tests/pdo_006.phpt b/ext/pdo/tests/pdo_006.phpt index 4636e951c1..cd300e2295 100644 --- a/ext/pdo/tests/pdo_006.phpt +++ b/ext/pdo/tests/pdo_006.phpt @@ -30,53 +30,6 @@ var_dump($stmt->fetchAll(PDO::FETCH_ASSOC|PDO::FETCH_GROUP)); ?> --EXPECT-- array(2) { - ["A"]=> - array(2) { - [0]=> - array(1) { - [0]=> - string(1) "1" - } - [1]=> - array(1) { - [0]=> - string(1) "2" - } - } - ["C"]=> - array(1) { - [0]=> - array(1) { - [0]=> - string(1) "3" - } - } -} -array(2) { - ["A"]=> - array(2) { - [0]=> - array(1) { - ["id"]=> - string(1) "1" - } - [1]=> - array(1) { - ["id"]=> - string(1) "2" - } - } - ["C"]=> - array(1) { - [0]=> - array(1) { - ["id"]=> - string(1) "3" - } - } -} ---UEXPECT-- -array(2) { [u"A"]=> array(2) { [0]=> diff --git a/ext/pdo/tests/pdo_007.phpt b/ext/pdo/tests/pdo_007.phpt index c69098e9b2..ff5ef17dba 100644 --- a/ext/pdo/tests/pdo_007.phpt +++ b/ext/pdo/tests/pdo_007.phpt @@ -30,41 +30,6 @@ var_dump($stmt->fetchAll(PDO::FETCH_ASSOC|PDO::FETCH_UNIQUE)); ?> --EXPECT-- array(3) { - ["A"]=> - array(1) { - [0]=> - string(1) "A" - } - ["B"]=> - array(1) { - [0]=> - string(1) "A" - } - ["C"]=> - array(1) { - [0]=> - string(1) "C" - } -} -array(3) { - ["A"]=> - array(1) { - ["val"]=> - string(1) "A" - } - ["B"]=> - array(1) { - ["val"]=> - string(1) "A" - } - ["C"]=> - array(1) { - ["val"]=> - string(1) "C" - } -} ---UEXPECT-- -array(3) { [u"A"]=> array(1) { [0]=> diff --git a/ext/pdo/tests/pdo_008.phpt b/ext/pdo/tests/pdo_008.phpt index f83c7d89a3..e2f9c4e1cd 100644 --- a/ext/pdo/tests/pdo_008.phpt +++ b/ext/pdo/tests/pdo_008.phpt @@ -27,19 +27,6 @@ var_dump($stmt->fetchAll(PDO::FETCH_NUM|PDO::FETCH_UNIQUE)); ?> --EXPECT-- array(2) { - ["A"]=> - array(1) { - [0]=> - string(1) "B" - } - ["C"]=> - array(1) { - [0]=> - string(1) "C" - } -} ---UEXPECT-- -array(2) { [u"A"]=> array(1) { [0]=> diff --git a/ext/pdo/tests/pdo_009.phpt b/ext/pdo/tests/pdo_009.phpt index cc27999d8f..592a920892 100644 --- a/ext/pdo/tests/pdo_009.phpt +++ b/ext/pdo/tests/pdo_009.phpt @@ -62,78 +62,6 @@ array(4) { [0]=> array(3) { [0]=> - string(8) "stdClass" - [1]=> - string(1) "1" - [2]=> - string(1) "A" - } - [1]=> - array(3) { - [0]=> - string(5) "Test1" - [1]=> - string(1) "2" - [2]=> - string(1) "B" - } - [2]=> - array(3) { - [0]=> - string(5) "Test2" - [1]=> - string(1) "3" - [2]=> - string(1) "C" - } - [3]=> - array(3) { - [0]=> - NULL - [1]=> - string(1) "4" - [2]=> - string(1) "D" - } -} -Test1::__construct() -Test2::__construct() -Test3::__construct() -array(4) { - [0]=> - object(stdClass)#%d (2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - object(Test2)#%d (2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } - [3]=> - object(Test3)#%d (2) { - ["id"]=> - string(1) "4" - ["val"]=> - string(1) "D" - } -} ---UEXPECTF-- -array(4) { - [0]=> - array(3) { - [0]=> unicode(8) "stdClass" [1]=> unicode(1) "1" diff --git a/ext/pdo/tests/pdo_010.phpt b/ext/pdo/tests/pdo_010.phpt index b68b022a2a..3ac34277fe 100644 --- a/ext/pdo/tests/pdo_010.phpt +++ b/ext/pdo/tests/pdo_010.phpt @@ -63,65 +63,6 @@ Test1::__construct() Test2::__construct() Test3::__construct() array(2) { - ["Group1"]=> - array(2) { - [0]=> - object(stdClass)#%d (2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - } - ["Group2"]=> - array(2) { - [0]=> - object(Test2)#%d (2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } - [1]=> - object(Test3)#%d (2) { - ["id"]=> - string(1) "4" - ["val"]=> - string(1) "D" - } - } -} -Test1::__construct() -Test2::__construct() -Test3::__construct() -array(2) { - ["Group1"]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - ["Group2"]=> - object(Test3)#%d (2) { - ["id"]=> - string(1) "4" - ["val"]=> - string(1) "D" - } -} ---UEXPECTF-- -Test1::__construct() -Test2::__construct() -Test3::__construct() -array(2) { [u"Group1"]=> array(2) { [0]=> diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt index 3567124695..95cf16c9ba 100644 --- a/ext/pdo/tests/pdo_011.phpt +++ b/ext/pdo/tests/pdo_011.phpt @@ -91,222 +91,6 @@ test(2,N/A) test(3,N/A) test(4,N/A) array(2) { - ["Group1"]=> - array(2) { - [0]=> - array(1) { - [1]=> - string(3) "N/A" - } - [1]=> - array(1) { - [2]=> - string(3) "N/A" - } - } - ["Group2"]=> - array(2) { - [0]=> - array(1) { - [3]=> - string(3) "N/A" - } - [1]=> - array(1) { - [4]=> - string(3) "N/A" - } - } -} -test(1,A) -test(2,B) -test(3,C) -test(4,D) -array(4) { - [0]=> - array(1) { - [1]=> - string(1) "A" - } - [1]=> - array(1) { - [2]=> - string(1) "B" - } - [2]=> - array(1) { - [3]=> - string(1) "C" - } - [3]=> - array(1) { - [4]=> - string(1) "D" - } -} -Test1::factory(1,A) -Test1::__construct(1,A) -Test1::factory(2,B) -Test1::__construct(2,B) -Test1::factory(3,C) -Test1::__construct(3,C) -Test1::factory(4,D) -Test1::__construct(4,D) -array(4) { - [0]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } - [3]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "4" - ["val"]=> - string(1) "D" - } -} -Test1::factory(1,A) -Test1::__construct(1,A) -Test1::factory(2,B) -Test1::__construct(2,B) -Test1::factory(3,C) -Test1::__construct(3,C) -Test1::factory(4,D) -Test1::__construct(4,D) -array(4) { - [0]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } - [3]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "4" - ["val"]=> - string(1) "D" - } -} -string(16) "DerivedStatement" -DerivedStatement::reTrieve(1,A) -DerivedStatement::reTrieve(2,B) -DerivedStatement::reTrieve(3,C) -DerivedStatement::reTrieve(4,D) -array(4) { - [0]=> - array(1) { - [1]=> - string(1) "A" - } - [1]=> - array(1) { - [2]=> - string(1) "B" - } - [2]=> - array(1) { - [3]=> - string(1) "C" - } - [3]=> - array(1) { - [4]=> - string(1) "D" - } -} -DerivedStatement::reTrieve(1,A) -DerivedStatement::reTrieve(2,B) -DerivedStatement::reTrieve(3,C) -DerivedStatement::reTrieve(4,D) -array(4) { - [0]=> - array(1) { - [1]=> - string(1) "A" - } - [1]=> - array(1) { - [2]=> - string(1) "B" - } - [2]=> - array(1) { - [3]=> - string(1) "C" - } - [3]=> - array(1) { - [4]=> - string(1) "D" - } -} -DerivedStatement::reTrieve(1,A) -DerivedStatement::reTrieve(2,B) -DerivedStatement::reTrieve(3,C) -DerivedStatement::reTrieve(4,D) -array(4) { - [0]=> - array(1) { - [1]=> - string(1) "A" - } - [1]=> - array(1) { - [2]=> - string(1) "B" - } - [2]=> - array(1) { - [3]=> - string(1) "C" - } - [3]=> - array(1) { - [4]=> - string(1) "D" - } -} ---UEXPECTF-- -DerivedStatement::__construct(Overloaded) -Test1::__construct(0,0) -test(1,N/A) -test(2,N/A) -test(3,N/A) -test(4,N/A) -array(2) { [u"Group1"]=> array(2) { [0]=> diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt index f73a8eb941..92d57c6c5b 100644 --- a/ext/pdo/tests/pdo_012.phpt +++ b/ext/pdo/tests/pdo_012.phpt @@ -48,59 +48,6 @@ array(2) { [0]=> array(2) { [0]=> - string(1) "A" - [1]=> - string(6) "Group1" - } - [1]=> - array(2) { - [0]=> - string(1) "B" - [1]=> - string(6) "Group2" - } -} -Test::__construct(N/A) -Test::__construct(N/A) -array(2) { - [0]=> - object(Test)#%d (2) { - ["val"]=> - string(1) "A" - ["grp"]=> - string(6) "Group1" - } - [1]=> - object(Test)#%d (2) { - ["val"]=> - string(1) "B" - ["grp"]=> - string(6) "Group2" - } -} -Test::__construct(Changed) -Test::__construct(Changed) -array(2) { - [0]=> - object(Test)#%d (2) { - ["val"]=> - string(1) "A" - ["grp"]=> - string(6) "Group1" - } - [1]=> - object(Test)#%d (2) { - ["val"]=> - string(1) "B" - ["grp"]=> - string(6) "Group2" - } -} ---UEXPECTF-- -array(2) { - [0]=> - array(2) { - [0]=> unicode(1) "A" [1]=> unicode(6) "Group1" diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt index c560b6405a..692fb8f4b3 100644 --- a/ext/pdo/tests/pdo_013.phpt +++ b/ext/pdo/tests/pdo_013.phpt @@ -56,47 +56,6 @@ foreach($stmt as $data) --EXPECTF-- array(2) { [0]=> - string(1) "A" - [1]=> - string(6) "Group1" -} -array(2) { - [0]=> - string(1) "B" - [1]=> - string(6) "Group2" -} -Test::__construct(N/A) -object(Test)#%d (2) { - ["val"]=> - string(1) "A" - ["grp"]=> - string(6) "Group1" -} -Test::__construct(N/A) -object(Test)#%d (2) { - ["val"]=> - string(1) "B" - ["grp"]=> - string(6) "Group2" -} -Test::__construct(WOW) -object(Test)#%d (2) { - ["val"]=> - string(1) "A" - ["grp"]=> - string(6) "Group1" -} -Test::__construct(WOW) -object(Test)#%d (2) { - ["val"]=> - string(1) "B" - ["grp"]=> - string(6) "Group2" -} ---UEXPECTF-- -array(2) { - [0]=> unicode(1) "A" [1]=> unicode(6) "Group1" diff --git a/ext/pdo/tests/pdo_014.phpt b/ext/pdo/tests/pdo_014.phpt index 6e16e25739..60a07ef613 100644 --- a/ext/pdo/tests/pdo_014.phpt +++ b/ext/pdo/tests/pdo_014.phpt @@ -72,37 +72,6 @@ foreach($stmt as $data) --EXPECTF-- Test::__construct(WOW) object(Test)#4 (2) { - ["val"]=> - string(1) "A" - ["grp"]=> - string(6) "Group1" -} -Test::__construct(WOW) -object(Test)#6 (2) { - ["val"]=> - string(1) "B" - ["grp"]=> - string(6) "Group2" -} -NULL -bool(false) -PDOStatementAggregate::__construct -PDOStatementAggregate::getIterator -array(2) { - [0]=> - string(1) "A" - [1]=> - string(6) "Group1" -} -array(2) { - [0]=> - string(1) "B" - [1]=> - string(6) "Group2" -} ---UEXPECTF-- -Test::__construct(WOW) -object(Test)#4 (2) { [u"val"]=> unicode(1) "A" [u"grp"]=> diff --git a/ext/pdo/tests/pdo_015.phpt b/ext/pdo/tests/pdo_015.phpt index 4140d4b4a2..14826b7991 100644 --- a/ext/pdo/tests/pdo_015.phpt +++ b/ext/pdo/tests/pdo_015.phpt @@ -43,64 +43,6 @@ var_dump($select2->fetchAll(PDO::FETCH_COLUMN|PDO::FETCH_GROUP)); --EXPECT-- array(2) { [0]=> - string(1) "1" - [1]=> - string(1) "2" -} -array(2) { - [0]=> - string(2) "A2" - [1]=> - string(2) "B2" -} -array(2) { - [1]=> - array(1) { - [0]=> - string(1) "A" - } - [2]=> - array(1) { - [0]=> - string(1) "A" - } -} -array(2) { - [1]=> - string(1) "A" - [2]=> - string(1) "A" -} -array(2) { - [1]=> - string(1) "1" - [2]=> - string(1) "2" -} -array(2) { - [1]=> - string(1) "A" - [2]=> - string(1) "A" -} -array(2) { - [1]=> - string(2) "A2" - [2]=> - string(2) "B2" -} -array(1) { - ["A"]=> - array(2) { - [0]=> - string(2) "A2" - [1]=> - string(2) "B2" - } -} ---UEXPECT-- -array(2) { - [0]=> unicode(1) "1" [1]=> unicode(1) "2" diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt index 6407fb1184..7246601db3 100644 --- a/ext/pdo/tests/pdo_016.phpt +++ b/ext/pdo/tests/pdo_016.phpt @@ -107,101 +107,6 @@ while($stmt2->fetch(PDO::FETCH_BOUND)) ?> --EXPECT-- -string(1) "3" -array(3) { - [0]=> - string(7) "String0" - [1]=> - string(7) "String1" - [2]=> - string(7) "String2" -} -===WHILE=== -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -===ALONE=== -array(1) { - [0]=> - string(7) "String0" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [2]=> - string(7) "String2" -} -===REBIND/SAME=== -array(1) { - [0]=> - string(7) "String0" -} -bool(true) -bool(true) -string(7) "String0" -bool(true) -bool(true) -string(1) "0" -array(1) { - [1]=> - string(7) "String1" -} -bool(true) -bool(true) -string(7) "String1" -bool(true) -bool(true) -string(1) "1" -array(1) { - [2]=> - string(7) "String2" -} -bool(true) -bool(true) -string(7) "String2" -bool(true) -bool(true) -string(1) "2" -===REBIND/CONFLICT=== -string(7) "String0" -string(7) "String1" -string(7) "String2" ---UEXPECT-- unicode(1) "3" array(3) { [0]=> diff --git a/ext/pdo/tests/pdo_016a.phpt b/ext/pdo/tests/pdo_016a.phpt index 2c39649c7b..923ebe87d7 100755 --- a/ext/pdo/tests/pdo_016a.phpt +++ b/ext/pdo/tests/pdo_016a.phpt @@ -107,101 +107,6 @@ while($stmt2->fetch(PDO::FETCH_BOUND)) ?> --EXPECT-- -string(1) "3" -array(3) { - [0]=> - string(7) "String0" - [1]=> - string(7) "String1" - [2]=> - string(7) "String2" -} -===WHILE=== -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -===ALONE=== -array(1) { - [0]=> - string(7) "String0" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [2]=> - string(7) "String2" -} -===REBIND/SAME=== -array(1) { - [0]=> - string(7) "String0" -} -bool(true) -bool(true) -string(7) "String0" -bool(true) -bool(true) -string(1) "0" -array(1) { - [1]=> - string(7) "String1" -} -bool(true) -bool(true) -string(7) "String1" -bool(true) -bool(true) -string(1) "1" -array(1) { - [2]=> - string(7) "String2" -} -bool(true) -bool(true) -string(7) "String2" -bool(true) -bool(true) -string(1) "2" -===REBIND/CONFLICT=== -string(7) "String0" -string(7) "String1" -string(7) "String2" ---UEXPECT-- unicode(1) "3" array(3) { [0]=> diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt index 79d59d36e3..bdca7781a2 100644 --- a/ext/pdo/tests/pdo_018.phpt +++ b/ext/pdo/tests/pdo_018.phpt @@ -156,119 +156,6 @@ var_dump($stmt->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_CLASSTYPE|PDO::FETCH_SERIAL ?> --EXPECTF-- -string(1) "3" -array(3) { - [0]=> - string(8) "stdClass" - [1]=> - string(8) "TestBase" - [2]=> - string(11) "TestDerived" -} -===TYPES=== -array(4) { - ["stdClass"]=> - string(1) "0" - ["TestBase"]=> - string(1) "1" - ["TestDerived"]=> - string(1) "2" - ["TestLeaf"]=> - NULL -} -===INSERT=== -TestBase::serialize() = 'a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}' -TestDerived::serialize() -TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}' -TestDerived::serialize() -TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}' -===DATA=== -array(4) { - [0]=> - string(0) "" - [1]=> - string(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}" - [2]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" - [3]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" -} -===FAILURE=== -Exception:SQLSTATE[HY000]: General error: cannot unserialize class -===COUNT=== -string(1) "3" -===DATABASE=== -array(3) { - [0]=> - array(2) { - ["name"]=> - string(8) "TestBase" - ["val"]=> - string(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}" - } - [1]=> - array(2) { - ["name"]=> - string(11) "TestDerived" - ["val"]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" - } - [2]=> - array(2) { - ["name"]=> - NULL - ["val"]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" - } -} -===FETCHCLASS=== -TestBase::unserialize(a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}) -TestDerived::unserialize() -TestBase::unserialize(a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}) -TestDerived::unserialize() -TestBase::unserialize(a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}) -array(3) { - [0]=> - object(TestBase)#%d (3) { - ["BasePub"]=> - string(7) "#Public" - ["BasePro":protected]=> - string(10) "#Protected" - ["BasePri":"TestBase":private]=> - string(8) "#Private" - } - [1]=> - object(TestDerived)#%d (6) { - ["BasePub"]=> - string(14) "#DerivedPublic" - ["BasePro":protected]=> - string(17) "#DerivdeProtected" - ["DerivedPub"]=> - string(7) "#Public" - ["DerivedPro":protected]=> - string(10) "#Protected" - ["DerivedPri":"TestDerived":private]=> - string(7) "Private" - ["BasePri":"TestBase":private]=> - string(7) "Private" - } - [2]=> - object(TestLeaf)#%d (6) { - ["BasePub"]=> - string(14) "#DerivedPublic" - ["BasePro":protected]=> - string(17) "#DerivdeProtected" - ["DerivedPub"]=> - string(7) "#Public" - ["DerivedPro":protected]=> - string(10) "#Protected" - ["DerivedPri":"TestDerived":private]=> - string(7) "Private" - ["BasePri":"TestBase":private]=> - string(7) "Private" - } -} ---UEXPECTF-- unicode(1) "3" array(3) { [0]=> diff --git a/ext/pdo/tests/pdo_019.phpt b/ext/pdo/tests/pdo_019.phpt index 0e10217060..45bfa4a47e 100644 --- a/ext/pdo/tests/pdo_019.phpt +++ b/ext/pdo/tests/pdo_019.phpt @@ -41,35 +41,6 @@ while($stmt->fetch(PDO::FETCH_BOUND)) { ?> --EXPECT-- -string(1) "4" -array(4) { - [0]=> - string(7) "String0" - [1]=> - string(7) "String1" - [2]=> - string(7) "String2" - [3]=> - string(7) "String3" -} -===WHILE=== -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -array(1) { - [3]=> - string(7) "String3" -} ---UEXPECT-- unicode(1) "4" array(4) { [0]=> diff --git a/ext/pdo/tests/pdo_023.phpt b/ext/pdo/tests/pdo_023.phpt index bf05c5a35c..5df63a889f 100644 --- a/ext/pdo/tests/pdo_023.phpt +++ b/ext/pdo/tests/pdo_023.phpt @@ -78,42 +78,6 @@ $db = NULL; int(1) int(2) object(PDODatabaseX)#%d (2) { - ["test1"]=> - int(1) - ["test2"]=> - int(22) -} -PDODatabaseX::query() -PDOStatementX::__construct() -PDOStatementX::__destruct() -PDODatabaseX::query() -PDOStatementX::__construct() -PDOStatementX::__destruct() -PDODatabaseX::query() -PDOStatementX::__construct() -PDOStatementX::__destruct() -PDODatabaseX::query() -PDOStatementX::__construct() -object(PDOStatementX)#%d (3) { - ["test1"]=> - int(1) - ["queryString"]=> - string(24) "SELECT val, id FROM test" - ["test2"]=> - int(22) -} -array(2) { - ["A"]=> - string(1) "0" - ["B"]=> - string(1) "1" -} -PDOStatementX::__destruct() -PDODatabaseX::__destruct() ---UEXPECTF-- -int(1) -int(2) -object(PDODatabaseX)#%d (2) { [u"test1"]=> int(1) [u"test2"]=> diff --git a/ext/pdo/tests/pdo_025.phpt b/ext/pdo/tests/pdo_025.phpt index 8594c1240a..0d6c64f454 100644 --- a/ext/pdo/tests/pdo_025.phpt +++ b/ext/pdo/tests/pdo_025.phpt @@ -61,58 +61,6 @@ foreach($stmt as $obj) { ?> --EXPECTF-- object(Test)#%d (3) { - ["id"]=> - string(2) "10" - ["val"]=> - string(3) "Abc" - ["val2"]=> - string(3) "zxy" -} -object(Test)#%d (3) { - ["id"]=> - string(2) "20" - ["val"]=> - string(3) "Def" - ["val2"]=> - string(3) "wvu" -} -object(Test)#%d (3) { - ["id"]=> - string(2) "30" - ["val"]=> - string(3) "Ghi" - ["val2"]=> - string(3) "tsr" -} -object(Test)#%d (3) { - ["id"]=> - string(2) "40" - ["val"]=> - string(3) "Jkl" - ["val2"]=> - string(3) "qpo" -} -object(Test)#%d (3) { - ["id"]=> - string(2) "50" - ["val"]=> - string(3) "Mno" - ["val2"]=> - string(3) "nml" -} -object(Test)#%d (3) { - ["id"]=> - string(2) "60" - ["val"]=> - string(3) "Pqr" - ["val2"]=> - string(3) "kji" -} -===FAIL=== - -Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d ---UEXPECTF-- -object(Test)#%d (3) { [u"id"]=> unicode(2) "10" [u"val"]=> diff --git a/ext/pdo/tests/pdo_026.phpt b/ext/pdo/tests/pdo_026.phpt index 9216eeb05b..f5bbafe127 100644 --- a/ext/pdo/tests/pdo_026.phpt +++ b/ext/pdo/tests/pdo_026.phpt @@ -76,40 +76,6 @@ foreach($stmt as $obj) { echo "===DONE===\n"; ?> --EXPECT-- -string(11) "PDODatabase" -string(12) "PDOStatement" -PDODatabase::query() -PDOStatementX::__construct() -string(13) "PDOStatementX" -string(11) "PDODatabase" -array(3) { - ["id"]=> - string(2) "10" - ["val"]=> - string(3) "Abc" - ["val2"]=> - string(3) "zxy" -} -array(3) { - ["id"]=> - string(2) "20" - ["val"]=> - string(3) "Def" - ["val2"]=> - string(3) "wvu" -} -array(3) { - ["id"]=> - string(2) "30" - ["val"]=> - string(3) "Ghi" - ["val2"]=> - string(3) "tsr" -} -===DONE=== -PDOStatementX::__destruct() -PDODatabase::__destruct() ---UEXPECT-- unicode(11) "PDODatabase" unicode(12) "PDOStatement" PDODatabase::query() diff --git a/ext/pdo/tests/pdo_028.phpt b/ext/pdo/tests/pdo_028.phpt index a7797a89b8..b42cb6f6c0 100644 --- a/ext/pdo/tests/pdo_028.phpt +++ b/ext/pdo/tests/pdo_028.phpt @@ -33,20 +33,6 @@ var_dump($stmt->fetchAll(PDO::FETCH_ASSOC)); array(1) { [0]=> array(4) { - ["id"]=> - string(1) "1" - ["val1"]=> - string(3) "one" - ["val2"]=> - string(3) "two" - ["val3"]=> - string(5) "three" - } -} ---UEXPECT-- -array(1) { - [0]=> - array(4) { [u"id"]=> unicode(1) "1" [u"val1"]=> diff --git a/ext/pdo/tests/pdo_029.phpt b/ext/pdo/tests/pdo_029.phpt index 1c85fb03b2..5df59ad22c 100755 --- a/ext/pdo/tests/pdo_029.phpt +++ b/ext/pdo/tests/pdo_029.phpt @@ -87,43 +87,6 @@ echo "===DONE===\n"; exit(0); ?> --EXPECT-- -string(11) "PDODatabase" -string(12) "PDOStatement" -===QUERY=== -PDODatabase::query() -PDOStatementX::__construct() -PDOStatementX::execute() -string(13) "PDOStatementX" -string(11) "PDODatabase" -===FOREACH=== -array(3) { - ["id"]=> - string(2) "10" - ["val"]=> - string(3) "Abc" - ["val2"]=> - string(3) "zxy" -} -array(3) { - ["id"]=> - string(2) "20" - ["val"]=> - string(3) "Def" - ["val2"]=> - string(3) "wvu" -} -array(3) { - ["id"]=> - string(2) "30" - ["val"]=> - string(3) "Ghi" - ["val2"]=> - string(3) "tsr" -} -===DONE=== -PDOStatementX::__destruct() -PDODatabase::__destruct() ---UEXPECT-- unicode(11) "PDODatabase" unicode(12) "PDOStatement" ===QUERY=== diff --git a/ext/pdo/tests/pdo_030.phpt b/ext/pdo/tests/pdo_030.phpt index 4b3f77bdeb..b7fe1b91b5 100755 --- a/ext/pdo/tests/pdo_030.phpt +++ b/ext/pdo/tests/pdo_030.phpt @@ -88,56 +88,6 @@ echo "===DONE===\n"; exit(0); ?> --EXPECTF-- -string(11) "PDODatabase" -string(12) "PDOStatement" -===QUERY=== -array(1) { - [0]=> - string(12) "PDOStatement" -} -array(2) { - [0]=> - string(13) "PDOStatementX" - [1]=> - array(1) { - [0]=> - object(PDODatabase)#%d (0) { - } - } -} -PDODatabase::query() -PDOStatementX::__construct() -string(13) "PDOStatementX" -string(11) "PDODatabase" -===FOREACH=== -array(3) { - ["id"]=> - string(2) "10" - ["val"]=> - string(3) "Abc" - ["val2"]=> - string(3) "zxy" -} -array(3) { - ["id"]=> - string(2) "20" - ["val"]=> - string(3) "Def" - ["val2"]=> - string(3) "wvu" -} -array(3) { - ["id"]=> - string(2) "30" - ["val"]=> - string(3) "Ghi" - ["val2"]=> - string(3) "tsr" -} -===DONE=== -PDOStatementX::__destruct() -PDODatabase::__destruct() ---UEXPECTF-- unicode(11) "PDODatabase" unicode(12) "PDOStatement" ===QUERY=== diff --git a/ext/pdo/tests/pdo_032.phpt b/ext/pdo/tests/pdo_032.phpt index 6439090be3..2d46de585e 100644 --- a/ext/pdo/tests/pdo_032.phpt +++ b/ext/pdo/tests/pdo_032.phpt @@ -38,53 +38,6 @@ $stmt->closeCursor(); array(3) { [0]=> array(2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - array(2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - array(2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } -} -array(3) { - [0]=> - array(2) { - ["ID"]=> - string(1) "1" - ["VAL"]=> - string(1) "A" - } - [1]=> - array(2) { - ["ID"]=> - string(1) "2" - ["VAL"]=> - string(1) "B" - } - [2]=> - array(2) { - ["ID"]=> - string(1) "3" - ["VAL"]=> - string(1) "C" - } -} ---UEXPECT-- -array(3) { - [0]=> - array(2) { [u"id"]=> unicode(1) "1" [u"val"]=> diff --git a/ext/pdo_mysql/tests/bug_33689.phpt b/ext/pdo_mysql/tests/bug_33689.phpt index 1001b71435..37d0d032db 100644 --- a/ext/pdo_mysql/tests/bug_33689.phpt +++ b/ext/pdo_mysql/tests/bug_33689.phpt @@ -29,30 +29,6 @@ print_r($stmt->getColumnMeta(0)); ?> --EXPECTF-- object(PDOStatement)#%d (1) { - ["queryString"]=> - string(18) "SELECT * from test" -} -Array -( - [bar] => 1 - [0] => 1 -) -Array -( - [native_type] => LONG - [flags] => Array - ( - [0] => not_null - ) - - [table] => test - [name] => bar - [len] => 11 - [precision] => 0 - [pdo_type] => 2 -) ---UEXPECTF-- -object(PDOStatement)#%d (1) { [u"queryString"]=> unicode(18) "SELECT * from test" } diff --git a/ext/pdo_oci/tests/pdo_oci_attr_case.phpt b/ext/pdo_oci/tests/pdo_oci_attr_case.phpt index bf2de526bf..700c469d8c 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_case.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_case.phpt @@ -57,32 +57,6 @@ echo "Done\n"; Test 1 - Force column names to lower case int(2) array(1) { - ["dummy"]=> - string(1) "X" -} -Test 2 - Leave column names as returned by the database driver -int(0) -array(1) { - ["DUMMY"]=> - string(1) "X" -} -Test 3 - Force column names to upper case -int(1) -array(1) { - ["DUMMY"]=> - string(1) "X" -} -Test 4 - Setting on statement has no effect. Attempt lower case but get upper -Mode desired is 2 -array(1) { - ["DUMMY"]=> - string(1) "X" -} -Done ---UEXPECT-- -Test 1 - Force column names to lower case -int(2) -array(1) { [u"dummy"]=> unicode(1) "X" } diff --git a/ext/pdo_oci/tests/pdo_oci_attr_client.phpt b/ext/pdo_oci/tests/pdo_oci_attr_client.phpt index b34506c1bf..ad96252b0d 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_client.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_client.phpt @@ -38,10 +38,6 @@ echo "Done\n"; ?> --EXPECTF-- -ATTR_CLIENT_VERSION: string(%d) "%d.%s" -Version OK, so far as can be portably checked -Done ---UEXPECTF-- ATTR_CLIENT_VERSION: unicode(%d) "%d.%s" Version OK, so far as can be portably checked Done diff --git a/ext/pdo_oci/tests/pdo_oci_attr_drivername.phpt b/ext/pdo_oci/tests/pdo_oci_attr_drivername.phpt index d1b6b69827..1185d2d3a6 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_drivername.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_drivername.phpt @@ -17,8 +17,5 @@ var_dump($dbh->getAttribute(PDO::ATTR_DRIVER_NAME)); echo "Done\n"; ?> --EXPECT-- -string(3) "oci" -Done ---UEXPECT-- unicode(3) "oci" Done diff --git a/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt b/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt index ab89ec1f63..c809450348 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt @@ -56,20 +56,6 @@ PDO::ATTR_ORACLE_NULLS: PDO::NULL_EMPTY_STRING: int(1) NULL NULL PDO::ATTR_ORACLE_NULLS: PDO::NULL_TO_STRING: int(2) -string(0) "" -string(0) "" -Done ---UEXPECT-- -PDO::ATTR_ORACLE_NULLS: Default: int(0) -NULL -NULL -PDO::ATTR_ORACLE_NULLS: PDO::NULL_NATURAL: int(0) -NULL -NULL -PDO::ATTR_ORACLE_NULLS: PDO::NULL_EMPTY_STRING: int(1) -NULL -NULL -PDO::ATTR_ORACLE_NULLS: PDO::NULL_TO_STRING: int(2) unicode(0) "" unicode(0) "" Done diff --git a/ext/pdo_oci/tests/pdo_oci_attr_server.phpt b/ext/pdo_oci/tests/pdo_oci_attr_server.phpt index 647f66f960..2ed78a6488 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_server.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_server.phpt @@ -33,13 +33,6 @@ echo "Done\n"; ?> --EXPECTF-- Test 1 -ATTR_SERVER_VERSION: string(%d) "%d.%d.%d.%d.%d" -Test 2 -ATTR_SERVER_INFO -Found 'Oracle' at position 0 as expected -Done ---UEXPECTF-- -Test 1 ATTR_SERVER_VERSION: unicode(%d) "%d.%d.%d.%d.%d" Test 2 ATTR_SERVER_INFO diff --git a/ext/pdo_oci/tests/pdo_oci_quote1.phpt b/ext/pdo_oci/tests/pdo_oci_quote1.phpt index f76b6cd5ef..9055dc2ca5 100644 --- a/ext/pdo_oci/tests/pdo_oci_quote1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_quote1.phpt @@ -42,128 +42,6 @@ echo "Done\n"; ?> --EXPECTF-- Unquoted : NULL -Quoted : string(2) "''" -array(1) { - [0]=> - array(1) { - ["t"]=> - NULL - } -} -Unquoted : string(0) "" -Quoted : string(2) "''" -array(1) { - [0]=> - array(1) { - ["t"]=> - NULL - } -} -Unquoted : string(1) "a" -Quoted : string(3) "'a'" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(1) "a" - } -} -Unquoted : string(2) "ab" -Quoted : string(4) "'ab'" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(2) "ab" - } -} -Unquoted : string(3) "abc" -Quoted : string(5) "'abc'" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(3) "abc" - } -} -Unquoted : string(5) "ab'cd" -Quoted : string(8) "'ab''cd'" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(5) "ab'cd" - } -} -Unquoted : string(4) "a\b -" -Quoted : string(6) "'a\b -'" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(4) "a\b -" - } -} -Unquoted : string(1) "'" -Quoted : string(4) "''''" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(1) "'" - } -} -Unquoted : string(2) "''" -Quoted : string(6) "''''''" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(2) "''" - } -} -Unquoted : string(2) "a'" -Quoted : string(5) "'a'''" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(2) "a'" - } -} -Unquoted : string(2) "'z" -Quoted : string(5) "'''z'" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(2) "'z" - } -} -Unquoted : string(4) "a''b" -Quoted : string(8) "'a''''b'" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(4) "a''b" - } -} -Unquoted : string(1) """ -Quoted : string(3) "'"'" -array(1) { - [0]=> - array(1) { - ["t"]=> - string(1) """ - } -} -Done ---UEXPECTF-- -Unquoted : NULL Quoted : unicode(2) "''" array(1) { [0]=> diff --git a/ext/pdo_oci/tests/pecl_bug_6364.phpt b/ext/pdo_oci/tests/pecl_bug_6364.phpt index 868b5fbab7..034a5c3278 100644 --- a/ext/pdo_oci/tests/pecl_bug_6364.phpt +++ b/ext/pdo_oci/tests/pecl_bug_6364.phpt @@ -44,32 +44,6 @@ $dbh->exec ("drop table bug_6364_t"); ?> --EXPECTF-- -string(4) "val4" -string(4) "val5" -array(10) { - ["c1"]=> - string(2) "p1" - [0]=> - string(2) "p1" - ["c2"]=> - string(2) "p2" - [1]=> - string(2) "p2" - ["c3"]=> - string(2) "p3" - [2]=> - string(2) "p3" - ["c4"]=> - NULL - [3]=> - NULL - ["c5"]=> - NULL - [4]=> - NULL -} -Done ---UEXPECTF-- unicode(4) "val4" unicode(4) "val5" array(10) { diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt index 86a4961795..6f2db37d5a 100644 --- a/ext/phar/tests/zip/refcount1.phpt +++ b/ext/phar/tests/zip/refcount1.phpt @@ -68,24 +68,3 @@ object(PharFileInfo)#%d (2) { string(5) "extra" extra ===DONE=== ---UEXPECTF-- -===CLOSE=== -object(PharFileInfo)#%d (2) { - [u"pathName":u"SplFileInfo":private]=> - string(%d) "phar://%srefcount1.phar.zip/b" - [u"fileName":u"SplFileInfo":private]=> - string(%d) "phar://%srefcount1.phar.zip/b/c.php" -} -string(5) "extra" -===UNLINK=== - -Warning: unlink(): phar error: "b/c.php" in phar "%srefcount1.phar.zip", has open file pointers, cannot unlink in %srefcount1.php on line %d -object(PharFileInfo)#%d (2) { - [u"pathName":u"SplFileInfo":private]=> - string(%d) "phar://%srefcount1.phar.zip/b" - [u"fileName":u"SplFileInfo":private]=> - string(%s) "phar://%srefcount1.phar.zip/b/c.php" -} -string(5) "extra" -extra -===DONE=== diff --git a/ext/reflection/tests/001.phpt b/ext/reflection/tests/001.phpt index f60d4dd884..84000c4a33 100755 --- a/ext/reflection/tests/001.phpt +++ b/ext/reflection/tests/001.phpt @@ -81,17 +81,6 @@ array(0) { } array(2) { [0]=> - string(3) "bla" - [1]=> - string(4) "name" -} -string(17) "ReflectionClassEx" -===DONE=== ---UEXPECT-- -array(0) { -} -array(2) { - [0]=> unicode(3) "bla" [1]=> unicode(4) "name" diff --git a/ext/reflection/tests/002.phpt b/ext/reflection/tests/002.phpt index 41c0373c20..f974a99c69 100755 --- a/ext/reflection/tests/002.phpt +++ b/ext/reflection/tests/002.phpt @@ -50,19 +50,6 @@ var_dump($r->bar); ===DONE=== --EXPECTF-- ReflectionMethodEx::__construct -string(18) "ReflectionMethodEx" -string(7) "getName" -string(3) "xyz" -NULL -Cannot set read-only property ReflectionMethodEx::$class -Cannot set read-only property ReflectionMethodEx::$name -string(18) "ReflectionMethodEx" -string(7) "getName" -string(3) "bar" -string(3) "baz" -===DONE=== ---UEXPECTF-- -ReflectionMethodEx::__construct unicode(18) "ReflectionMethodEx" unicode(7) "getName" unicode(3) "xyz" diff --git a/ext/reflection/tests/005.phpt b/ext/reflection/tests/005.phpt index 032775b343..bd5dd24898 100755 --- a/ext/reflection/tests/005.phpt +++ b/ext/reflection/tests/005.phpt @@ -46,13 +46,6 @@ foreach($r->getMethods() as $m) ?> ===DONE=== --EXPECT-- -string(19) "Comment for class A" -string(15) "Method A::bla()" -bool(false) -bool(false) -string(22) "* Comment for A::baz()" -===DONE=== ---UEXPECT-- unicode(19) "Comment for class A" unicode(15) "Method A::bla()" bool(false) diff --git a/ext/reflection/tests/006.phpt b/ext/reflection/tests/006.phpt index 4e76fa7336..b332a0ceed 100755 --- a/ext/reflection/tests/006.phpt +++ b/ext/reflection/tests/006.phpt @@ -85,23 +85,6 @@ TestDerived::testing(); ===DONE=== <?php exit(0); ?> --EXPECT-- -string(3) "pub" -string(3) "pub" -string(7) "updated" -EXCEPTION -EXCEPTION -string(7) "updated" -string(7) "updated" -string(7) "updated" -EXCEPTION -EXCEPTION -string(7) "updated" -string(7) "updated" -string(7) "updated" -EXCEPTION -EXCEPTION -===DONE=== ---UEXPECT-- unicode(3) "pub" unicode(3) "pub" unicode(7) "updated" diff --git a/ext/reflection/tests/007.phpt b/ext/reflection/tests/007.phpt index cb734182f1..5c4b48d092 100755 --- a/ext/reflection/tests/007.phpt +++ b/ext/reflection/tests/007.phpt @@ -91,76 +91,6 @@ test('WithCtorWithArgs'); ====>Class_does_not_exist __autoload(Class_does_not_exist) -string(41) "Class Class_does_not_exist does not exist" -====>NoCtor -====>newInstance() -object(NoCtor)#%d (0) { -} -====>newInstance(25) -string(86) "Class NoCtor does not have a constructor, so you cannot pass any constructor arguments" -====>newInstance(25, 42) -string(86) "Class NoCtor does not have a constructor, so you cannot pass any constructor arguments" - -====>WithCtor -====>newInstance() -WithCtor::__construct() -array(0) { -} -object(WithCtor)#%d (0) { -} -====>newInstance(25) -WithCtor::__construct() -array(1) { - [0]=> - int(25) -} -object(WithCtor)#%d (0) { -} -====>newInstance(25, 42) -WithCtor::__construct() -array(2) { - [0]=> - int(25) - [1]=> - int(42) -} -object(WithCtor)#%d (0) { -} - -====>WithCtorWithArgs -====>newInstance() - -Warning: Missing argument 1 for WithCtorWithArgs::__construct() in %s007.php on line %d - -Notice: Undefined variable: arg in %s007.php on line %d -WithCtorWithArgs::__construct() -array(0) { -} -object(WithCtorWithArgs)#%d (0) { -} -====>newInstance(25) -WithCtorWithArgs::__construct(25) -array(1) { - [0]=> - int(25) -} -object(WithCtorWithArgs)#%d (0) { -} -====>newInstance(25, 42) -WithCtorWithArgs::__construct(25) -array(2) { - [0]=> - int(25) - [1]=> - int(42) -} -object(WithCtorWithArgs)#%d (0) { -} - -===DONE=== ---UEXPECTF-- -====>Class_does_not_exist -__autoload(Class_does_not_exist) unicode(41) "Class Class_does_not_exist does not exist" ====>NoCtor ====>newInstance() diff --git a/ext/reflection/tests/009.phpt b/ext/reflection/tests/009.phpt index e88c6d5aba..4c06da15a8 100755 --- a/ext/reflection/tests/009.phpt +++ b/ext/reflection/tests/009.phpt @@ -27,17 +27,6 @@ foreach ($a as $key=>$val) { echo "Done\n"; ?> --EXPECT-- -string(20) "Invalid method name " -string(21) "Invalid method name 1" -string(21) "Class does not exist" -string(22) "Class a does not exist" -string(21) "Class does not exist" -string(22) "Class a does not exist" -string(21) "Class does not exist" -string(66) "The parameter class is expected to be either a string or an object" -string(21) "Class does not exist" -Done ---UEXPECT-- unicode(20) "Invalid method name " unicode(21) "Invalid method name 1" unicode(21) "Class does not exist" diff --git a/ext/reflection/tests/015.phpt b/ext/reflection/tests/015.phpt index 9035c19b96..2893e00236 100755 --- a/ext/reflection/tests/015.phpt +++ b/ext/reflection/tests/015.phpt @@ -11,7 +11,5 @@ $inis = $ext->getINIEntries(); var_dump($inis["user_agent"]); ?> --EXPECT-- -string(3) "php" ---UEXPECT-- unicode(3) "php" diff --git a/ext/reflection/tests/016.phpt b/ext/reflection/tests/016.phpt index e1f71b3697..46e379311f 100755 --- a/ext/reflection/tests/016.phpt +++ b/ext/reflection/tests/016.phpt @@ -15,11 +15,6 @@ var_dump($deps); ?> --EXPECT-- array(1) { - ["libxml"]=> - string(8) "Required" -} ---UEXPECT-- -array(1) { [u"libxml"]=> unicode(8) "Required" } diff --git a/ext/reflection/tests/017.phpt b/ext/reflection/tests/017.phpt index 56bd508d15..9280fbbe6b 100755 --- a/ext/reflection/tests/017.phpt +++ b/ext/reflection/tests/017.phpt @@ -15,26 +15,6 @@ Class [ <user> class Foo ] { @@ %s017.php 2-4 - Constants [1] { - Constant [ string test ] { ok } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [0] { - } -} ---UEXPECTF-- -Class [ <user> class Foo ] { - @@ %s017.php 2-4 - - - Constants [1] { Constant [ Unicode string test ] { ok } } diff --git a/ext/reflection/tests/018.phpt b/ext/reflection/tests/018.phpt index 0cebd82ab6..535a83c706 100755 --- a/ext/reflection/tests/018.phpt +++ b/ext/reflection/tests/018.phpt @@ -9,13 +9,6 @@ var_dump(Reflection::getModifierNames(ReflectionMethod::IS_FINAL | ReflectionMet --EXPECT-- array(2) { [0]=> - string(5) "final" - [1]=> - string(9) "protected" -} ---UEXPECT-- -array(2) { - [0]=> unicode(5) "final" [1]=> unicode(9) "protected" diff --git a/ext/reflection/tests/019.phpt b/ext/reflection/tests/019.phpt index 0f7daa21ed..6345ac26d3 100755 --- a/ext/reflection/tests/019.phpt +++ b/ext/reflection/tests/019.phpt @@ -8,6 +8,4 @@ $f = new ReflectionFunction("sleep"); var_dump($f->getExtensionName()); ?> --EXPECT-- -string(8) "standard" ---UEXPECT-- unicode(8) "standard" diff --git a/ext/reflection/tests/020.phpt b/ext/reflection/tests/020.phpt index 8856acb0c7..4440cd18f7 100755 --- a/ext/reflection/tests/020.phpt +++ b/ext/reflection/tests/020.phpt @@ -24,11 +24,5 @@ var_dump($obj->hasProperty("p4")); bool(true) bool(true) bool(true) -string(2) "p4" -bool(false) ---UEXPECT-- -bool(true) -bool(true) -bool(true) unicode(2) "p4" bool(false) diff --git a/ext/reflection/tests/023.phpt b/ext/reflection/tests/023.phpt index 8085f15c15..04d2c9afa1 100755 --- a/ext/reflection/tests/023.phpt +++ b/ext/reflection/tests/023.phpt @@ -19,19 +19,6 @@ var_dump($class->getDefaultProperties()); ?> --EXPECT-- array(5) { - ["p4"]=> - int(4) - ["p5"]=> - int(5) - ["p6"]=> - int(6) - ["p2"]=> - int(2) - ["p3"]=> - int(3) -} ---UEXPECT-- -array(5) { [u"p4"]=> int(4) [u"p5"]=> diff --git a/ext/reflection/tests/025.phpt b/ext/reflection/tests/025.phpt index 06da4b9a5d..388d2cc292 100644 --- a/ext/reflection/tests/025.phpt +++ b/ext/reflection/tests/025.phpt @@ -52,71 +52,6 @@ echo "Done\n"; hoho */ Function [ <user> function test ] { - @@ %s025.php 6 - 8 - - - Parameters [3] { - Parameter #0 [ <required> $a ] - Parameter #1 [ <optional> $b = 1 ] - Parameter #2 [ <optional> $c = '' ] - } -} - -NULL ---getName-- -string(4) "test" ---isInternal-- -bool(false) ---isUserDefined-- -bool(true) ---getFilename-- -string(%d) "%s025.php" ---getStartline-- -int(6) ---getEndline-- -int(8) ---getDocComment-- -string(11) "/** -hoho -*/" ---getStaticVariables-- -array(1) { - ["var"]=> - int(1) -} ---invoke-- -NULL ---invokeArgs-- -NULL ---returnsReference-- -bool(false) ---getParameters-- -array(3) { - [0]=> - &object(ReflectionParameter)#2 (1) { - ["name"]=> - string(1) "a" - } - [1]=> - &object(ReflectionParameter)#3 (1) { - ["name"]=> - string(1) "b" - } - [2]=> - &object(ReflectionParameter)#4 (1) { - ["name"]=> - string(1) "c" - } -} ---getNumberOfParameters-- -int(3) ---getNumberOfRequiredParameters-- -int(1) -Done ---UEXPECTF-- -/** -hoho -*/ -Function [ <user> function test ] { @@ %s 6 - 8 - Parameters [3] { diff --git a/ext/reflection/tests/ReflectionFunction_getExtension.phpt b/ext/reflection/tests/ReflectionFunction_getExtension.phpt index 18345892c7..191b01296b 100644 --- a/ext/reflection/tests/ReflectionFunction_getExtension.phpt +++ b/ext/reflection/tests/ReflectionFunction_getExtension.phpt @@ -12,8 +12,8 @@ var_dump($function->getExtension()); ?> --EXPECTF-- object(ReflectionExtension)#%i (1) { - ["name"]=> - string(8) "standard" + [u"name"]=> + unicode(8) "standard" } NULL diff --git a/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt b/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt index 7553a50b34..704788759e 100644 --- a/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt +++ b/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt @@ -11,6 +11,6 @@ $function = new ReflectionFunction('foo'); var_dump($function->getExtensionName()); ?> --EXPECT-- -string(8) "standard" +unicode(8) "standard" bool(false) diff --git a/ext/reflection/tests/ReflectionMethod_basic2.phpt b/ext/reflection/tests/ReflectionMethod_basic2.phpt index b287c3ac25..95b24810cb 100644 --- a/ext/reflection/tests/ReflectionMethod_basic2.phpt +++ b/ext/reflection/tests/ReflectionMethod_basic2.phpt @@ -54,141 +54,6 @@ reflectMethod("TestClass", "__destruct"); Reflecting on method DerivedClass::foo() __toString(): -string(%d) "Method [ <user, inherits TestClass> public method foo ] { - @@ %s 16 - 18 -} -" - -export(): -string(%d) "Method [ <user, inherits TestClass> public method foo ] { - @@ %s 16 - 18 -} -" - -********************************** -********************************** -Reflecting on method TestClass::stat() - -__toString(): -string(%d) "Method [ <user> static public method stat ] { - @@ %s 20 - 22 -} -" - -export(): -string(%d) "Method [ <user> static public method stat ] { - @@ %s 20 - 22 -} -" - -********************************** -********************************** -Reflecting on method TestClass::priv() - -__toString(): -string(%d) "Method [ <user> private method priv ] { - @@ %s 24 - 26 -} -" - -export(): -string(%d) "Method [ <user> private method priv ] { - @@ %s 24 - 26 -} -" - -********************************** -********************************** -Reflecting on method TestClass::prot() - -__toString(): -string(%d) "Method [ <user> protected method prot ] { - @@ %s 28 - 28 -} -" - -export(): -string(%d) "Method [ <user> protected method prot ] { - @@ %s 28 - 28 -} -" - -********************************** -********************************** -Reflecting on method DerivedClass::prot() - -__toString(): -string(%d) "Method [ <user, inherits TestClass> protected method prot ] { - @@ %s 28 - 28 -} -" - -export(): -string(%d) "Method [ <user, inherits TestClass> protected method prot ] { - @@ %s 28 - 28 -} -" - -********************************** -********************************** -Reflecting on method TestInterface::int() - -__toString(): -string(%d) "Method [ <user> abstract public method int ] { - @@ %s 36 - 36 -} -" - -export(): -string(%d) "Method [ <user> abstract public method int ] { - @@ %s 36 - 36 -} -" - -********************************** -********************************** -Reflecting on method ReflectionProperty::__construct() - -__toString(): -string(%d) "Method [ <internal:Reflection, ctor> public method __construct ] { - - - Parameters [1] { - Parameter #0 [ <required> $argument ] - } -} -" - -export(): -string(%d) "Method [ <internal:Reflection, ctor> public method __construct ] { - - - Parameters [1] { - Parameter #0 [ <required> $argument ] - } -} -" - -********************************** -********************************** -Reflecting on method TestClass::__destruct() - -__toString(): -string(%d) "Method [ <user, dtor> public method __destruct ] { - @@ %s 30 - 30 -} -" - -export(): -string(%d) "Method [ <user, dtor> public method __destruct ] { - @@ %s 30 - 30 -} -" - -********************************** ---UEXPECTF-- -********************************** -Reflecting on method DerivedClass::foo() - -__toString(): unicode(%d) "Method [ <user, inherits TestClass> public method foo ] { @@ %sReflectionMethod_basic2.php 16 - 18 } diff --git a/ext/reflection/tests/ReflectionMethod_basic3.phpt b/ext/reflection/tests/ReflectionMethod_basic3.phpt index 2878fc5673..8205c665a1 100644 --- a/ext/reflection/tests/ReflectionMethod_basic3.phpt +++ b/ext/reflection/tests/ReflectionMethod_basic3.phpt @@ -58,119 +58,6 @@ Reflecting on method DerivedClass::foo() getName(): -string(3) "foo" - -isInternal(): -bool(false) - -isUserDefined(): -bool(true) - -********************************** -********************************** -Reflecting on method TestClass::stat() - - -getName(): -string(4) "stat" - -isInternal(): -bool(false) - -isUserDefined(): -bool(true) - -********************************** -********************************** -Reflecting on method TestClass::priv() - - -getName(): -string(4) "priv" - -isInternal(): -bool(false) - -isUserDefined(): -bool(true) - -********************************** -********************************** -Reflecting on method TestClass::prot() - - -getName(): -string(4) "prot" - -isInternal(): -bool(false) - -isUserDefined(): -bool(true) - -********************************** -********************************** -Reflecting on method DerivedClass::prot() - - -getName(): -string(4) "prot" - -isInternal(): -bool(false) - -isUserDefined(): -bool(true) - -********************************** -********************************** -Reflecting on method TestInterface::int() - - -getName(): -string(3) "int" - -isInternal(): -bool(false) - -isUserDefined(): -bool(true) - -********************************** -********************************** -Reflecting on method ReflectionProperty::__construct() - - -getName(): -string(11) "__construct" - -isInternal(): -bool(true) - -isUserDefined(): -bool(false) - -********************************** -********************************** -Reflecting on method TestClass::__destruct() - - -getName(): -string(10) "__destruct" - -isInternal(): -bool(false) - -isUserDefined(): -bool(true) - -********************************** ---UEXPECT-- -********************************** -Reflecting on method DerivedClass::foo() - - -getName(): unicode(3) "foo" isInternal(): diff --git a/ext/reflection/tests/ReflectionMethod_basic4.phpt b/ext/reflection/tests/ReflectionMethod_basic4.phpt index 81ec97f8fb..1a46a34370 100644 --- a/ext/reflection/tests/ReflectionMethod_basic4.phpt +++ b/ext/reflection/tests/ReflectionMethod_basic4.phpt @@ -61,119 +61,6 @@ Reflecting on method DerivedClass::foo() getFileName(): -string(%d) "%sReflectionMethod_basic4.php" - -getStartLine(): -int(18) - -getEndLine(): -int(24) - -********************************** -********************************** -Reflecting on method TestClass::stat() - - -getFileName(): -string(%d) "%sReflectionMethod_basic4.php" - -getStartLine(): -int(26) - -getEndLine(): -int(28) - -********************************** -********************************** -Reflecting on method TestClass::priv() - - -getFileName(): -string(%d) "%sReflectionMethod_basic4.php" - -getStartLine(): -int(30) - -getEndLine(): -int(32) - -********************************** -********************************** -Reflecting on method TestClass::prot() - - -getFileName(): -string(%d) "%sReflectionMethod_basic4.php" - -getStartLine(): -int(34) - -getEndLine(): -int(34) - -********************************** -********************************** -Reflecting on method DerivedClass::prot() - - -getFileName(): -string(%d) "%sReflectionMethod_basic4.php" - -getStartLine(): -int(34) - -getEndLine(): -int(34) - -********************************** -********************************** -Reflecting on method TestInterface::int() - - -getFileName(): -string(%d) "%sReflectionMethod_basic4.php" - -getStartLine(): -int(42) - -getEndLine(): -int(42) - -********************************** -********************************** -Reflecting on method ReflectionProperty::__construct() - - -getFileName(): -bool(false) - -getStartLine(): -bool(false) - -getEndLine(): -bool(false) - -********************************** -********************************** -Reflecting on method TestClass::__destruct() - - -getFileName(): -string(%d) "%sReflectionMethod_basic4.php" - -getStartLine(): -int(36) - -getEndLine(): -int(36) - -********************************** ---UEXPECTF-- -********************************** -Reflecting on method DerivedClass::foo() - - -getFileName(): unicode(%d) "%sReflectionMethod_basic4.php" getStartLine(): diff --git a/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt index e5fe27a8d0..303b12a7b3 100644 --- a/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt @@ -20,15 +20,6 @@ var_dump($methodInfo->getDeclaringClass()); ?> --EXPECTF-- object(ReflectionClass)#%d (1) { - ["name"]=> - string(1) "A" -} -object(ReflectionClass)#%d (1) { - ["name"]=> - string(1) "B" -} ---UEXPECTF-- -object(ReflectionClass)#%d (1) { [u"name"]=> unicode(1) "A" } diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt index 304476f17a..a82c2293b2 100644 --- a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt @@ -63,55 +63,6 @@ foreach (array('A', 'B') as $class) { ?> --EXPECTF-- - ----> Doc comment for A::f(): -string(%d) "/** - * My Doc Comment for A::f - */" - - ----> Doc comment for A::privf(): -string(%d) "/** - * My Doc Comment for A::privf - */" - - ----> Doc comment for A::protStatf(): -string(%d) "/** My Doc Comment for A::protStatf */" - - ----> Doc comment for A::finalStatPubf(): -string(%d) "/** - - * My Doc Comment for A::finalStatPubf - */" - - ----> Doc comment for B::f(): -bool(false) - - ----> Doc comment for B::privf(): -string(%d) "/** * - * My Doc Comment for B::privf - */" - - ----> Doc comment for B::protStatf(): -string(%d) "/** My Doc Comment for B::protStatf - - - - - */" - - ----> Doc comment for B::finalStatPubf(): -string(%d) "/** - - * My Doc Comment for A::finalStatPubf - */" ---UEXPECTF-- ---> Doc comment for A::f(): unicode(%s) "/** * My Doc Comment for A::f diff --git a/ext/reflection/tests/ReflectionMethod_getStaticVariables_basic.phpt b/ext/reflection/tests/ReflectionMethod_getStaticVariables_basic.phpt index 3891c9cf19..6a10429594 100644 --- a/ext/reflection/tests/ReflectionMethod_getStaticVariables_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getStaticVariables_basic.phpt @@ -40,30 +40,6 @@ var_dump($methodInfo->getStaticVariables()); --EXPECT-- Public method: array(3) { - ["c"]=> - NULL - ["a"]=> - int(1) - ["b"]=> - string(5) "hello" -} - -Private method: -array(1) { - ["a"]=> - int(1) -} - -Method with no static variables: -array(0) { -} - -Internal Method: -array(0) { -} ---UEXPECT-- -Public method: -array(3) { [u"c"]=> NULL [u"a"]=> diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_basic.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_basic.phpt index fd08d6b712..9a6c67bbac 100644 --- a/ext/reflection/tests/ReflectionMethod_invokeArgs_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_basic.phpt @@ -52,29 +52,6 @@ try { Public method: Called foo(), property = Hello object(TestClass)#%d (1) { - ["prop"]=> - string(5) "Hello" -} -string(10) "Return Val" -Called foo(), property = Hello -object(TestClass)#%d (1) { - ["prop"]=> - string(5) "Hello" -} -string(10) "Return Val" - -Method with args: -Called methodWithArgs(1, arg2) -NULL -Called methodWithArgs(1, arg2) -NULL - -Method that throws an exception: -string(18) "Called willThrow()" ---UEXPECTF-- -Public method: -Called foo(), property = Hello -object(TestClass)#%d (1) { [u"prop"]=> unicode(5) "Hello" } diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt index 51f4d46cd9..c6738c13e8 100644 --- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt +++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt @@ -78,46 +78,6 @@ try { --EXPECTF-- Wrong number of parameters: -Warning: ReflectionMethod::invokeArgs() expects exactly 2 parameters, 0 given in %s on line %d -NULL - -Warning: ReflectionMethod::invokeArgs() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Non-instance: -string(72) "Given object is not an instance of the class this method was declared in" - -Non-object: - -Warning: ReflectionMethod::invokeArgs() expects parameter 1 to be object, boolean given in %s on line %d -NULL - -Static method: - -Warning: ReflectionMethod::invokeArgs() expects exactly 2 parameters, 0 given in %s on line %d -NULL - -Warning: ReflectionMethod::invokeArgs() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: ReflectionMethod::invokeArgs() expects parameter 1 to be object, boolean given in %s on line %d -NULL -Called staticMethod() - -Notice: Undefined variable: this in %s on line %d -NULL -NULL - -Private method: -string(84) "Trying to invoke private method TestClass::privateMethod from scope ReflectionMethod" - -Abstract method: -string(51) "Trying to invoke abstract method AbstractClass::foo" - -Warning: ReflectionMethod::invokeArgs() expects exactly 2 parameters, 1 given in %s on line %d ---UEXPECTF-- -Wrong number of parameters: - Warning: ReflectionMethod::invokeArgs() expects exactly 2 parameters, 0 given in %sReflectionMethod_invokeArgs_error3.php on line %d NULL diff --git a/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt b/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt index ab42eba098..74c3ea04fe 100644 --- a/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt @@ -72,44 +72,6 @@ try { Public method: Called foo(), property = Hello object(TestClass)#%d (1) { - ["prop"]=> - string(5) "Hello" -} -string(10) "Return Val" -Called foo(), property = Hello -object(TestClass)#%d (1) { - ["prop"]=> - string(5) "Hello" -} -string(10) "Return Val" - -Method with args: -Called methodWithArgs(1, arg2) -NULL -Called methodWithArgs(1, arg2) -NULL - -Static method: - -Warning: Invoke() expects at least one parameter, none given in %s on line %d -bool(false) -Called staticMethod() - -Notice: Undefined variable: this in %s on line %d -NULL -NULL -Called staticMethod() - -Notice: Undefined variable: this in %s on line %d -NULL -NULL - -Method that throws an exception: -string(18) "Called willThrow()" ---UEXPECTF-- -Public method: -Called foo(), property = Hello -object(TestClass)#%d (1) { [u"prop"]=> unicode(5) "Hello" } diff --git a/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt b/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt index c962899436..2ead61e2d4 100644 --- a/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt +++ b/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt @@ -59,18 +59,6 @@ try { ?> --EXPECT-- invoke() on a non-object: -string(29) "Non-object passed to Invoke()" - -invoke() on a non-instance: -string(72) "Given object is not an instance of the class this method was declared in" - -Private method: -string(86) "Trying to invoke private method TestClass::privateMethod() from scope ReflectionMethod" - -Abstract method: -string(53) "Trying to invoke abstract method AbstractClass::foo()" ---UEXPECT-- -invoke() on a non-object: unicode(29) "Non-object passed to Invoke()" invoke() on a non-instance: diff --git a/ext/reflection/tests/bug26695.phpt b/ext/reflection/tests/bug26695.phpt index e958e162d2..c5809ce135 100755 --- a/ext/reflection/tests/bug26695.phpt +++ b/ext/reflection/tests/bug26695.phpt @@ -21,8 +21,5 @@ var_dump($class->getName()); ?> ===DONE=== --EXPECT-- -string(3) "Foo" -===DONE=== ---UEXPECT-- unicode(3) "Foo" ===DONE=== diff --git a/ext/reflection/tests/bug29986.phpt b/ext/reflection/tests/bug29986.phpt index 6017d26ae1..1767a3bf24 100644 --- a/ext/reflection/tests/bug29986.phpt +++ b/ext/reflection/tests/bug29986.phpt @@ -22,30 +22,6 @@ Class [ <user> class just_constants ] { - Constants [5] { Constant [ boolean BOOLEAN_CONSTANT ] { 1 } Constant [ null NULL_CONSTANT ] { } - Constant [ string STRING_CONSTANT ] { This is a string } - Constant [ integer INTEGER_CONSTANT ] { 1000 } - Constant [ double FLOAT_CONSTANT ] { 3.14159265 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [0] { - } -} ---UEXPECTF-- -Class [ <user> class just_constants ] { - @@ %s %d-%d - - - Constants [5] { - Constant [ boolean BOOLEAN_CONSTANT ] { 1 } - Constant [ null NULL_CONSTANT ] { } Constant [ Unicode string STRING_CONSTANT ] { This is a string } Constant [ integer INTEGER_CONSTANT ] { 1000 } Constant [ double FLOAT_CONSTANT ] { 3.14159265 } diff --git a/ext/reflection/tests/bug30209.phpt b/ext/reflection/tests/bug30209.phpt index 571cd64cec..f84583e200 100755 --- a/ext/reflection/tests/bug30209.phpt +++ b/ext/reflection/tests/bug30209.phpt @@ -26,10 +26,6 @@ $foo->testBAR(); ?> ===DONE=== --EXPECTF-- -string(7) "testBAR" -string(7) "testBAR" -===DONE=== ---UEXPECTF-- unicode(7) "testBAR" unicode(7) "testBAR" ===DONE=== diff --git a/ext/reflection/tests/bug30856.phpt b/ext/reflection/tests/bug30856.phpt index accc9fc7c4..f3d9ae5632 100755 --- a/ext/reflection/tests/bug30856.phpt +++ b/ext/reflection/tests/bug30856.phpt @@ -14,12 +14,6 @@ var_dump($class->getStaticProperties()); ===DONE=== --EXPECT-- array(1) { - ["a"]=> - string(4) "test" -} -===DONE=== ---UEXPECT-- -array(1) { [u"a"]=> unicode(4) "test" } diff --git a/ext/reflection/tests/bug32981.phpt b/ext/reflection/tests/bug32981.phpt index 8c6b41f8e4..90603715ea 100755 --- a/ext/reflection/tests/bug32981.phpt +++ b/ext/reflection/tests/bug32981.phpt @@ -23,16 +23,6 @@ var_dump($arr_static_vars); ?> ===DONE=== --EXPECT-- -string(4) "test" -array(1) { - [0]=> - array(1) { - ["enabled"]=> - bool(true) - } -} -===DONE=== ---UEXPECT-- unicode(4) "test" array(1) { [0]=> diff --git a/ext/reflection/tests/bug38132.phpt b/ext/reflection/tests/bug38132.phpt index ff1b802a1d..9cc6b0aa15 100755 --- a/ext/reflection/tests/bug38132.phpt +++ b/ext/reflection/tests/bug38132.phpt @@ -16,22 +16,6 @@ var_dump(isset($properties["bar"])); ?> --EXPECT-- array(2) { - ["bar"]=> - string(3) "baz" - ["a"]=> - string(1) "a" -} -array(2) { - [0]=> - string(3) "bar" - [1]=> - string(1) "a" -} -bool(false) -bool(false) -bool(true) ---UEXPECT-- -array(2) { [u"bar"]=> unicode(3) "baz" [u"a"]=> diff --git a/ext/reflection/tests/bug38217.phpt b/ext/reflection/tests/bug38217.phpt index faaef09d31..d71e950dc8 100644 --- a/ext/reflection/tests/bug38217.phpt +++ b/ext/reflection/tests/bug38217.phpt @@ -34,20 +34,6 @@ Notice: Undefined variable: var in %s on line %d NULL object(Object1)#%d (0) { } -string(4) "test" -object(Object1)#%d (0) { -} -Done ---UEXPECTF-- -object(Object)#%d (0) { -} - -Warning: Missing argument 1 for Object1::__construct() in %s on line %d - -Notice: Undefined variable: var in %s on line %d -NULL -object(Object1)#%d (0) { -} unicode(4) "test" object(Object1)#%d (0) { } diff --git a/ext/reflection/tests/bug38653.phpt b/ext/reflection/tests/bug38653.phpt index 48f1c6ce41..0d0b9476dc 100644 --- a/ext/reflection/tests/bug38653.phpt +++ b/ext/reflection/tests/bug38653.phpt @@ -22,12 +22,6 @@ echo "Done\n"; ?> --EXPECTF-- int(10) -string(0) "" -string(4) "test" -bool(false) -Done ---UEXPECTF-- -int(10) unicode(0) "" unicode(4) "test" bool(false) diff --git a/ext/reflection/tests/bug39001.phpt b/ext/reflection/tests/bug39001.phpt index bf8927d661..0eeb8b7fab 100644 --- a/ext/reflection/tests/bug39001.phpt +++ b/ext/reflection/tests/bug39001.phpt @@ -22,10 +22,6 @@ var_dump($r->getProperty('protectedVar')->getDeclaringClass()->getName()); echo "Done\n"; ?> --EXPECTF-- -string(7) "CParent" -string(7) "CParent" -Done ---UEXPECTF-- unicode(7) "CParent" unicode(7) "CParent" Done diff --git a/ext/reflection/tests/bug39067.phpt b/ext/reflection/tests/bug39067.phpt index 5aae083152..d00764cdad 100644 --- a/ext/reflection/tests/bug39067.phpt +++ b/ext/reflection/tests/bug39067.phpt @@ -38,12 +38,6 @@ var_dump($rc->getProperty('x')->getDeclaringClass()->getName()); echo "Done\n"; ?> --EXPECTF-- -string(1) "C" -string(1) "B" -string(1) "A" -string(5) "Test2" -Done ---UEXPECTF-- unicode(1) "C" unicode(1) "B" unicode(1) "A" diff --git a/ext/reflection/tests/bug39884.phpt b/ext/reflection/tests/bug39884.phpt index 874fb54078..acbd4c55d1 100644 --- a/ext/reflection/tests/bug39884.phpt +++ b/ext/reflection/tests/bug39884.phpt @@ -17,11 +17,6 @@ var_dump($refParam->getClass()); ?> --EXPECT-- object(ReflectionClass)#4 (1) { - ["name"]=> - string(13) "stubParamTest" -} ---UEXPECT-- -object(ReflectionClass)#4 (1) { [u"name"]=> unicode(13) "stubParamTest" } diff --git a/ext/reflection/tests/bug40431.phpt b/ext/reflection/tests/bug40431.phpt index 68c18cf0d4..ba80d29427 100644 --- a/ext/reflection/tests/bug40431.phpt +++ b/ext/reflection/tests/bug40431.phpt @@ -83,66 +83,6 @@ Strict Standards: Creating default object from empty value in %s on line %d array(1) { [0]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "value" - ["class"]=> - string(8) "stdClass" - } -} -bool(false) -bool(false) -bool(true) -bool(false) -=== 2nd test === -array(1) { - [0]=> - &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "value" - ["class"]=> - string(5) "test2" - } -} -bool(false) -bool(false) -bool(true) -bool(false) -=== 3rd test === -array(1) { - [0]=> - &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "value" - ["class"]=> - string(5) "test3" - } -} -bool(false) -bool(false) -bool(true) -bool(false) -=== 4th test === -array(1) { - [0]=> - &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "value" - ["class"]=> - string(5) "test4" - } -} -bool(false) -bool(false) -bool(true) -bool(false) -Done ---UEXPECTF-- -=== 1st test === - -Strict Standards: Creating default object from empty value in %s on line %d -array(1) { - [0]=> - &object(ReflectionProperty)#%d (2) { [u"name"]=> unicode(5) "value" [u"class"]=> diff --git a/ext/reflection/tests/bug40794.phpt b/ext/reflection/tests/bug40794.phpt index 5049031096..f553c75259 100644 --- a/ext/reflection/tests/bug40794.phpt +++ b/ext/reflection/tests/bug40794.phpt @@ -22,16 +22,6 @@ echo "Done\n"; ?> --EXPECTF-- array(3) { - ["prop1"]=> - string(1) "1" - ["prop2"]=> - string(1) "2" - ["prop3"]=> - string(1) "3" -} -Done ---UEXPECTF-- -array(3) { [u"prop1"]=> unicode(1) "1" [u"prop2"]=> diff --git a/ext/reflection/tests/bug41884.phpt b/ext/reflection/tests/bug41884.phpt index dfecf845cb..d0a2133900 100644 --- a/ext/reflection/tests/bug41884.phpt +++ b/ext/reflection/tests/bug41884.phpt @@ -17,14 +17,6 @@ echo "Done\n"; ?> --EXPECTF-- array(2) { - ["fooStatic"]=> - string(3) "foo" - ["foo"]=> - string(3) "foo" -} -Done ---UEXPECTF-- -array(2) { [u"fooStatic"]=> unicode(3) "foo" [u"foo"]=> diff --git a/ext/reflection/tests/bug42976.phpt b/ext/reflection/tests/bug42976.phpt index 9576f4f5d2..cf4565d696 100644 --- a/ext/reflection/tests/bug42976.phpt +++ b/ext/reflection/tests/bug42976.phpt @@ -24,19 +24,6 @@ var_dump($x); echo "Done\n"; ?> --EXPECTF-- -string(9) "x.changed" - -Warning: Parameter 1 to C::__construct() expected to be a reference, value given in %sbug42976.php on line 15 - -Warning: Invocation of C's constructor failed in %sbug42976.php on line 15 -string(10) "x.original" - -Warning: Parameter 1 to C::__construct() expected to be a reference, value given in %sbug42976.php on line 18 - -Warning: Invocation of C's constructor failed in %sbug42976.php on line 18 -string(10) "x.original" -Done ---UEXPECTF-- unicode(9) "x.changed" Warning: Parameter 1 to C::__construct() expected to be a reference, value given in %sbug42976.php on line 15 diff --git a/ext/reflection/tests/bug43926.phpt b/ext/reflection/tests/bug43926.phpt index 23257f5c61..95bdb9e787 100644 --- a/ext/reflection/tests/bug43926.phpt +++ b/ext/reflection/tests/bug43926.phpt @@ -65,23 +65,3 @@ Is? A false, instanceof: false Is? C false, instanceof: false Is? D false, instanceof: false Is? E true, instanceof: true ---UEXPECT-- -Is? A true, instanceof: true -Is? C false, instanceof: false -Is? D true, instanceof: true -Is? E true, instanceof: true -- -Is? A true, instanceof: true -Is? C true, instanceof: true -Is? D true, instanceof: true -Is? E true, instanceof: true -- -Is? A false, instanceof: false -Is? C false, instanceof: false -Is? D true, instanceof: true -Is? E true, instanceof: true -- -Is? A false, instanceof: false -Is? C false, instanceof: false -Is? D false, instanceof: false -Is? E true, instanceof: true diff --git a/ext/reflection/tests/parameters_001.phpt b/ext/reflection/tests/parameters_001.phpt index ba90542931..780c22d6e3 100755 --- a/ext/reflection/tests/parameters_001.phpt +++ b/ext/reflection/tests/parameters_001.phpt @@ -34,12 +34,5 @@ int(2) int(1) bool(false) bool(true) -string(54) "The parameter specified by its name could not be found" -===DONE=== ---UEXPECT-- -int(2) -int(1) -bool(false) -bool(true) unicode(54) "The parameter specified by its name could not be found" ===DONE=== diff --git a/ext/reflection/tests/parameters_002.phpt b/ext/reflection/tests/parameters_002.phpt index 7338c5cc82..0432b23fc6 100755 --- a/ext/reflection/tests/parameters_002.phpt +++ b/ext/reflection/tests/parameters_002.phpt @@ -72,154 +72,6 @@ check_params(new ReflectionMethod('test::test')); --EXPECT-- #####test()##### ===0=== -getName: string(3) "nix" -isPassedByReference: bool(false) -getClass: NULL -getDeclaringClass: NULL -getDeclaringFunction: test() -isArray: bool(false) -allowsNull: bool(true) -isOptional: bool(false) -isDefaultValueAvailable: bool(false) -===1=== -getName: string(2) "ar" -isPassedByReference: bool(false) -getClass: NULL -getDeclaringClass: NULL -getDeclaringFunction: test() -isArray: bool(true) -allowsNull: bool(false) -isOptional: bool(false) -isDefaultValueAvailable: bool(false) -===2=== -getName: string(3) "ref" -isPassedByReference: bool(true) -getClass: NULL -getDeclaringClass: NULL -getDeclaringFunction: test() -isArray: bool(false) -allowsNull: bool(true) -isOptional: bool(false) -isDefaultValueAvailable: bool(false) -===3=== -getName: string(3) "std" -isPassedByReference: bool(false) -getClass: stdClass -getDeclaringClass: NULL -getDeclaringFunction: test() -isArray: bool(false) -allowsNull: bool(false) -isOptional: bool(false) -isDefaultValueAvailable: bool(false) -===4=== -getName: string(2) "na" -isPassedByReference: bool(false) -Class NonExistingClass does not exist -getDeclaringClass: NULL -getDeclaringFunction: test() -isArray: bool(false) -allowsNull: bool(false) -isOptional: bool(false) -isDefaultValueAvailable: bool(false) -===5=== -getName: string(3) "opt" -isPassedByReference: bool(true) -getClass: stdClass -getDeclaringClass: NULL -getDeclaringFunction: test() -isArray: bool(false) -allowsNull: bool(true) -isOptional: bool(true) -isDefaultValueAvailable: bool(true) -getDefaultValue: NULL -===6=== -getName: string(3) "def" -isPassedByReference: bool(false) -getClass: NULL -getDeclaringClass: NULL -getDeclaringFunction: test() -isArray: bool(false) -allowsNull: bool(true) -isOptional: bool(true) -isDefaultValueAvailable: bool(true) -getDefaultValue: string(6) "FooBar" -#####test::test()##### -===0=== -getName: string(3) "nix" -isPassedByReference: bool(false) -getClass: NULL -getDeclaringClass: test -getDeclaringFunction: test::test() -isArray: bool(false) -allowsNull: bool(true) -isOptional: bool(false) -isDefaultValueAvailable: bool(false) -===1=== -getName: string(2) "ar" -isPassedByReference: bool(false) -getClass: NULL -getDeclaringClass: test -getDeclaringFunction: test::test() -isArray: bool(true) -allowsNull: bool(false) -isOptional: bool(false) -isDefaultValueAvailable: bool(false) -===2=== -getName: string(3) "ref" -isPassedByReference: bool(true) -getClass: NULL -getDeclaringClass: test -getDeclaringFunction: test::test() -isArray: bool(false) -allowsNull: bool(true) -isOptional: bool(false) -isDefaultValueAvailable: bool(false) -===3=== -getName: string(3) "std" -isPassedByReference: bool(false) -getClass: stdClass -getDeclaringClass: test -getDeclaringFunction: test::test() -isArray: bool(false) -allowsNull: bool(false) -isOptional: bool(false) -isDefaultValueAvailable: bool(false) -===4=== -getName: string(2) "na" -isPassedByReference: bool(false) -Class NonExistingClass does not exist -getDeclaringClass: test -getDeclaringFunction: test::test() -isArray: bool(false) -allowsNull: bool(false) -isOptional: bool(false) -isDefaultValueAvailable: bool(false) -===5=== -getName: string(3) "opt" -isPassedByReference: bool(false) -getClass: stdClass -getDeclaringClass: test -getDeclaringFunction: test::test() -isArray: bool(false) -allowsNull: bool(true) -isOptional: bool(true) -isDefaultValueAvailable: bool(true) -getDefaultValue: NULL -===6=== -getName: string(3) "def" -isPassedByReference: bool(false) -getClass: NULL -getDeclaringClass: test -getDeclaringFunction: test::test() -isArray: bool(false) -allowsNull: bool(true) -isOptional: bool(true) -isDefaultValueAvailable: bool(true) -getDefaultValue: string(6) "FooBar" -===DONE=== ---UEXPECT-- -#####test()##### -===0=== getName: unicode(3) "nix" isPassedByReference: bool(false) getClass: NULL diff --git a/ext/reflection/tests/reflectionClass_FileInfo_basic.phpt b/ext/reflection/tests/reflectionClass_FileInfo_basic.phpt index b987da664b..08c543053e 100644 --- a/ext/reflection/tests/reflectionClass_FileInfo_basic.phpt +++ b/ext/reflection/tests/reflectionClass_FileInfo_basic.phpt @@ -25,13 +25,6 @@ Class C { } ?> --EXPECTF-- -string(%d) "%sreflectionClass_FileInfo_basic.php" -int(20) -int(22) -bool(false) -bool(false) -bool(false) ---UEXPECTF-- unicode(%d) "%sreflectionClass_FileInfo_basic.php" int(20) int(22) diff --git a/ext/reflection/tests/reflectionClass_FileInfo_error.phpt b/ext/reflection/tests/reflectionClass_FileInfo_error.phpt index 693af5d7c6..d60d0406bc 100644 --- a/ext/reflection/tests/reflectionClass_FileInfo_error.phpt +++ b/ext/reflection/tests/reflectionClass_FileInfo_error.phpt @@ -14,28 +14,6 @@ foreach ($methods as $method) { } ?> --EXPECTF-- -string(%d) "%s" - -Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 9 -NULL - -Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 10 -NULL -int(2) - -Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 9 -NULL - -Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 10 -NULL -int(2) - -Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 9 -NULL - -Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 10 -NULL ---UEXPECTF-- unicode(%d) "%s" Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 9 diff --git a/ext/reflection/tests/reflectionClass_constructor_001.phpt b/ext/reflection/tests/reflectionClass_constructor_001.phpt index 5d365c8a9a..49501663bd 100644 --- a/ext/reflection/tests/reflectionClass_constructor_001.phpt +++ b/ext/reflection/tests/reflectionClass_constructor_001.phpt @@ -20,19 +20,6 @@ var_dump($r1, $r2, $r3); ?> --EXPECTF-- object(ReflectionClass)#%d (1) { - ["name"]=> - string(8) "stdClass" -} -object(ReflectionClass)#%d (1) { - ["name"]=> - string(8) "stdClass" -} -object(ReflectionClass)#%d (1) { - ["name"]=> - string(10) "TrickClass" -} ---UEXPECTF-- -object(ReflectionClass)#%d (1) { [u"name"]=> unicode(8) "stdClass" } diff --git a/ext/reflection/tests/reflectionClass_constructor_002.phpt b/ext/reflection/tests/reflectionClass_constructor_002.phpt index 059ef5e8e7..4dd5cd45d1 100644 --- a/ext/reflection/tests/reflectionClass_constructor_002.phpt +++ b/ext/reflection/tests/reflectionClass_constructor_002.phpt @@ -49,29 +49,6 @@ try { Warning: ReflectionClass::__construct() expects exactly 1 parameter, 0 given in %s on line 3 object(ReflectionClass)#%d (1) { - ["name"]=> - string(0) "" -} -Class does not exist -Class 1 does not exist -Class 1 does not exist - -Warning: ReflectionClass::__construct() expects parameter 1 to be string (Unicode or binary), array given in %s on line 27 -object(ReflectionClass)#3 (1) { - ["name"]=> - string(0) "" -} - -Warning: ReflectionClass::__construct() expects exactly 1 parameter, 2 given in %s on line 33 -object(ReflectionClass)#%d (1) { - ["name"]=> - string(0) "" -} -Class X does not exist ---UEXPECTF-- - -Warning: ReflectionClass::__construct() expects exactly 1 parameter, 0 given in %s on line 3 -object(ReflectionClass)#%d (1) { [u"name"]=> unicode(0) "" } diff --git a/ext/reflection/tests/reflectionClass_getConstant_basic.phpt b/ext/reflection/tests/reflectionClass_getConstant_basic.phpt index f1301fbb95..ca16d87e77 100644 --- a/ext/reflection/tests/reflectionClass_getConstant_basic.phpt +++ b/ext/reflection/tests/reflectionClass_getConstant_basic.phpt @@ -25,22 +25,6 @@ foreach($classes as $class) { ?> --EXPECTF-- Reflecting on class C: -string(12) "hello from C" -bool(false) -Reflecting on class D: -string(12) "hello from C" -bool(false) -Reflecting on class E: -string(12) "hello from C" -bool(false) -Reflecting on class F: -string(12) "hello from F" -bool(false) -Reflecting on class X: -bool(false) -bool(false) ---UEXPECTF-- -Reflecting on class C: unicode(12) "hello from C" bool(false) Reflecting on class D: diff --git a/ext/reflection/tests/reflectionClass_getConstant_error.phpt b/ext/reflection/tests/reflectionClass_getConstant_error.phpt index f8a6deed6f..88ee139f35 100644 --- a/ext/reflection/tests/reflectionClass_getConstant_error.phpt +++ b/ext/reflection/tests/reflectionClass_getConstant_error.phpt @@ -35,21 +35,3 @@ NULL Warning: ReflectionClass::getConstant() expects parameter 1 to be string (Unicode or binary), object given in %s on line 15 NULL ---UEXPECTF-- -Check invalid params: - -Warning: ReflectionClass::getConstant() expects exactly 1 parameter, 0 given in %s on line 8 -NULL - -Warning: ReflectionClass::getConstant() expects exactly 1 parameter, 2 given in %s on line 9 -NULL -bool(false) -bool(false) -bool(false) -bool(false) - -Warning: ReflectionClass::getConstant() expects parameter 1 to be string (Unicode or binary), array given in %s on line 14 -NULL - -Warning: ReflectionClass::getConstant() expects parameter 1 to be string (Unicode or binary), object given in %s on line 15 -NULL diff --git a/ext/reflection/tests/reflectionClass_getConstants_basic.phpt b/ext/reflection/tests/reflectionClass_getConstants_basic.phpt index e01c1800af..c1baeaaf99 100644 --- a/ext/reflection/tests/reflectionClass_getConstants_basic.phpt +++ b/ext/reflection/tests/reflectionClass_getConstants_basic.phpt @@ -25,30 +25,6 @@ foreach($classes as $class) { --EXPECTF-- Constants from class C: array(1) { - ["a"]=> - string(12) "hello from C" -} -Constants from class D: -array(1) { - ["a"]=> - string(12) "hello from C" -} -Constants from class E: -array(1) { - ["a"]=> - string(12) "hello from C" -} -Constants from class F: -array(1) { - ["a"]=> - string(12) "hello from F" -} -Constants from class X: -array(0) { -} ---UEXPECTF-- -Constants from class C: -array(1) { [u"a"]=> unicode(12) "hello from C" } diff --git a/ext/reflection/tests/reflectionClass_getConstants_error.phpt b/ext/reflection/tests/reflectionClass_getConstants_error.phpt index 5d724197fb..73c407d656 100644 --- a/ext/reflection/tests/reflectionClass_getConstants_error.phpt +++ b/ext/reflection/tests/reflectionClass_getConstants_error.phpt @@ -22,11 +22,3 @@ Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 10 Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 11 ---UEXPECTF-- -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 8 - -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 9 - -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 10 - -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 11 diff --git a/ext/reflection/tests/reflectionClass_getExtensionName_basic.phpt b/ext/reflection/tests/reflectionClass_getExtensionName_basic.phpt index badda550de..264f7d986d 100644 --- a/ext/reflection/tests/reflectionClass_getExtensionName_basic.phpt +++ b/ext/reflection/tests/reflectionClass_getExtensionName_basic.phpt @@ -11,6 +11,4 @@ Rein Velt <rein@velt.org> var_dump( $rc->getExtensionName()) ; ?> --EXPECT-- -string(3) "dom" ---UEXPECT-- -unicode(3) "dom"
\ No newline at end of file +unicode(3) "dom" diff --git a/ext/reflection/tests/reflectionClass_getExtension_basic.phpt b/ext/reflection/tests/reflectionClass_getExtension_basic.phpt index 05fc9f5a33..5544613db9 100644 --- a/ext/reflection/tests/reflectionClass_getExtension_basic.phpt +++ b/ext/reflection/tests/reflectionClass_getExtension_basic.phpt @@ -10,11 +10,6 @@ Rein Velt <rein@velt.org> ?> --EXPECTF-- object(ReflectionExtension)#%d (1) { - ["name"]=> - string(3) "dom" -} ---UEXPECTF-- -object(ReflectionExtension)#%d (1) { [u"name"]=> unicode(3) "dom" } diff --git a/ext/reflection/tests/reflectionClass_getInterfaceNames_basic.phpt b/ext/reflection/tests/reflectionClass_getInterfaceNames_basic.phpt index 519b543d15..0ba1831b9d 100644 --- a/ext/reflection/tests/reflectionClass_getInterfaceNames_basic.phpt +++ b/ext/reflection/tests/reflectionClass_getInterfaceNames_basic.phpt @@ -17,14 +17,7 @@ var_dump($rc1->getInterfaceNames()); --EXPECT-- array(2) { [0]=> - string(3) "Foo" - [1]=> - string(3) "Bar" -} ---UEXPECT-- -array(2) { - [0]=> unicode(3) "Foo" [1]=> unicode(3) "Bar" -}
\ No newline at end of file +} diff --git a/ext/reflection/tests/reflectionClass_getName_basic.phpt b/ext/reflection/tests/reflectionClass_getName_basic.phpt index 2e6d78f458..0aa98e0097 100644 --- a/ext/reflection/tests/reflectionClass_getName_basic.phpt +++ b/ext/reflection/tests/reflectionClass_getName_basic.phpt @@ -20,10 +20,6 @@ var_dump($r1->getName(), $r2->getName(), $r3->getName()); ?> --EXPECTF-- -string(8) "stdClass" -string(8) "stdClass" -string(10) "TrickClass" ---UEXPECTF-- unicode(8) "stdClass" unicode(8) "stdClass" unicode(10) "TrickClass" diff --git a/ext/reflection/tests/reflectionClass_getName_error.phpt b/ext/reflection/tests/reflectionClass_getName_error.phpt index 4dcf8f5532..6f5699c931 100644 --- a/ext/reflection/tests/reflectionClass_getName_error.phpt +++ b/ext/reflection/tests/reflectionClass_getName_error.phpt @@ -14,10 +14,4 @@ NULL Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 6 NULL ---UEXPECTF-- -Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 5 -NULL - -Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 6 -NULL diff --git a/ext/reflection/tests/reflectionClass_getName_error1.phpt b/ext/reflection/tests/reflectionClass_getName_error1.phpt index de1f4aec24..5590137f89 100644 --- a/ext/reflection/tests/reflectionClass_getName_error1.phpt +++ b/ext/reflection/tests/reflectionClass_getName_error1.phpt @@ -6,5 +6,3 @@ ReflectionClass::getName(); ?> --EXPECTF-- Fatal error: Non-static method ReflectionClass::getName() cannot be called statically in %s on line 2 ---UEXPECTF-- -Fatal error: Non-static method ReflectionClass::getName() cannot be called statically in %s on line 2 diff --git a/ext/reflection/tests/reflectionClass_getParentClass.phpt b/ext/reflection/tests/reflectionClass_getParentClass.phpt index 32c01aeafd..6061dc3e50 100644 --- a/ext/reflection/tests/reflectionClass_getParentClass.phpt +++ b/ext/reflection/tests/reflectionClass_getParentClass.phpt @@ -14,11 +14,6 @@ var_dump($rc1->getParentClass()); ?> --EXPECTF-- object(ReflectionClass)#%d (1) { - ["name"]=> - string(3) "Foo" -} ---UEXPECTF-- -object(ReflectionClass)#%d (1) { [u"name"]=> unicode(3) "Foo" -}
\ No newline at end of file +} diff --git a/ext/reflection/tests/reflectionClass_isInstance_basic.phpt b/ext/reflection/tests/reflectionClass_isInstance_basic.phpt index d221cbd3a0..2da09449ff 100644 --- a/ext/reflection/tests/reflectionClass_isInstance_basic.phpt +++ b/ext/reflection/tests/reflectionClass_isInstance_basic.phpt @@ -49,24 +49,3 @@ is myA a X? bool(false) is myB a X? bool(false) is myC a X? bool(false) is myX a X? bool(true) ---UEXPECTF-- -is myA a A? bool(true) -is myB a A? bool(true) -is myC a A? bool(false) -is myX a A? bool(false) -is myA a B? bool(false) -is myB a B? bool(true) -is myC a B? bool(false) -is myX a B? bool(false) -is myA a C? bool(false) -is myB a C? bool(false) -is myC a C? bool(true) -is myX a C? bool(false) -is myA a I? bool(false) -is myB a I? bool(false) -is myC a I? bool(true) -is myX a I? bool(false) -is myA a X? bool(false) -is myB a X? bool(false) -is myC a X? bool(false) -is myX a X? bool(true) diff --git a/ext/reflection/tests/reflectionClass_isInstance_error.phpt b/ext/reflection/tests/reflectionClass_isInstance_error.phpt index 1b0a605235..486c3b8598 100644 --- a/ext/reflection/tests/reflectionClass_isInstance_error.phpt +++ b/ext/reflection/tests/reflectionClass_isInstance_error.phpt @@ -32,27 +32,6 @@ NULL Warning: ReflectionClass::isInstance() expects parameter 1 to be object, boolean given in %s on line 11 NULL -Warning: ReflectionClass::isInstance() expects parameter 1 to be object, string given in %s on line 12 -NULL - -Warning: ReflectionClass::isInstance() expects parameter 1 to be object, null given in %s on line 13 -NULL ---UEXPECTF-- -Warning: ReflectionClass::isInstance() expects exactly 1 parameter, 0 given in %s on line 7 -NULL - -Warning: ReflectionClass::isInstance() expects exactly 1 parameter, 2 given in %s on line 8 -NULL - -Warning: ReflectionClass::isInstance() expects parameter 1 to be object, %s given in %s on line 9 -NULL - -Warning: ReflectionClass::isInstance() expects parameter 1 to be object, double given in %s on line 10 -NULL - -Warning: ReflectionClass::isInstance() expects parameter 1 to be object, boolean given in %s on line 11 -NULL - Warning: ReflectionClass::isInstance() expects parameter 1 to be object, Unicode string given in %s on line 12 NULL diff --git a/ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt b/ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt index 69d814c8af..6ebcfa99a9 100644 --- a/ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt +++ b/ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt @@ -38,9 +38,3 @@ Is iface instantiable? bool(false) Is ifaceImpl instantiable? bool(true) Is abstractClass instantiable? bool(false) Is D instantiable? bool(true) ---UEXPECTF-- -Is C instantiable? bool(true) -Is iface instantiable? bool(false) -Is ifaceImpl instantiable? bool(true) -Is abstractClass instantiable? bool(false) -Is D instantiable? bool(true) diff --git a/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt b/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt index 5e7896785e..cc31a2f42c 100644 --- a/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt +++ b/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt @@ -17,9 +17,3 @@ NULL Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 8 NULL ---UEXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 7 -NULL - -Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 8 -NULL diff --git a/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt b/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt index 50c5e58b50..1cf3e613e8 100644 --- a/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt +++ b/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt @@ -48,11 +48,3 @@ Is privateCtorNew instantiable? bool(false) Is publicCtorOld instantiable? bool(true) Is protectedCtorOld instantiable? bool(false) Is privateCtorOld instantiable? bool(false) ---UEXPECTF-- -Is noCtor instantiable? bool(true) -Is publicCtorNew instantiable? bool(true) -Is protectedCtorNew instantiable? bool(false) -Is privateCtorNew instantiable? bool(false) -Is publicCtorOld instantiable? bool(true) -Is protectedCtorOld instantiable? bool(false) -Is privateCtorOld instantiable? bool(false) diff --git a/ext/reflection/tests/reflectionClass_isInternal_basic.phpt b/ext/reflection/tests/reflectionClass_isInternal_basic.phpt index 3b7ba4fd7b..2eaacb67f8 100644 --- a/ext/reflection/tests/reflectionClass_isInternal_basic.phpt +++ b/ext/reflection/tests/reflectionClass_isInternal_basic.phpt @@ -20,9 +20,3 @@ bool(true) bool(true) bool(true) bool(false) ---UEXPECTF-- -bool(true) -bool(true) -bool(true) -bool(true) -bool(false) diff --git a/ext/reflection/tests/reflectionClass_isInternal_error.phpt b/ext/reflection/tests/reflectionClass_isInternal_error.phpt index b8ab16f13f..b1117e8304 100644 --- a/ext/reflection/tests/reflectionClass_isInternal_error.phpt +++ b/ext/reflection/tests/reflectionClass_isInternal_error.phpt @@ -12,9 +12,3 @@ NULL Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 4 NULL ---UEXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 3 -NULL - -Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 4 -NULL diff --git a/ext/reflection/tests/reflectionClass_isSubclassOf_basic.phpt b/ext/reflection/tests/reflectionClass_isSubclassOf_basic.phpt index b50aab71d1..94fcf00ece 100644 --- a/ext/reflection/tests/reflectionClass_isSubclassOf_basic.phpt +++ b/ext/reflection/tests/reflectionClass_isSubclassOf_basic.phpt @@ -101,79 +101,3 @@ Is X a subclass of I? Is X a subclass of X? - Using object argument: bool(false) - Using string argument: bool(false) ---UEXPECTF-- -Is A a subclass of A? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is A a subclass of B? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is A a subclass of C? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is A a subclass of I? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is A a subclass of X? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is B a subclass of A? - - Using object argument: bool(true) - - Using string argument: bool(true) -Is B a subclass of B? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is B a subclass of C? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is B a subclass of I? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is B a subclass of X? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is C a subclass of A? - - Using object argument: bool(true) - - Using string argument: bool(true) -Is C a subclass of B? - - Using object argument: bool(true) - - Using string argument: bool(true) -Is C a subclass of C? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is C a subclass of I? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is C a subclass of X? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is I a subclass of A? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is I a subclass of B? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is I a subclass of C? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is I a subclass of I? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is I a subclass of X? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is X a subclass of A? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is X a subclass of B? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is X a subclass of C? - - Using object argument: bool(false) - - Using string argument: bool(false) -Is X a subclass of I? - - Using object argument: bool(true) - - Using string argument: bool(true) -Is X a subclass of X? - - Using object argument: bool(false) - - Using string argument: bool(false) diff --git a/ext/reflection/tests/reflectionClass_isSubclassOf_error.phpt b/ext/reflection/tests/reflectionClass_isSubclassOf_error.phpt index 732a34413b..7d929fafd7 100644 --- a/ext/reflection/tests/reflectionClass_isSubclassOf_error.phpt +++ b/ext/reflection/tests/reflectionClass_isSubclassOf_error.phpt @@ -15,9 +15,3 @@ NULL Warning: ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given in %s on line 6 NULL ---UEXPECTF-- -Warning: ReflectionClass::isSubclassOf() expects exactly 1 parameter, 0 given in %s on line 5 -NULL - -Warning: ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given in %s on line 6 -NULL diff --git a/ext/reflection/tests/reflectionClass_isSubclassOf_error1.phpt b/ext/reflection/tests/reflectionClass_isSubclassOf_error1.phpt index 71c3d700cf..2fabd023e6 100644 --- a/ext/reflection/tests/reflectionClass_isSubclassOf_error1.phpt +++ b/ext/reflection/tests/reflectionClass_isSubclassOf_error1.phpt @@ -14,9 +14,3 @@ Stack trace: #0 %s(5): ReflectionClass->isSubclassOf('X') #1 {main} thrown in %s on line 5 ---UEXPECTF-- -Fatal error: Uncaught exception 'ReflectionException' with message 'Class X does not exist' in %s:5 -Stack trace: -#0 %s(5): ReflectionClass->isSubclassOf('X') -#1 {main} - thrown in %s on line 5 diff --git a/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt b/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt index 56d427f39c..af43fcefa4 100644 --- a/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt +++ b/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt @@ -20,9 +20,3 @@ bool(false) bool(false) bool(false) bool(true) ---UEXPECTF-- -bool(false) -bool(false) -bool(false) -bool(false) -bool(true) diff --git a/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt b/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt index d4aa1774af..077e4d6a6d 100644 --- a/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt +++ b/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt @@ -12,9 +12,3 @@ NULL Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 4 NULL ---UEXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 3 -NULL - -Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 4 -NULL diff --git a/ext/reflection/tests/reflectionObject_FileInfo_basic.phpt b/ext/reflection/tests/reflectionObject_FileInfo_basic.phpt index d137ed5aaa..57a42fba4b 100644 --- a/ext/reflection/tests/reflectionObject_FileInfo_basic.phpt +++ b/ext/reflection/tests/reflectionObject_FileInfo_basic.phpt @@ -17,13 +17,6 @@ Class C { } ?> --EXPECTF-- -string(%d) "%sreflectionObject_FileInfo_basic.php" -int(12) -int(14) -bool(false) -bool(false) -bool(false) ---UEXPECTF-- unicode(%d) "%sreflectionObject_FileInfo_basic.php" int(12) int(14) diff --git a/ext/reflection/tests/reflectionObject_FileInfo_error.phpt b/ext/reflection/tests/reflectionObject_FileInfo_error.phpt index 299a42e157..e932c8ad54 100644 --- a/ext/reflection/tests/reflectionObject_FileInfo_error.phpt +++ b/ext/reflection/tests/reflectionObject_FileInfo_error.phpt @@ -14,28 +14,6 @@ foreach ($methods as $method) { } ?> --EXPECTF-- -string(%d) "%s" - -Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 9 -NULL - -Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 10 -NULL -int(2) - -Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 9 -NULL - -Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 10 -NULL -int(2) - -Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 9 -NULL - -Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 10 -NULL ---UEXPECTF-- unicode(%d) "%s" Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 9 diff --git a/ext/reflection/tests/reflectionObject_constructor_basic.phpt b/ext/reflection/tests/reflectionObject_constructor_basic.phpt index 60f6b78f23..fcad71b63d 100644 --- a/ext/reflection/tests/reflectionObject_constructor_basic.phpt +++ b/ext/reflection/tests/reflectionObject_constructor_basic.phpt @@ -15,19 +15,6 @@ var_dump($r3); ?> --EXPECTF-- object(ReflectionObject)#%d (1) { - ["name"]=> - string(8) "stdClass" -} -object(ReflectionObject)#%d (1) { - ["name"]=> - string(1) "C" -} -object(ReflectionObject)#%d (1) { - ["name"]=> - string(16) "ReflectionObject" -} ---UEXPECTF-- -object(ReflectionObject)#%d (1) { [u"name"]=> unicode(8) "stdClass" } diff --git a/ext/reflection/tests/reflectionObject_constructor_error.phpt b/ext/reflection/tests/reflectionObject_constructor_error.phpt index 892aa82dc3..254f0db41a 100644 --- a/ext/reflection/tests/reflectionObject_constructor_error.phpt +++ b/ext/reflection/tests/reflectionObject_constructor_error.phpt @@ -14,42 +14,6 @@ var_dump(new ReflectionObject(array(1,2))); --EXPECTF-- Warning: ReflectionObject::__construct() expects exactly 1 parameter, 0 given in %s on line 3 object(ReflectionObject)#%d (1) { - ["name"]=> - string(0) "" -} - -Warning: ReflectionObject::__construct() expects parameter 1 to be object, string given in %s on line 4 -object(ReflectionObject)#%d (1) { - ["name"]=> - string(0) "" -} - -Warning: ReflectionObject::__construct() expects exactly 1 parameter, 2 given in %s on line 6 -object(ReflectionObject)#%d (1) { - ["name"]=> - string(0) "" -} - -Warning: ReflectionObject::__construct() expects parameter 1 to be object, integer given in %s on line 7 -object(ReflectionObject)#%d (1) { - ["name"]=> - string(0) "" -} - -Warning: ReflectionObject::__construct() expects parameter 1 to be object, null given in %s on line 8 -object(ReflectionObject)#%d (1) { - ["name"]=> - string(0) "" -} - -Warning: ReflectionObject::__construct() expects parameter 1 to be object, array given in %s on line 9 -object(ReflectionObject)#%d (1) { - ["name"]=> - string(0) "" -} ---UEXPECTF-- -Warning: ReflectionObject::__construct() expects exactly 1 parameter, 0 given in %s on line 3 -object(ReflectionObject)#%d (1) { [u"name"]=> unicode(0) "" } diff --git a/ext/reflection/tests/reflectionObject_getConstant_basic.phpt b/ext/reflection/tests/reflectionObject_getConstant_basic.phpt index 151859983d..a6203d093f 100644 --- a/ext/reflection/tests/reflectionObject_getConstant_basic.phpt +++ b/ext/reflection/tests/reflectionObject_getConstant_basic.phpt @@ -25,22 +25,6 @@ foreach($classes as $class) { ?> --EXPECTF-- Reflecting on instance of class C: -string(12) "hello from C" -bool(false) -Reflecting on instance of class D: -string(12) "hello from C" -bool(false) -Reflecting on instance of class E: -string(12) "hello from C" -bool(false) -Reflecting on instance of class F: -string(12) "hello from F" -bool(false) -Reflecting on instance of class X: -bool(false) -bool(false) ---UEXPECTF-- -Reflecting on instance of class C: unicode(12) "hello from C" bool(false) Reflecting on instance of class D: diff --git a/ext/reflection/tests/reflectionObject_getConstant_error.phpt b/ext/reflection/tests/reflectionObject_getConstant_error.phpt index d16132b202..b51a10bcb1 100644 --- a/ext/reflection/tests/reflectionObject_getConstant_error.phpt +++ b/ext/reflection/tests/reflectionObject_getConstant_error.phpt @@ -32,19 +32,3 @@ NULL Warning: ReflectionClass::getConstant() expects parameter 1 to be string (Unicode or binary), object given in %s on line 14 NULL ---UEXPECTF-- -Warning: ReflectionClass::getConstant() expects exactly 1 parameter, 0 given in %s on line 7 -NULL - -Warning: ReflectionClass::getConstant() expects exactly 1 parameter, 2 given in %s on line 8 -NULL -bool(false) -bool(false) -bool(false) -bool(false) - -Warning: ReflectionClass::getConstant() expects parameter 1 to be string (Unicode or binary), array given in %s on line 13 -NULL - -Warning: ReflectionClass::getConstant() expects parameter 1 to be string (Unicode or binary), object given in %s on line 14 -NULL diff --git a/ext/reflection/tests/reflectionObject_getConstants_basic.phpt b/ext/reflection/tests/reflectionObject_getConstants_basic.phpt index 68bc5d6b8b..7073a71600 100644 --- a/ext/reflection/tests/reflectionObject_getConstants_basic.phpt +++ b/ext/reflection/tests/reflectionObject_getConstants_basic.phpt @@ -26,30 +26,6 @@ foreach($classes as $class) { --EXPECTF-- Reflecting on instance of class C: array(1) { - ["a"]=> - string(12) "hello from C" -} -Reflecting on instance of class D: -array(1) { - ["a"]=> - string(12) "hello from C" -} -Reflecting on instance of class E: -array(1) { - ["a"]=> - string(12) "hello from C" -} -Reflecting on instance of class F: -array(1) { - ["a"]=> - string(12) "hello from F" -} -Reflecting on instance of class X: -array(0) { -} ---UEXPECTF-- -Reflecting on instance of class C: -array(1) { [u"a"]=> unicode(12) "hello from C" } diff --git a/ext/reflection/tests/reflectionObject_getConstants_error.phpt b/ext/reflection/tests/reflectionObject_getConstants_error.phpt index 0d16c17f0b..81ec9ed2ed 100644 --- a/ext/reflection/tests/reflectionObject_getConstants_error.phpt +++ b/ext/reflection/tests/reflectionObject_getConstants_error.phpt @@ -15,8 +15,4 @@ $rc->getConstants(true); Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 7 Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 8 ---UEXPECTF-- -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 7 - -Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 8 diff --git a/ext/reflection/tests/reflectionObject_getConstructor_basic.phpt b/ext/reflection/tests/reflectionObject_getConstructor_basic.phpt index 5014f47100..a784f6d9e0 100644 --- a/ext/reflection/tests/reflectionObject_getConstructor_basic.phpt +++ b/ext/reflection/tests/reflectionObject_getConstructor_basic.phpt @@ -80,20 +80,3 @@ Constructor of D1: __construct Constructor of D2: C No constructor for X No constructor for Y ---UEXPECTF-- - -Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line 26 - -Strict Standards: %s for class NewAndOldCtor in %s on line 31 -Constructor of NewCtor: __construct -Constructor of ExtendsNewCtor: __construct -Constructor of OldCtor: OldCtor -Constructor of ExtendsOldCtor: OldCtor -Constructor of OldAndNewCtor: __construct -Constructor of NewAndOldCtor: __construct -Constructor of B: B -Constructor of C: C -Constructor of D1: __construct -Constructor of D2: C -No constructor for X -No constructor for Y diff --git a/ext/reflection/tests/reflectionObject_getConstructor_error.phpt b/ext/reflection/tests/reflectionObject_getConstructor_error.phpt index 73ac55f06c..5cabc2ed10 100644 --- a/ext/reflection/tests/reflectionObject_getConstructor_error.phpt +++ b/ext/reflection/tests/reflectionObject_getConstructor_error.phpt @@ -22,16 +22,3 @@ NULL Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 7 NULL ---UEXPECTF-- - -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 4 -NULL - -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 5 -NULL - -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 6 -NULL - -Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 7 -NULL diff --git a/ext/reflection/tests/reflectionObject_getName_basic.phpt b/ext/reflection/tests/reflectionObject_getName_basic.phpt index c3fc65c96d..7c0f0ba5f1 100644 --- a/ext/reflection/tests/reflectionObject_getName_basic.phpt +++ b/ext/reflection/tests/reflectionObject_getName_basic.phpt @@ -20,13 +20,6 @@ var_dump($r3->getName()); --EXPECTF-- Warning: ReflectionObject::__construct() expects exactly 1 parameter, 0 given in %s on line 2 -string(0) "" -string(8) "stdClass" -string(1) "C" -string(16) "ReflectionObject" ---UEXPECTF-- - -Warning: ReflectionObject::__construct() expects exactly 1 parameter, 0 given in %s on line 2 unicode(0) "" unicode(8) "stdClass" unicode(1) "C" diff --git a/ext/reflection/tests/reflectionObject_getName_error.phpt b/ext/reflection/tests/reflectionObject_getName_error.phpt index a636ddc835..eb64244c15 100644 --- a/ext/reflection/tests/reflectionObject_getName_error.phpt +++ b/ext/reflection/tests/reflectionObject_getName_error.phpt @@ -21,12 +21,3 @@ NULL Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 10 NULL ---UEXPECTF-- -Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 8 -NULL - -Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 9 -NULL - -Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 10 -NULL diff --git a/ext/reflection/tests/reflectionObject_getName_error1.phpt b/ext/reflection/tests/reflectionObject_getName_error1.phpt index 1622683285..26c342d7f4 100644 --- a/ext/reflection/tests/reflectionObject_getName_error1.phpt +++ b/ext/reflection/tests/reflectionObject_getName_error1.phpt @@ -6,5 +6,3 @@ ReflectionObject::getName(); ?> --EXPECTF-- Fatal error: Non-static method ReflectionClass::getName() cannot be called statically in %s on line 2 ---UEXPECTF-- -Fatal error: Non-static method ReflectionClass::getName() cannot be called statically in %s on line 2 diff --git a/ext/reflection/tests/reflectionObject_isInstance_basic.phpt b/ext/reflection/tests/reflectionObject_isInstance_basic.phpt index 5b4c97a59c..ef605aad84 100644 --- a/ext/reflection/tests/reflectionObject_isInstance_basic.phpt +++ b/ext/reflection/tests/reflectionObject_isInstance_basic.phpt @@ -31,13 +31,3 @@ is myX a B? bool(false) is myA a X? bool(false) is myB a X? bool(false) is myX a X? bool(true) ---UEXPECTF-- -is myA a A? bool(true) -is myB a A? bool(true) -is myX a A? bool(false) -is myA a B? bool(false) -is myB a B? bool(true) -is myX a B? bool(false) -is myA a X? bool(false) -is myB a X? bool(false) -is myX a X? bool(true) diff --git a/ext/reflection/tests/reflectionObject_isInstance_error.phpt b/ext/reflection/tests/reflectionObject_isInstance_error.phpt index a24a1f5141..9c0af72550 100644 --- a/ext/reflection/tests/reflectionObject_isInstance_error.phpt +++ b/ext/reflection/tests/reflectionObject_isInstance_error.phpt @@ -31,27 +31,6 @@ NULL Warning: ReflectionClass::isInstance() expects parameter 1 to be object, boolean given in %s on line 10 NULL -Warning: ReflectionClass::isInstance() expects parameter 1 to be object, string given in %s on line 11 -NULL - -Warning: ReflectionClass::isInstance() expects parameter 1 to be object, null given in %s on line 12 -NULL ---UEXPECTF-- -Warning: ReflectionClass::isInstance() expects exactly 1 parameter, 0 given in %s on line 6 -NULL - -Warning: ReflectionClass::isInstance() expects exactly 1 parameter, 2 given in %s on line 7 -NULL - -Warning: ReflectionClass::isInstance() expects parameter 1 to be object, integer given in %s on line 8 -NULL - -Warning: ReflectionClass::isInstance() expects parameter 1 to be object, double given in %s on line 9 -NULL - -Warning: ReflectionClass::isInstance() expects parameter 1 to be object, boolean given in %s on line 10 -NULL - Warning: ReflectionClass::isInstance() expects parameter 1 to be object, Unicode string given in %s on line 11 NULL diff --git a/ext/reflection/tests/reflectionObject_isInstantiable_basic.phpt b/ext/reflection/tests/reflectionObject_isInstantiable_basic.phpt index 0966359dbf..4b8a6ec221 100644 --- a/ext/reflection/tests/reflectionObject_isInstantiable_basic.phpt +++ b/ext/reflection/tests/reflectionObject_isInstantiable_basic.phpt @@ -34,7 +34,3 @@ foreach($classes as $class ) { Is C instantiable? bool(true) Is ifaceImpl instantiable? bool(true) Is D instantiable? bool(true) ---UEXPECTF-- -Is C instantiable? bool(true) -Is ifaceImpl instantiable? bool(true) -Is D instantiable? bool(true) diff --git a/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt b/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt index 04ff50b7e5..8f418ac0e6 100644 --- a/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt +++ b/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt @@ -20,9 +20,3 @@ NULL Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 11 NULL ---UEXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 10 -NULL - -Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 11 -NULL diff --git a/ext/reflection/tests/reflectionObject_isInstantiable_variation.phpt b/ext/reflection/tests/reflectionObject_isInstantiable_variation.phpt index 3f5d57ce4c..ac7199c096 100644 --- a/ext/reflection/tests/reflectionObject_isInstantiable_variation.phpt +++ b/ext/reflection/tests/reflectionObject_isInstantiable_variation.phpt @@ -76,11 +76,3 @@ Is privateCtorNew instantiable? bool(false) Is publicCtorOld instantiable? bool(true) Is protectedCtorOld instantiable? bool(false) Is privateCtorOld instantiable? bool(false) ---UEXPECTF-- -Is noCtor instantiable? bool(true) -Is publicCtorNew instantiable? bool(true) -Is protectedCtorNew instantiable? bool(false) -Is privateCtorNew instantiable? bool(false) -Is publicCtorOld instantiable? bool(true) -Is protectedCtorOld instantiable? bool(false) -Is privateCtorOld instantiable? bool(false) diff --git a/ext/reflection/tests/reflectionObject_isInternal_basic.phpt b/ext/reflection/tests/reflectionObject_isInternal_basic.phpt index 2161251804..066bca70ee 100644 --- a/ext/reflection/tests/reflectionObject_isInternal_basic.phpt +++ b/ext/reflection/tests/reflectionObject_isInternal_basic.phpt @@ -21,9 +21,3 @@ bool(true) bool(true) bool(true) bool(false) ---UEXPECTF-- -bool(true) -bool(true) -bool(true) -bool(true) -bool(false) diff --git a/ext/reflection/tests/reflectionObject_isInternal_error.phpt b/ext/reflection/tests/reflectionObject_isInternal_error.phpt index 0ac2d21f5e..c22d748072 100644 --- a/ext/reflection/tests/reflectionObject_isInternal_error.phpt +++ b/ext/reflection/tests/reflectionObject_isInternal_error.phpt @@ -13,9 +13,3 @@ NULL Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 5 NULL ---UEXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 4 -NULL - -Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 5 -NULL diff --git a/ext/reflection/tests/reflectionObject_isSubclassOf_basic.phpt b/ext/reflection/tests/reflectionObject_isSubclassOf_basic.phpt index 5687d381ec..e89066a7ea 100644 --- a/ext/reflection/tests/reflectionObject_isSubclassOf_basic.phpt +++ b/ext/reflection/tests/reflectionObject_isSubclassOf_basic.phpt @@ -114,80 +114,3 @@ Is X a subclass of X? - Using ReflectionClass object argument: bool(false) - Using ReflectionObject object argument: bool(false) - Using string argument: bool(false) ---UEXPECTF-- -Is A a subclass of A? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is A a subclass of B? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is A a subclass of C? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is A a subclass of I? - - Using ReflectionClass object argument: bool(false) - - Using string argument: bool(false) -Is A a subclass of X? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is B a subclass of A? - - Using ReflectionClass object argument: bool(true) - - Using ReflectionObject object argument: bool(true) - - Using string argument: bool(true) -Is B a subclass of B? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is B a subclass of C? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is B a subclass of I? - - Using ReflectionClass object argument: bool(false) - - Using string argument: bool(false) -Is B a subclass of X? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is C a subclass of A? - - Using ReflectionClass object argument: bool(true) - - Using ReflectionObject object argument: bool(true) - - Using string argument: bool(true) -Is C a subclass of B? - - Using ReflectionClass object argument: bool(true) - - Using ReflectionObject object argument: bool(true) - - Using string argument: bool(true) -Is C a subclass of C? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is C a subclass of I? - - Using ReflectionClass object argument: bool(false) - - Using string argument: bool(false) -Is C a subclass of X? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is X a subclass of A? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is X a subclass of B? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is X a subclass of C? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) -Is X a subclass of I? - - Using ReflectionClass object argument: bool(true) - - Using string argument: bool(true) -Is X a subclass of X? - - Using ReflectionClass object argument: bool(false) - - Using ReflectionObject object argument: bool(false) - - Using string argument: bool(false) diff --git a/ext/reflection/tests/reflectionObject_isSubclassOf_error.phpt b/ext/reflection/tests/reflectionObject_isSubclassOf_error.phpt index 61db821a4e..9387b7dcb3 100644 --- a/ext/reflection/tests/reflectionObject_isSubclassOf_error.phpt +++ b/ext/reflection/tests/reflectionObject_isSubclassOf_error.phpt @@ -22,15 +22,3 @@ Stack trace: #0 %s(7): ReflectionClass->isSubclassOf('X') #1 {main} thrown in %s on line 7 ---UEXPECTF-- -Warning: ReflectionClass::isSubclassOf() expects exactly 1 parameter, 0 given in %s on line 5 -NULL - -Warning: ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given in %s on line 6 -NULL - -Fatal error: Uncaught exception 'ReflectionException' with message 'Class X does not exist' in %s:7 -Stack trace: -#0 %s(7): ReflectionClass->isSubclassOf('X') -#1 {main} - thrown in %s on line 7 diff --git a/ext/reflection/tests/reflectionObject_isUserDefined_basic.phpt b/ext/reflection/tests/reflectionObject_isUserDefined_basic.phpt index 7861b49855..4cb08fcb67 100644 --- a/ext/reflection/tests/reflectionObject_isUserDefined_basic.phpt +++ b/ext/reflection/tests/reflectionObject_isUserDefined_basic.phpt @@ -21,9 +21,3 @@ bool(false) bool(false) bool(false) bool(true) ---UEXPECTF-- -bool(false) -bool(false) -bool(false) -bool(false) -bool(true) diff --git a/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt b/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt index eecccc420c..70533cf3d6 100644 --- a/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt +++ b/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt @@ -13,9 +13,3 @@ NULL Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 5 NULL ---UEXPECTF-- -Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 4 -NULL - -Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 5 -NULL diff --git a/ext/reflection/tests/reflectionProperty_basic1.phpt b/ext/reflection/tests/reflectionProperty_basic1.phpt index 660cee5ebe..b27d45dcb4 100644 --- a/ext/reflection/tests/reflectionProperty_basic1.phpt +++ b/ext/reflection/tests/reflectionProperty_basic1.phpt @@ -52,115 +52,6 @@ reflectProperty("TestClass", "priv"); Reflecting on property TestClass::pub __toString(): -string(35) "Property [ <default> public $pub ] -" -export(): -string(35) "Property [ <default> public $pub ] -" -export(): -Property [ <default> public $pub ] - -NULL -getName(): -string(3) "pub" -isPublic(): -bool(true) -isPrivate(): -bool(false) -isProtected(): -bool(false) -isStatic(): -bool(false) -getValue(): -NULL -getValue() after a setValue(): -string(8) "NewValue" - -********************************** -********************************** -Reflecting on property TestClass::stat - -__toString(): -string(33) "Property [ public static $stat ] -" -export(): -string(33) "Property [ public static $stat ] -" -export(): -Property [ public static $stat ] - -NULL -getName(): -string(4) "stat" -isPublic(): -bool(true) -isPrivate(): -bool(false) -isProtected(): -bool(false) -isStatic(): -bool(true) -getValue(): -string(15) "static property" -getValue() after a setValue(): -string(8) "NewValue" - -********************************** -********************************** -Reflecting on property TestClass::prot - -__toString(): -string(39) "Property [ <default> protected $prot ] -" -export(): -string(39) "Property [ <default> protected $prot ] -" -export(): -Property [ <default> protected $prot ] - -NULL -getName(): -string(4) "prot" -isPublic(): -bool(false) -isPrivate(): -bool(false) -isProtected(): -bool(true) -isStatic(): -bool(false) - -********************************** -********************************** -Reflecting on property TestClass::priv - -__toString(): -string(37) "Property [ <default> private $priv ] -" -export(): -string(37) "Property [ <default> private $priv ] -" -export(): -Property [ <default> private $priv ] - -NULL -getName(): -string(4) "priv" -isPublic(): -bool(false) -isPrivate(): -bool(true) -isProtected(): -bool(false) -isStatic(): -bool(false) - -********************************** ---UEXPECT-- -********************************** -Reflecting on property TestClass::pub - -__toString(): unicode(35) "Property [ <default> public $pub ] " export(): diff --git a/ext/reflection/tests/reflectionProperty_basic2.phpt b/ext/reflection/tests/reflectionProperty_basic2.phpt index e69c426bda..29d288730c 100644 --- a/ext/reflection/tests/reflectionProperty_basic2.phpt +++ b/ext/reflection/tests/reflectionProperty_basic2.phpt @@ -44,73 +44,6 @@ getModifiers(): int(256) getDeclaringClass(): object(ReflectionClass)#%d (1) { - ["name"]=> - string(9) "TestClass" -} -getDocComment(): -bool(false) - -********************************** -********************************** -Reflecting on property TestClass::stat - -isDefault(): -bool(true) -getModifiers(): -int(257) -getDeclaringClass(): -object(ReflectionClass)#%d (1) { - ["name"]=> - string(9) "TestClass" -} -getDocComment(): -bool(false) - -********************************** -********************************** -Reflecting on property TestClass::prot - -isDefault(): -bool(true) -getModifiers(): -int(512) -getDeclaringClass(): -object(ReflectionClass)#%d (1) { - ["name"]=> - string(9) "TestClass" -} -getDocComment(): -string(%d) "/** - * This property has a comment. - */" - -********************************** -********************************** -Reflecting on property TestClass::priv - -isDefault(): -bool(true) -getModifiers(): -int(1024) -getDeclaringClass(): -object(ReflectionClass)#%d (1) { - ["name"]=> - string(9) "TestClass" -} -getDocComment(): -bool(false) - -********************************** ---UEXPECTF-- -********************************** -Reflecting on property TestClass::pub - -isDefault(): -bool(true) -getModifiers(): -int(256) -getDeclaringClass(): -object(ReflectionClass)#%d (1) { [u"name"]=> unicode(9) "TestClass" } diff --git a/ext/reflection/tests/reflectionProperty_error.phpt b/ext/reflection/tests/reflectionProperty_error.phpt index ffafce62b3..b7822ea796 100644 --- a/ext/reflection/tests/reflectionProperty_error.phpt +++ b/ext/reflection/tests/reflectionProperty_error.phpt @@ -23,51 +23,6 @@ var_dump($rp->isDefault(1)); --EXPECTF-- Warning: ReflectionProperty::__construct() expects exactly 2 parameters, 0 given in %s on line %d object(ReflectionProperty)#%d (2) { - ["name"]=> - string(0) "" - ["class"]=> - string(0) "" -} - -Warning: ReflectionProperty::__construct() expects exactly 2 parameters, 1 given in %s on line %d -object(ReflectionProperty)#%d (2) { - ["name"]=> - string(0) "" - ["class"]=> - string(0) "" -} - -Warning: ReflectionProperty::__construct() expects exactly 2 parameters, 3 given in %s on line %d -object(ReflectionProperty)#%d (2) { - ["name"]=> - string(0) "" - ["class"]=> - string(0) "" -} - -Warning: Wrong parameter count for ReflectionProperty::getName() in %s on line %d -NULL - -Warning: Wrong parameter count for ReflectionProperty::isPrivate() in %s on line %d -NULL - -Warning: Wrong parameter count for ReflectionProperty::isProtected() in %s on line %d -NULL - -Warning: Wrong parameter count for ReflectionProperty::isPublic() in %s on line %d -NULL - -Warning: Wrong parameter count for ReflectionProperty::isStatic() in %s on line %d -NULL - -Warning: Wrong parameter count for ReflectionProperty::getModifiers() in %s on line %d -NULL - -Warning: Wrong parameter count for ReflectionProperty::isDefault() in %s on line %d -NULL ---UEXPECTF-- -Warning: ReflectionProperty::__construct() expects exactly 2 parameters, 0 given in %s on line %d -object(ReflectionProperty)#%d (2) { [u"name"]=> unicode(0) "" [u"class"]=> @@ -109,4 +64,4 @@ Warning: Wrong parameter count for ReflectionProperty::getModifiers() in %s on l NULL Warning: Wrong parameter count for ReflectionProperty::isDefault() in %s on line %d -NULL
\ No newline at end of file +NULL diff --git a/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt b/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt index 7fa747732c..bfc88a3174 100644 --- a/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt +++ b/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt @@ -19,17 +19,9 @@ $propInfo->getDeclaringClass(1); ?> --EXPECTF-- object(ReflectionClass)#%d (1) { - ["name"]=> - string(1) "A" -} -Wrong number of params: - -Warning: Wrong parameter count for ReflectionProperty::getDeclaringClass() in %s on line %d ---UEXPECTF-- -object(ReflectionClass)#%d (1) { [u"name"]=> unicode(1) "A" } Wrong number of params: -Warning: Wrong parameter count for ReflectionProperty::getDeclaringClass() in %s on line %d
\ No newline at end of file +Warning: Wrong parameter count for ReflectionProperty::getDeclaringClass() in %s on line %d diff --git a/ext/reflection/tests/reflectionProperty_getDocComment_basic.phpt b/ext/reflection/tests/reflectionProperty_getDocComment_basic.phpt index 6ed34ea547..b342527c51 100644 --- a/ext/reflection/tests/reflectionProperty_getDocComment_basic.phpt +++ b/ext/reflection/tests/reflectionProperty_getDocComment_basic.phpt @@ -42,64 +42,6 @@ foreach(array('A', 'B') as $class) { --EXPECTF-- ---> Doc comment for A::$a: -string(%d) "/** - * My Doc Comment for $a - * - */" - - ----> Doc comment for A::$b: -bool(false) - - ----> Doc comment for A::$c: -bool(false) - - ----> Doc comment for A::$d: -string(%d) "/** - * My Doc Comment for $d - */" - - ----> Doc comment for A::$e: -bool(false) - - ----> Doc comment for A::$f: -string(%d) "/** - * Doc comment for $f - */" - - ----> Doc comment for B::$a: -bool(false) - - ----> Doc comment for B::$b: -string(%d) "/** A doc comment for $b */" - - ----> Doc comment for B::$c: -bool(false) - - ----> Doc comment for B::$e: -string(%d) "/** A doc comment for $e */" - - ----> Doc comment for B::$d: -string(%d) "/** - * My Doc Comment for $d - */" - - ----> Doc comment for B::$f: -string(%d) "/** - * Doc comment for $f - */" ---UEXPECT-- ----> Doc comment for A::$a: unicode(47) "/** * My Doc Comment for $a * diff --git a/ext/reflection/tests/reflectionProperty_getValue_error.phpt b/ext/reflection/tests/reflectionProperty_getValue_error.phpt index eae1db03a8..07526aded3 100644 --- a/ext/reflection/tests/reflectionProperty_getValue_error.phpt +++ b/ext/reflection/tests/reflectionProperty_getValue_error.phpt @@ -69,35 +69,6 @@ NULL Instance without property: Static property / too many args: -string(15) "static property" - -Static property / wrong type of arg: -string(15) "static property" - -Protected property: -Cannot access non-public member TestClass::prot - -Instance without property: -NULL ---UEXPECTF-- -Too few args: - -Warning: ReflectionProperty::getValue() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Too many args: - -Warning: ReflectionProperty::getValue() expects exactly 1 parameter, 2 given in %s on line %d -NULL - -Wrong type of arg: - -Warning: ReflectionProperty::getValue() expects parameter 1 to be object, boolean given in %s on line %d -NULL - -Instance without property: - -Static property / too many args: unicode(15) "static property" Static property / wrong type of arg: @@ -108,4 +79,4 @@ Cannot access non-public member TestClass::prot Instance without property: NULL -
\ No newline at end of file + diff --git a/ext/reflection/tests/reflectionProperty_setValue_error.phpt b/ext/reflection/tests/reflectionProperty_setValue_error.phpt index fd8c566dc8..14084a44f4 100644 --- a/ext/reflection/tests/reflectionProperty_setValue_error.phpt +++ b/ext/reflection/tests/reflectionProperty_setValue_error.phpt @@ -82,48 +82,6 @@ NULL Static property / too few args: NULL -string(11) "A new value" - -Warning: ReflectionProperty::setValue() expects exactly 2 parameters, 0 given in %s on line %d -NULL -string(11) "A new value" - -Static property / wrong type of arg: -NULL -string(17) "Another new value" - -Protected property: -Cannot access non-public member TestClass::prot - -Instance without property: -NULL -string(8) "NewValue" ---UEXPECTF-- -Too few args: - -Warning: ReflectionProperty::setValue() expects exactly 2 parameters, 0 given in %s on line %d -NULL - -Warning: ReflectionProperty::setValue() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Too many args: - -Warning: ReflectionProperty::setValue() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Wrong type of arg: - -Warning: ReflectionProperty::setValue() expects parameter 1 to be object, boolean given in %s on line %d -NULL - -Static property / too many args: - -Warning: ReflectionProperty::setValue() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Static property / too few args: -NULL unicode(11) "A new value" Warning: ReflectionProperty::setValue() expects exactly 2 parameters, 0 given in %s on line %d @@ -140,4 +98,4 @@ Cannot access non-public member TestClass::prot Instance without property: NULL unicode(8) "NewValue" -
\ No newline at end of file + |