From: Antony Dovgal Date: Thu, 8 Nov 2007 10:03:52 +0000 (+0000) Subject: fix test X-Git-Tag: RELEASE_1_3_1~696 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=984842e32156411b5bd96a59cd487533ddf011bc;p=php fix test --- diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt index 94fff0c1c4..23d410ee1b 100644 --- a/ext/standard/tests/array/end_64bit.phpt +++ b/ext/standard/tests/array/end_64bit.phpt @@ -206,33 +206,33 @@ string(1) "b" int(-4) *** Testing end() on objects *** -object(foo1)#2 (0) { +object(foo1)#%d (0) { } array(2) { [0]=> - &object(foo)#1 (0) { + &object(foo)#%d (0) { } [1]=> - &object(foo1)#2 (0) { + &object(foo1)#%d (0) { } } *** Testing end() on resource type *** -resource(6) of type (stream) -resource(6) of type (stream) +resource(%d) of type (stream) +resource(%d) of type (stream) *** Testing error conditions *** -Warning: Wrong parameter count for end() in %s on line %d +Warning: end() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for end() in %s on line %d +Warning: end() expects exactly 1 parameter, 2 given in %s on line %d NULL -Warning: end(): Passed variable is not an array or object in %s on line %d -bool(false) +Warning: end() expects parameter 1 to be array, integer given in %s on line %d +NULL -Warning: end(): Passed variable is not an array or object in %s on line %d -bool(false) +Warning: end() expects parameter 1 to be array, string given in %s on line %d +NULL bool(false) Done diff --git a/ext/zip/tests/bug38943.phpt b/ext/zip/tests/bug38943.phpt index d7236e314b..f4896df99b 100644 --- a/ext/zip/tests/bug38943.phpt +++ b/ext/zip/tests/bug38943.phpt @@ -28,11 +28,11 @@ array(1) { int(1) } object(myZip)#1 (%d) { - ["test:private"]=> + ["test":"myZip":private]=> int(0) ["testp"]=> string(6) "foobar" - ["testarray:private"]=> + ["testarray":"myZip":private]=> array(1) { [0]=> int(1)