diff options
Diffstat (limited to 'ext/standard/tests')
37 files changed, 596 insertions, 581 deletions
diff --git a/ext/standard/tests/array/bug24766.phpt b/ext/standard/tests/array/bug24766.phpt index d6f82f3b16..65d80fa79d 100644 --- a/ext/standard/tests/array/bug24766.phpt +++ b/ext/standard/tests/array/bug24766.phpt @@ -19,27 +19,27 @@ var_dump($b[$i]); --EXPECT-- array(2) refcount(2){ [1]=> - long(18) refcount(1) + long(18) [2]=> - long(52) refcount(1) + long(52) } array(2) refcount(2){ [1]=> - long(18) refcount(1) + long(18) [2]=> - long(52) refcount(1) + long(52) } array(2) refcount(2){ [0]=> - long(1) refcount(1) + long(1) [1]=> - long(2) refcount(1) + long(2) } array(2) refcount(2){ [0]=> - long(1) refcount(1) + long(1) [1]=> - long(2) refcount(1) + long(2) } int(18) int(18) 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 diff --git a/ext/standard/tests/dir/closedir_variation2.phpt b/ext/standard/tests/dir/closedir_variation2.phpt index 015176c84d..2437868d62 100644 --- a/ext/standard/tests/dir/closedir_variation2.phpt +++ b/ext/standard/tests/dir/closedir_variation2.phpt @@ -45,7 +45,7 @@ Directory Handle: resource(%d) of type (Unknown) -- Close directory handle second time: -- -Warning: closedir(): %d is not a valid Directory resource in %s on line %d +Warning: closedir(): supplied resource is not a valid Directory resource in %s on line %d bool(false) Directory Handle: resource(%d) of type (Unknown) ===DONE=== diff --git a/ext/standard/tests/dir/dir_basic.phpt b/ext/standard/tests/dir/dir_basic.phpt index dba49dba08..da364b9b60 100644 --- a/ext/standard/tests/dir/dir_basic.phpt +++ b/ext/standard/tests/dir/dir_basic.phpt @@ -81,6 +81,6 @@ object(Directory)#%d (2) { } Test read after closing the dir: -Warning: Directory::read(): %d is not a valid Directory resource in %s on line %d +Warning: Directory::read(): supplied resource is not a valid Directory resource in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/dir/rewinddir_variation2.phpt b/ext/standard/tests/dir/rewinddir_variation2.phpt index 7594cc220e..6b06a56d95 100644 --- a/ext/standard/tests/dir/rewinddir_variation2.phpt +++ b/ext/standard/tests/dir/rewinddir_variation2.phpt @@ -40,6 +40,6 @@ string(%d) "%s" -- Call to rewinddir() -- -Warning: rewinddir(): %d is not a valid Directory resource in %s on line %d +Warning: rewinddir(): supplied resource is not a valid Directory resource in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/file/007_basic.phpt b/ext/standard/tests/file/007_basic.phpt index eafadf7c55..ceb9b29943 100644 --- a/ext/standard/tests/file/007_basic.phpt +++ b/ext/standard/tests/file/007_basic.phpt @@ -98,10 +98,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'wb' -- @@ -111,10 +111,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'wt' -- @@ -124,10 +124,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'w+' -- @@ -137,10 +137,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'w+b' -- @@ -150,10 +150,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'w+t' -- @@ -163,10 +163,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'r' -- @@ -176,10 +176,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'rb' -- @@ -189,10 +189,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'rt' -- @@ -202,10 +202,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'r+' -- @@ -215,10 +215,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'r+b' -- @@ -228,10 +228,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'r+t' -- @@ -241,10 +241,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'a' -- @@ -254,10 +254,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'ab' -- @@ -267,10 +267,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'at' -- @@ -280,10 +280,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'a+' -- @@ -293,10 +293,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'a+t' -- @@ -306,10 +306,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'a+b' -- @@ -319,10 +319,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Iteration with mode 'x' -- @@ -332,10 +332,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) resource(%d) of type (Unknown) @@ -346,10 +346,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) resource(%d) of type (Unknown) @@ -360,10 +360,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) resource(%d) of type (Unknown) @@ -374,10 +374,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) resource(%d) of type (Unknown) @@ -388,10 +388,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) resource(%d) of type (Unknown) @@ -402,10 +402,10 @@ bool(false) bool(true) resource(%d) of type (Unknown) -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) resource(%d) of type (Unknown) diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt index 112beb3059..1d692b0b6f 100644 --- a/ext/standard/tests/file/007_error.phpt +++ b/ext/standard/tests/file/007_error.phpt @@ -76,7 +76,7 @@ bool(false) Warning: fopen() expects at least 2 parameters, 0 given in %s on line %d bool(false) -Warning: fclose(): %d is not a valid stream resource in %s on line %d +Warning: fclose(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, string given in %s on line %d @@ -85,7 +85,7 @@ bool(false) Warning: fclose() expects exactly 1 parameter, 0 given in %s on line %d bool(false) -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: feof() expects parameter 1 to be resource, string given in %s on line %d diff --git a/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt index 7f012bd8f4..188080aa25 100644 --- a/ext/standard/tests/file/bug27508.phpt +++ b/ext/standard/tests/file/bug27508.phpt @@ -72,9 +72,9 @@ fclose($fp); unlink($tn); ?> --EXPECT-- -bool(false) refcount(1) +bool(false) 0 -bool(false) refcount(1) +bool(false) line1 line2 line3 diff --git a/ext/standard/tests/file/fclose_variation1.phpt b/ext/standard/tests/file/fclose_variation1.phpt index 43a6c343d0..ba3631e50d 100644 --- a/ext/standard/tests/file/fclose_variation1.phpt +++ b/ext/standard/tests/file/fclose_variation1.phpt @@ -10,6 +10,6 @@ fclose($s); echo fread($s2, strlen("<?php")); echo "\nDone.\n"; --EXPECTF-- -Warning: fread(): %d is not a valid stream resource in %s on line %d +Warning: fread(): supplied resource is not a valid stream resource in %s on line %d Done. diff --git a/ext/standard/tests/file/feof_basic.phpt b/ext/standard/tests/file/feof_basic.phpt index ff1d179f6f..78774e58e9 100644 --- a/ext/standard/tests/file/feof_basic.phpt +++ b/ext/standard/tests/file/feof_basic.phpt @@ -97,5 +97,5 @@ bool(false) bool(false) *** closing file, testing eof *** -Warning: feof(): %d is not a valid stream resource in %s on line %d +Warning: feof(): supplied resource is not a valid stream resource in %s on line %d Done diff --git a/ext/standard/tests/file/fgetc_variation2.phpt b/ext/standard/tests/file/fgetc_variation2.phpt index 380c1aa268..169f00ac2c 100644 --- a/ext/standard/tests/file/fgetc_variation2.phpt +++ b/ext/standard/tests/file/fgetc_variation2.phpt @@ -41,7 +41,7 @@ echo "Done"; *** Testing fgetc() : usage variations *** -- Testing fgetc() with closed handle -- -Warning: fgetc(): %d is not a valid stream resource in %s on line %d +Warning: fgetc(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Testing fgetc() with unset handle -- diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt index 51ae3c6a37..5ab32820ca 100644 --- a/ext/standard/tests/file/fgets_error.phpt +++ b/ext/standard/tests/file/fgets_error.phpt @@ -99,7 +99,7 @@ bool(false) Warning: fgets() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing fgets() with closed/unset file handle -- -Warning: fgets(): %d is not a valid stream resource in %s on line %d +Warning: fgets(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: fgets() expects parameter 1 to be resource, null given in %s on line %d diff --git a/ext/standard/tests/file/fgets_variation2.phpt b/ext/standard/tests/file/fgets_variation2.phpt index 964216bf8c..201755b69c 100644 --- a/ext/standard/tests/file/fgets_variation2.phpt +++ b/ext/standard/tests/file/fgets_variation2.phpt @@ -43,10 +43,10 @@ echo "Done"; *** Testing fgets() : usage variations *** -- Testing fgets() with closed handle -- -Warning: fgets(): %d is not a valid stream resource in %s on line %d +Warning: fgets(): supplied resource is not a valid stream resource in %s on line %d bool(false) -Warning: fgets(): %d is not a valid stream resource in %s on line %d +Warning: fgets(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Testing fgets() with unset handle -- diff --git a/ext/standard/tests/file/fgetss.phpt b/ext/standard/tests/file/fgetss.phpt index b4ac21167b..2e2bb6b71c 100644 --- a/ext/standard/tests/file/fgetss.phpt +++ b/ext/standard/tests/file/fgetss.phpt @@ -78,6 +78,6 @@ bool(false) Warning: fgetss(): Length parameter must be greater than 0 in %s on line %d bool(false) -Warning: fgetss(): %d is not a valid stream resource in %s on line %d +Warning: fgetss(): supplied resource is not a valid stream resource in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt index 2b4ad68125..1671662584 100644 --- a/ext/standard/tests/file/fgetss_error.phpt +++ b/ext/standard/tests/file/fgetss_error.phpt @@ -98,7 +98,7 @@ bool(false) Warning: fgetss() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing fgetss() with closed/unset file handle -- -Warning: fgetss(): %d is not a valid stream resource in %s on line %d +Warning: fgetss(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: fgetss() expects parameter 1 to be resource, null given in %s on line %d diff --git a/ext/standard/tests/file/flock.phpt b/ext/standard/tests/file/flock.phpt index efc059cff5..55aae4ab5a 100644 --- a/ext/standard/tests/file/flock.phpt +++ b/ext/standard/tests/file/flock.phpt @@ -43,7 +43,7 @@ NULL Warning: flock() expects parameter 1 to be resource, string given in %s on line %d NULL -Warning: flock(): %d is not a valid stream resource in %s on line %d +Warning: flock(): supplied resource is not a valid stream resource in %s on line %d bool(false) bool(true) bool(true) diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt index fe61e2a173..4fa1094967 100644 --- a/ext/standard/tests/file/flock_error.phpt +++ b/ext/standard/tests/file/flock_error.phpt @@ -94,7 +94,7 @@ NULL Warning: flock() expects parameter 2 to be long, string given in %s on line %d NULL -Warning: flock(): %d is not a valid stream resource in %s on line %d +Warning: flock(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: flock() expects parameter 1 to be resource, string given in %s on line %d diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt index 45a5ad1aa9..16c828ec51 100644 --- a/ext/standard/tests/file/fread_error.phpt +++ b/ext/standard/tests/file/fread_error.phpt @@ -103,7 +103,7 @@ bool(false) Notice: Undefined variable: file_content_type in %s on line %d -Warning: fread(): %d is not a valid stream resource in %s on line %d +Warning: fread(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: fread() expects parameter 1 to be resource, null given in %s on line %d diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt index 85c0ac4bf6..f93d1b2a57 100644 --- a/ext/standard/tests/file/fscanf_error.phpt +++ b/ext/standard/tests/file/fscanf_error.phpt @@ -70,7 +70,7 @@ NULL Warning: fscanf() expects at least 2 parameters, 1 given in %s on line %d NULL -Warning: fscanf(): %d is not a valid File-Handle resource in %s on line %d +Warning: fscanf(): supplied resource is not a valid File-Handle resource in %s on line %d bool(false) Warning: fscanf(): Different numbers of variable names and field specifiers in %s on line %d diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt index 1779383044..d955340581 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt @@ -91,7 +91,7 @@ bool(false) Warning: fseek() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing fseek() with closed/unset file handle -- -Warning: fseek(): %d is not a valid stream resource in %s on line %d +Warning: fseek(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: fseek() expects parameter 1 to be resource, null given in %s on line %d diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt index 1f28abc99c..d297d6c7cb 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt @@ -87,7 +87,7 @@ bool(false) Warning: ftell() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing ftell with closed/unset file handle -- -Warning: ftell(): %d is not a valid stream resource in %s on line %d +Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: ftell() expects parameter 1 to be resource, null given in %s on line %d diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt index 3c928e6465..16a4a0f9dd 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt @@ -87,7 +87,7 @@ bool(false) Warning: rewind() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing rewind() with closed/unset file handle -- -Warning: rewind(): %d is not a valid stream resource in %s on line %d +Warning: rewind(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: rewind() expects parameter 1 to be resource, null given in %s on line %d diff --git a/ext/standard/tests/file/fstat.phpt b/ext/standard/tests/file/fstat.phpt index e1ae3e20bc..96924af077 100644 --- a/ext/standard/tests/file/fstat.phpt +++ b/ext/standard/tests/file/fstat.phpt @@ -69,6 +69,6 @@ array(26) { int(%i) } -Warning: fstat(): %d is not a valid stream resource in %s on line %d +Warning: fstat(): supplied resource is not a valid stream resource in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt index 254ad7688d..4823a7739b 100644 --- a/ext/standard/tests/file/ftruncate_error.phpt +++ b/ext/standard/tests/file/ftruncate_error.phpt @@ -114,7 +114,7 @@ Warning: ftruncate() expects parameter 1 to be resource, object given in %s on l bool(false) -- Testing ftruncate() with closed/unset file handle -- -Warning: ftruncate(): %d is not a valid stream resource in %s on line %d +Warning: ftruncate(): supplied resource is not a valid stream resource in %s on line %d bool(false) int(36) diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt index 988d618c66..2b28429362 100644 --- a/ext/standard/tests/file/fwrite_error.phpt +++ b/ext/standard/tests/file/fwrite_error.phpt @@ -112,7 +112,7 @@ Warning: fwrite() expects parameter 1 to be resource, object given in %s on line bool(false) -- Testing fwrite() with closed/unset file handle -- -Warning: fwrite(): %d is not a valid stream resource in %s on line %d +Warning: fwrite(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: fwrite() expects parameter 1 to be resource, null given in %s on line %d diff --git a/ext/standard/tests/general_functions/bug29038.phpt b/ext/standard/tests/general_functions/bug29038.phpt index 0f79229994..d0c87fb199 100644 --- a/ext/standard/tests/general_functions/bug29038.phpt +++ b/ext/standard/tests/general_functions/bug29038.phpt @@ -2,37 +2,41 @@ Bug #29038 (extract(), EXTR_PREFIX_SAME option prefixes empty strings) --FILE-- <?php +function my_print_r($a) { + ksort($a); + print_r($a); +} function f1() { $c = extract(array("" => 1),EXTR_PREFIX_SAME,"prefix"); echo "Extracted:"; var_dump($c); - print_r(get_defined_vars()); + my_print_r(get_defined_vars()); } function f2() { $a = 1; $c = extract(array("a" => 1),EXTR_PREFIX_SAME,"prefix"); echo "Extracted:"; var_dump($c); - print_r(get_defined_vars()); + my_print_r(get_defined_vars()); } function f3() { $a = 1; $c = extract(array("a" => 1),EXTR_PREFIX_ALL,"prefix"); echo "Extracted:"; var_dump($c); - print_r(get_defined_vars()); + my_print_r(get_defined_vars()); } function f4() { $c = extract(array("" => 1),EXTR_PREFIX_ALL,"prefix"); echo "Extracted:"; var_dump($c); - print_r(get_defined_vars()); + my_print_r(get_defined_vars()); } function f5() { $c = extract(array("111" => 1),EXTR_PREFIX_ALL,"prefix"); echo "Extracted:"; var_dump($c); - print_r(get_defined_vars()); + my_print_r(get_defined_vars()); } f1(); @@ -51,15 +55,15 @@ Extracted:int(1) Array ( [a] => 1 - [prefix_a] => 1 [c] => 1 + [prefix_a] => 1 ) Extracted:int(1) Array ( [a] => 1 - [prefix_a] => 1 [c] => 1 + [prefix_a] => 1 ) Extracted:int(0) Array @@ -69,6 +73,6 @@ Array Extracted:int(1) Array ( - [prefix_111] => 1 [c] => 1 + [prefix_111] => 1 ) diff --git a/ext/standard/tests/general_functions/call_user_func_return.phpt b/ext/standard/tests/general_functions/call_user_func_return.phpt index 929fdd7e35..cb0f6998dc 100644 --- a/ext/standard/tests/general_functions/call_user_func_return.phpt +++ b/ext/standard/tests/general_functions/call_user_func_return.phpt @@ -34,11 +34,11 @@ test('test2'); ===DONE=== --EXPECTF-- Direct Call -string(5) "test1" refcount(1) +string(5) "test1" refcount(%d) User Func -string(5) "test1" refcount(1) +string(5) "test1" refcount(%d) Direct Call -string(5) "test2" refcount(2) +string(5) "test2" refcount(%d) User Func -string(5) "test2" refcount(1) +string(5) "test2" refcount(%d) ===DONE=== diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt Binary files differindex e83cdbf540..00ec7a88a4 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt diff --git a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt index 78f0f03003..4f286ec606 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt @@ -118,613 +118,613 @@ echo "Done\n"; --EXPECTF-- *** Testing debug_zval_dump() on objects *** -- Iteration 1 -- -object(object_class)#%d (6) refcount(5){ +object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(5){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } -- Iteration 2 -- -object(no_member_class)#%d (0) refcount(4){ +object(no_member_class)#%d (0) refcount(%d){ } -- Iteration 3 -- -object(contains_object_class)#%d (9) refcount(4){ +object(contains_object_class)#%d (9) refcount(%d){ ["p"]=> - long(30) refcount(2) + long(30) ["p1":protected]=> - long(40) refcount(2) + long(40) ["p2":"contains_object_class":private]=> - long(50) refcount(2) + long(50) ["class_object1"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } ["class_object2"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } ["class_object4":protected]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } ["no_member_class_object"]=> - object(no_member_class)#%d (0) refcount(3){ + object(no_member_class)#%d (0) refcount(%d){ } ["class_object5"]=> - object(contains_object_class)#%d (9) refcount(1){ + object(contains_object_class)#%d (9) refcount(%d){ ["p"]=> - long(30) refcount(2) + long(30) ["p1":protected]=> - long(40) refcount(2) + long(40) ["p2":"contains_object_class":private]=> - long(50) refcount(2) + long(50) ["class_object1"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } ["class_object2"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } ["class_object4":protected]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(7){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } ["no_member_class_object"]=> - object(no_member_class)#%d (0) refcount(3){ + object(no_member_class)#%d (0) refcount(%d){ } ["class_object5"]=> *RECURSION* } } -- Iteration 4 -- -object(object_class)#%d (6) refcount(9){ +object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(9){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } -- Iteration 5 -- -object(object_class)#%d (6) refcount(9){ +object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(9){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } -- Iteration 6 -- -object(no_member_class)#%d (0) refcount(5){ +object(no_member_class)#%d (0) refcount(%d){ } -- Iteration 7 -- -NULL refcount(1) +NULL -- Iteration 8 -- -object(object_class)#%d (6) refcount(9){ +object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(9){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } -- Iteration 9 -- -object(object_class)#%d (6) refcount(9){ +object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(9){ + object(object_class)#%d (6) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(5) + long(10) ["value3":protected]=> - long(20) refcount(5) + long(20) ["value4"]=> - long(30) refcount(7) + long(30) ["array_var"]=> - array(2) refcount(5){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* } } -- Iteration 10 -- -long(30) refcount(9) +long(30) -- Iteration 11 -- -NULL refcount(1) +NULL -- Testing debug_zval_dump() on overwritten object variables -- -long(500) refcount(1) -long(500) refcount(1) -long(500) refcount(1) -long(500) refcount(1) +long(500) +long(500) +long(500) +long(500) -- Testing debug_zval_dump() on objects having circular reference -- -object(object_class)#%d (7) refcount(1){ +object(object_class)#%d (7) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(7) + long(10) ["value3":protected]=> - long(20) refcount(7) + long(20) ["value4"]=> - long(30) refcount(8) + long(30) ["array_var"]=> - array(2) refcount(7){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (7) refcount(1){ + object(object_class)#%d (7) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(7) + long(10) ["value3":protected]=> - long(20) refcount(7) + long(20) ["value4"]=> - long(30) refcount(8) + long(30) ["array_var"]=> - array(2) refcount(7){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* ["obj"]=> - &object(object_class)#%d (7) refcount(2){ + &object(object_class)#%d (7) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(7) + long(10) ["value3":protected]=> - long(20) refcount(7) + long(20) ["value4"]=> - long(30) refcount(8) + long(30) ["array_var"]=> - array(2) refcount(7){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (7) refcount(1){ + object(object_class)#%d (7) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(7) + long(10) ["value3":protected]=> - long(20) refcount(7) + long(20) ["value4"]=> - long(30) refcount(8) + long(30) ["array_var"]=> - array(2) refcount(7){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* @@ -736,57 +736,57 @@ object(object_class)#%d (7) refcount(1){ } } ["obj"]=> - &object(object_class)#%d (7) refcount(2){ + &object(object_class)#%d (7) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(7) + long(10) ["value3":protected]=> - long(20) refcount(7) + long(20) ["value4"]=> - long(30) refcount(8) + long(30) ["array_var"]=> - array(2) refcount(7){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> - object(object_class)#%d (7) refcount(1){ + object(object_class)#%d (7) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(7) + long(10) ["value3":protected]=> - long(20) refcount(7) + long(20) ["value4"]=> - long(30) refcount(8) + long(30) ["array_var"]=> - array(2) refcount(7){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* ["obj"]=> - &object(object_class)#%d (7) refcount(2){ + &object(object_class)#%d (7) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(7) + long(10) ["value3":protected]=> - long(20) refcount(7) + long(20) ["value4"]=> - long(30) refcount(8) + long(30) ["array_var"]=> - array(2) refcount(7){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* @@ -795,40 +795,40 @@ object(object_class)#%d (7) refcount(1){ } } ["obj"]=> - &object(object_class)#%d (7) refcount(2){ + &object(object_class)#%d (7) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(7) + long(10) ["value3":protected]=> - long(20) refcount(7) + long(20) ["value4"]=> - long(30) refcount(8) + long(30) ["array_var"]=> - array(2) refcount(7){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* ["obj"]=> - &object(object_class)#%d (7) refcount(2){ + &object(object_class)#%d (7) refcount(%d){ ["value1"]=> - long(5) refcount(1) + long(5) ["value2":"object_class":private]=> - long(10) refcount(7) + long(10) ["value3":protected]=> - long(20) refcount(7) + long(20) ["value4"]=> - long(30) refcount(8) + long(30) ["array_var"]=> - array(2) refcount(7){ + array(2) refcount(%d){ ["key1"]=> - long(1) refcount(1) + long(1) ["key2 "]=> - long(3) refcount(1) + long(3) } ["object_class1"]=> *RECURSION* diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt index 82ee2a63d5..f4b768a77e 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt @@ -124,81 +124,81 @@ echo "Done\n"; --- Variation 1: global variable inside a function --- -- Value of global variable, before calling dump_globalvar() -- -long(10) refcount(2) +long(10) -- Value of local variable inside dump_globalvar() -- -long(10) refcount(1) +long(10) -- Value of global variable inside dump_globalvar() -- -long(10) refcount(1) +long(10) -- Value of global variable, after exiting dump_globalvar() -- -long(10) refcount(2) +long(10) --- Variation 2: one variable references another --- -- Value of $first_var: -- -long(10) refcount(2) +long(10) -- Value of $ref_first_var -- -NULL refcount(1) +NULL -- Value of $first_var -- -long(10) refcount(2) +long(10) -- Value of $ref_first_var -- Notice: Undefined variable: ref_first_var in %s on line %d -NULL refcount(1) +NULL -- Value of $first_var -- -long(10) refcount(2) +long(10) --- Variation 3: multiple references of variables --- -- Value of $var_1: (before referencing) -- -long(10) refcount(1) +long(10) -- Value of $var_2: (referencing var_1) -- -long(10) refcount(1) +long(10) -- Value of $var_3: (referencing var_2) -- -long(10) refcount(1) +long(10) -- Value of $var_3: (after unsetting var_3) -- Notice: Undefined variable: var_3 in %s on line %d -NULL refcount(1) +NULL -- Value of $var_2: -- -long(10) refcount(1) +long(10) -- Value of $var_3: -- -long(10) refcount(1) +long(10) -- Value of $var_1: (after unsetting variable_1) -- Notice: Undefined variable: var_1 in %s on line %d -NULL refcount(1) +NULL -- Value of $var_2: -- -long(10) refcount(2) +long(10) *** Testing debug_zval_dump() on miscelleneous input arguments *** -- Iteration 1 -- -NULL refcount(3) +NULL -- Iteration 2 -- -NULL refcount(3) +NULL -- Iteration 3 -- -NULL refcount(1) +NULL -- Iteration 4 -- -NULL refcount(1) +NULL -- Iteration 5 -- -string(7) "TRUE123" refcount(3) +string(7) "TRUE123" refcount(%d) -- Iteration 6 -- -string(9) "123string" refcount(3) +string(9) "123string" refcount(%d) -- Iteration 7 -- -string(9) "string123" refcount(3) +string(9) "string123" refcount(%d) -- Iteration 8 -- -string(10) "NULLstring" refcount(3) +string(10) "NULLstring" refcount(%d) Done diff --git a/ext/standard/tests/general_functions/ini_get_all.phpt b/ext/standard/tests/general_functions/ini_get_all.phpt index 60cd38a723..806831edfc 100644 --- a/ext/standard/tests/general_functions/ini_get_all.phpt +++ b/ext/standard/tests/general_functions/ini_get_all.phpt @@ -30,7 +30,7 @@ Warning: ini_get_all(): Unable to find extension 'nosuchextension' in %s on line bool(false) array(0) { } -array(2) { +array(3) { ["pcre.backtrack_limit"]=> array(3) { ["global_value"]=> @@ -40,6 +40,15 @@ array(2) { ["access"]=> int(7) } + ["pcre.jit"]=> + array(3) { + ["global_value"]=> + string(1) "1" + ["local_value"]=> + string(1) "1" + ["access"]=> + int(7) + } ["pcre.recursion_limit"]=> array(3) { ["global_value"]=> @@ -50,9 +59,11 @@ array(2) { int(7) } } -array(2) { +array(3) { ["pcre.backtrack_limit"]=> string(7) "1000000" + ["pcre.jit"]=> + string(1) "1" ["pcre.recursion_limit"]=> string(6) "100000" } diff --git a/ext/standard/tests/streams/bug54623.phpt b/ext/standard/tests/streams/bug54623.phpt index 43bcb09a42..c21dc82019 100644 --- a/ext/standard/tests/streams/bug54623.phpt +++ b/ext/standard/tests/streams/bug54623.phpt @@ -14,4 +14,4 @@ fwrite($sock, "3"); int(%d) int(%d) -Warning: fwrite(): %d is not a valid stream resource in %s on line %d +Warning: fwrite(): supplied resource is not a valid stream resource in %s on line %d diff --git a/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt b/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt index 390694a062..c2532c714a 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt @@ -52,6 +52,6 @@ NULL -- Testing stream_get_meta_data() function with closed stream resource -- -Warning: stream_get_meta_data(): %i is not a valid stream resource in %s on line %i +Warning: stream_get_meta_data(): supplied resource is not a valid stream resource in %s on line %i bool(false) Done diff --git a/ext/standard/tests/streams/stream_set_timeout_error.phpt b/ext/standard/tests/streams/stream_set_timeout_error.phpt index 814257dd93..b40b6616cf 100644 --- a/ext/standard/tests/streams/stream_set_timeout_error.phpt +++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt @@ -67,7 +67,7 @@ NULL -- Testing stream_set_timeout() function with a closed socket -- -Warning: stream_set_timeout(): %i is not a valid stream resource in %s on line %i +Warning: stream_set_timeout(): supplied resource is not a valid stream resource in %s on line %i bool(false) -- Testing stream_set_timeout() function with an invalid stream -- diff --git a/ext/standard/tests/strings/str_pad_variation5.phpt b/ext/standard/tests/strings/str_pad_variation5.phpt index cd979a1c8b..d050ae80e8 100644 --- a/ext/standard/tests/strings/str_pad_variation5.phpt +++ b/ext/standard/tests/strings/str_pad_variation5.phpt @@ -24,7 +24,7 @@ echo "*** Testing str_pad() function: with large value for for 'pad_length' argu //defining '$input' argument $input = "Test string"; -$pad_length = PHP_INT_MAX; +$pad_length = PHP_INT_MAX - 16; /* zend_string header is 16 bytes */ var_dump( str_pad($input, $pad_length) ); ?> |