diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-16 22:31:13 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-16 22:31:13 +0200 |
| commit | 904a83a137bd52e0b8da29df8b5500c88a9f6a9f (patch) | |
| tree | 6c9990f4de3f744553c827eec6869aa6df8679c9 /tests | |
| parent | ee3d28ed331593c532c812a11e2b3b18574bf176 (diff) | |
| parent | d790eceb01009489358c3781c94ebea3b3400f67 (diff) | |
| download | php-git-904a83a137bd52e0b8da29df8b5500c88a9f6a9f.tar.gz | |
Merge remote-tracking branch 'php-src/master' into ast
Conflicts:
ext/opcache/Optimizer/optimize_func_calls.c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lang/func_get_arg.001.phpt | 4 | ||||
| -rw-r--r-- | tests/lang/func_get_args.004.phpt | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/lang/func_get_arg.001.phpt b/tests/lang/func_get_arg.001.phpt index b1bbb18699..00315b0ee0 100644 --- a/tests/lang/func_get_arg.001.phpt +++ b/tests/lang/func_get_arg.001.phpt @@ -1,5 +1,5 @@ --TEST-- -func_get_arg test +func_get_arg test (PHP7) --FILE-- <?php @@ -12,4 +12,4 @@ foo(2); echo "\n"; ?> --EXPECT-- -2
\ No newline at end of file +5
\ No newline at end of file diff --git a/tests/lang/func_get_args.004.phpt b/tests/lang/func_get_args.004.phpt index 84e3ebe5a2..384d99a818 100644 --- a/tests/lang/func_get_args.004.phpt +++ b/tests/lang/func_get_args.004.phpt @@ -1,5 +1,5 @@ --TEST-- -Pass same variable by ref and by value. +Pass same variable by ref and by value (PHP7). --FILE-- <?php function valRef($x, &$y) { @@ -42,7 +42,7 @@ array(2) { } array(2) { [0]=> - string(10) "original.a" + string(9) "changed.x" [1]=> string(9) "changed.y" } @@ -62,6 +62,6 @@ array(2) { [0]=> string(9) "changed.x" [1]=> - string(10) "original.b" + string(9) "changed.y" } -string(9) "changed.x"
\ No newline at end of file +string(9) "changed.x" |