From: Dmitry Stogov Date: Tue, 18 Mar 2014 09:28:50 +0000 (+0400) Subject: Fixed tests X-Git-Tag: POST_PHPNG_MERGE~412^2~276 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89ad91a8cc3c9378d8b257ba2c7881265ed04f67;p=php Fixed tests --- diff --git a/ext/standard/tests/array/bug25708.phpt b/ext/standard/tests/array/bug25708.phpt index d3da3e3399..784f111064 100644 --- a/ext/standard/tests/array/bug25708.phpt +++ b/ext/standard/tests/array/bug25708.phpt @@ -66,158 +66,158 @@ foo(true, false); debug_zval_dump($_a, $_b); ?> ---EXPECT-- -NULL refcount(2) -NULL refcount(2) -long(1) refcount(3) -long(2) refcount(3) --- -long(1) refcount(1) -long(2) refcount(1) -long(1) refcount(1) -long(2) refcount(1) --- -long(1) refcount(1) -long(2) refcount(1) -long(1) refcount(1) -long(2) refcount(1) --- -long(1) refcount(1) -long(3) refcount(1) -long(1) refcount(1) -long(3) refcount(1) --- -long(4) refcount(1) -long(3) refcount(1) -long(4) refcount(1) -long(3) refcount(1) --- -long(3) refcount(1) -long(3) refcount(1) -long(3) refcount(2) --- -long(4) refcount(1) -string(1) "x" refcount(1) -long(4) refcount(1) -string(1) "x" refcount(1) -long(3) refcount(2) --- -long(1) refcount(2) -long(2) refcount(2) +--EXPECTF-- +NULL +NULL +long(1) +long(2) +-- +long(1) +long(2) +long(1) +long(2) +-- +long(1) +long(2) +long(1) +long(2) +-- +long(1) +long(3) +long(1) +long(3) +-- +long(4) +long(3) +long(4) +long(3) +-- +long(3) +long(3) +long(3) +-- +long(4) +string(1) "x" refcount(%d) +long(4) +string(1) "x" refcount(%d) +long(3) +-- +long(1) +long(2) ----a -long(1) refcount(1) -long(2) refcount(1) -long(1) refcount(1) -long(2) refcount(1) --- -long(1) refcount(1) -long(2) refcount(1) -long(1) refcount(1) -long(2) refcount(1) --- -long(1) refcount(1) -long(2) refcount(1) -long(1) refcount(1) -long(2) refcount(1) --- -long(1) refcount(1) -long(3) refcount(1) -long(1) refcount(1) -long(3) refcount(1) --- -long(4) refcount(1) -long(3) refcount(1) -long(4) refcount(1) -long(3) refcount(1) --- -long(3) refcount(1) -long(3) refcount(1) -long(3) refcount(2) --- -long(4) refcount(1) -string(1) "x" refcount(1) -long(4) refcount(1) -string(1) "x" refcount(1) -long(3) refcount(2) --- -long(1) refcount(2) -long(2) refcount(2) +long(1) +long(2) +long(1) +long(2) +-- +long(1) +long(2) +long(1) +long(2) +-- +long(1) +long(2) +long(1) +long(2) +-- +long(1) +long(3) +long(1) +long(3) +-- +long(4) +long(3) +long(4) +long(3) +-- +long(3) +long(3) +long(3) +-- +long(4) +string(1) "x" refcount(%d) +long(4) +string(1) "x" refcount(%d) +long(3) +-- +long(1) +long(2) ----ra -NULL refcount(2) -NULL refcount(2) -long(1) refcount(3) -long(2) refcount(3) --- -long(1) refcount(1) -long(2) refcount(1) -long(1) refcount(1) -long(2) refcount(1) --- -long(1) refcount(1) -long(2) refcount(1) -long(1) refcount(1) -long(2) refcount(1) --- -long(1) refcount(1) -long(3) refcount(1) -long(1) refcount(1) -long(3) refcount(1) --- -long(4) refcount(1) -long(3) refcount(1) -long(4) refcount(1) -long(3) refcount(1) --- -long(3) refcount(1) -long(3) refcount(1) -long(3) refcount(2) --- -long(4) refcount(1) -string(1) "x" refcount(1) -long(4) refcount(1) -string(1) "x" refcount(1) -long(3) refcount(2) --- -long(1) refcount(2) -long(2) refcount(2) +NULL +NULL +long(1) +long(2) +-- +long(1) +long(2) +long(1) +long(2) +-- +long(1) +long(2) +long(1) +long(2) +-- +long(1) +long(3) +long(1) +long(3) +-- +long(4) +long(3) +long(4) +long(3) +-- +long(3) +long(3) +long(3) +-- +long(4) +string(1) "x" refcount(%d) +long(4) +string(1) "x" refcount(%d) +long(3) +-- +long(1) +long(2) ---- -long(1) refcount(1) -long(2) refcount(1) -long(1) refcount(1) -long(2) refcount(1) --- -long(1) refcount(1) -long(2) refcount(1) -long(1) refcount(1) -long(2) refcount(1) --- -long(1) refcount(1) -long(2) refcount(1) -long(1) refcount(1) -long(2) refcount(1) --- -long(1) refcount(1) -long(3) refcount(1) -long(1) refcount(1) -long(3) refcount(1) --- -long(4) refcount(1) -long(3) refcount(1) -long(4) refcount(1) -long(3) refcount(1) --- -long(3) refcount(1) -long(3) refcount(1) -long(3) refcount(2) --- -long(4) refcount(1) -string(1) "x" refcount(1) -long(4) refcount(1) -string(1) "x" refcount(1) -long(3) refcount(2) --- -long(1) refcount(2) -long(2) refcount(2) +long(1) +long(2) +long(1) +long(2) +-- +long(1) +long(2) +long(1) +long(2) +-- +long(1) +long(2) +long(1) +long(2) +-- +long(1) +long(3) +long(1) +long(3) +-- +long(4) +long(3) +long(4) +long(3) +-- +long(3) +long(3) +long(3) +-- +long(4) +string(1) "x" refcount(%d) +long(4) +string(1) "x" refcount(%d) +long(3) +-- +long(1) +long(2) ----r -string(2) "ok" refcount(2) -string(2) "ok" refcount(2) +string(2) "ok" refcount(%d) +string(2) "ok" refcount(%d) diff --git a/ext/standard/tests/array/extract_safety.phpt b/ext/standard/tests/array/extract_safety.phpt index d5d0763be0..046ef5e2e2 100644 --- a/ext/standard/tests/array/extract_safety.phpt +++ b/ext/standard/tests/array/extract_safety.phpt @@ -17,8 +17,8 @@ echo "\nDone"; ?> --EXPECTF-- -string(4) "John" refcount(2) +string(4) "John" refcount(%d) int(0) -string(4) "John" refcount(2) +string(4) "John" refcount(%d) Done \ No newline at end of file diff --git a/ext/standard/tests/array/extract_variation1.phpt b/ext/standard/tests/array/extract_variation1.phpt index 1b2ea193f4..d102534a08 100644 --- a/ext/standard/tests/array/extract_variation1.phpt +++ b/ext/standard/tests/array/extract_variation1.phpt @@ -18,10 +18,10 @@ echo "\nDone"; ?> --EXPECTF-- -long(4) refcount(2) -string(4) "John" refcount(2) +long(4) +string(4) "John" refcount(%d) int(%d) -long(4) refcount(2) -string(4) "John" refcount(2) +long(4) +string(4) "John" refcount(%d) Done