Adjust tests for zpp TypeError change

1 files changed, 16 insertions, 35 deletions

diff --git a/ext/standard/tests/file/pathinfo_variaton.phpt b/ext/standard/tests/file/pathinfo_variaton.phpt
index 421f378e01..6f4492e375 100644
--- a/ext/standard/tests/file/pathinfo_variaton.phpt
+++ b/ext/standard/tests/file/pathinfo_variaton.phpt
@@ -43,9 +43,6 @@ $paths = array (
   "./array(1, 2)",
   "array( array(), null)",
 
-  /* pathname as object */
-  $obj,
-
   /* pathname as spaces */
   " ",
   ' ',
@@ -199,22 +196,6 @@ string(21) "array( array(), null)"
 string(0) ""
 string(21) "array( array(), null)"
 -- Iteration 9 --
-
-Warning: pathinfo() expects parameter 1 to be string, object given in %s on line %d
-NULL
-
-Warning: pathinfo() expects parameter 1 to be string, object given in %s on line %d
-NULL
-
-Warning: pathinfo() expects parameter 1 to be string, object given in %s on line %d
-NULL
-
-Warning: pathinfo() expects parameter 1 to be string, object given in %s on line %d
-NULL
-
-Warning: pathinfo() expects parameter 1 to be string, object given in %s on line %d
-NULL
--- Iteration 10 --
 array(3) {
   ["dirname"]=>
   string(1) "."
@@ -227,7 +208,7 @@ string(1) "."
 string(1) " "
 string(0) ""
 string(1) " "
--- Iteration 11 --
+-- Iteration 10 --
 array(3) {
   ["dirname"]=>
   string(1) "."
@@ -240,7 +221,7 @@ string(1) "."
 string(1) " "
 string(0) ""
 string(1) " "
--- Iteration 12 --
+-- Iteration 11 --
 array(2) {
   ["basename"]=>
   string(0) ""
@@ -251,7 +232,7 @@ string(0) ""
 string(0) ""
 string(0) ""
 string(0) ""
--- Iteration 13 --
+-- Iteration 12 --
 array(2) {
   ["basename"]=>
   string(0) ""
@@ -262,7 +243,7 @@ string(0) ""
 string(0) ""
 string(0) ""
 string(0) ""
--- Iteration 14 --
+-- Iteration 13 --
 array(2) {
   ["basename"]=>
   string(0) ""
@@ -273,7 +254,7 @@ string(0) ""
 string(0) ""
 string(0) ""
 string(0) ""
--- Iteration 15 --
+-- Iteration 14 --
 array(2) {
   ["basename"]=>
   string(0) ""
@@ -284,7 +265,7 @@ string(0) ""
 string(0) ""
 string(0) ""
 string(0) ""
--- Iteration 16 --
+-- Iteration 15 --
 array(2) {
   ["basename"]=>
   string(0) ""
@@ -295,7 +276,7 @@ string(0) ""
 string(0) ""
 string(0) ""
 string(0) ""
--- Iteration 17 --
+-- Iteration 16 --
 array(4) {
   ["dirname"]=>
   string(1) "."
@@ -310,7 +291,7 @@ string(1) "."
 string(11) "www.foo.com"
 string(3) "com"
 string(7) "www.foo"
--- Iteration 18 --
+-- Iteration 17 --
 array(4) {
   ["dirname"]=>
   string(17) "/var/html/testdir"
@@ -325,7 +306,7 @@ string(17) "/var/html/testdir"
 string(12) "example.html"
 string(4) "html"
 string(7) "example"
--- Iteration 19 --
+-- Iteration 18 --
 array(3) {
   ["dirname"]=>
   string(12) "/testdir/foo"
@@ -338,7 +319,7 @@ string(12) "/testdir/foo"
 string(4) "test"
 string(0) ""
 string(4) "test"
--- Iteration 20 --
+-- Iteration 19 --
 array(4) {
   ["dirname"]=>
   string(4) "/foo"
@@ -353,7 +334,7 @@ string(4) "/foo"
 string(12) "symlink.link"
 string(4) "link"
 string(7) "symlink"
--- Iteration 21 --
+-- Iteration 20 --
 array(3) {
   ["dirname"]=>
   string(1) "."
@@ -366,7 +347,7 @@ string(1) "."
 string(5) "12345"
 string(0) ""
 string(5) "12345"
--- Iteration 22 --
+-- Iteration 21 --
 array(4) {
   ["dirname"]=>
   string(1) "."
@@ -381,7 +362,7 @@ string(1) "."
 string(15) "www.example.com"
 string(3) "com"
 string(11) "www.example"
--- Iteration 23 --
+-- Iteration 22 --
 array(3) {
   ["dirname"]=>
   string(12) "/testdir/foo"
@@ -394,7 +375,7 @@ string(12) "/testdir/foo"
 string(4) "test"
 string(0) ""
 string(4) "test"
--- Iteration 24 --
+-- Iteration 23 --
 array(4) {
   ["dirname"]=>
   string(6) "../foo"
@@ -409,7 +390,7 @@ string(6) "../foo"
 string(9) "test.link"
 string(4) "link"
 string(4) "test"
--- Iteration 25 --
+-- Iteration 24 --
 array(4) {
   ["dirname"]=>
   string(76) "./test/work/scratch/mydir/yourdir/ourdir/test1/test2/test3/test4/test5/test6"
@@ -424,7 +405,7 @@ string(76) "./test/work/scratch/mydir/yourdir/ourdir/test1/test2/test3/test4/tes
 string(8) "test.tmp"
 string(3) "tmp"
 string(4) "test"
--- Iteration 26 --
+-- Iteration 25 --
 array(4) {
   ["dirname"]=>
   string(1) "."