Skip to content

Commit 3166eb4

Browse files
NickSdotNickSdot
committed
Zend: applied fixers to improve test robustness (part 5/8)
1 parent 98a259e commit 3166eb4

86 files changed

Lines changed: 394 additions & 394 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Zend/tests/named_params/cannot_pass_by_ref.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function test($a, &$e) {}
66
try {
77
test(e: 42);
88
} catch (Error $e) {
9-
echo $e->getMessage(), "\n";
9+
echo $e::class, ': ', $e->getMessage(), "\n";
1010
}
1111
?>
1212
--EXPECT--
13-
test(): Argument #2 ($e) could not be passed by reference
13+
Error: test(): Argument #2 ($e) could not be passed by reference

‎Zend/tests/named_params/ctor_extra_named_args.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ class Test {}
88
try {
99
new stdClass(x: "nope");
1010
} catch (Error $e) {
11-
echo $e->getMessage(), "\n";
11+
echo $e::class, ': ', $e->getMessage(), "\n";
1212
}
1313

1414
try {
1515
new Test(x: "nope");
1616
} catch (Error $e) {
17-
echo $e->getMessage(), "\n";
17+
echo $e::class, ': ', $e->getMessage(), "\n";
1818
}
1919

2020
?>
2121
--EXPECT--
22-
Unknown named parameter $x
23-
Unknown named parameter $x
22+
Error: Unknown named parameter $x
23+
Error: Unknown named parameter $x

‎Zend/tests/named_params/duplicate_param.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ function test($a) {}
88
try {
99
test(a: 1, a: 2);
1010
} catch (Error $e) {
11-
echo $e->getMessage(), "\n";
11+
echo $e::class, ': ', $e->getMessage(), "\n";
1212
}
1313

1414
try {
1515
test(1, a: 2);
1616
} catch (Error $e) {
17-
echo $e->getMessage(), "\n";
17+
echo $e::class, ': ', $e->getMessage(), "\n";
1818
}
1919

2020
?>
2121
--EXPECT--
22-
Named parameter $a overwrites previous argument
23-
Named parameter $a overwrites previous argument
22+
Error: Named parameter $a overwrites previous argument
23+
Error: Named parameter $a overwrites previous argument

‎Zend/tests/named_params/gh17216.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ $array = ["a" => "b", 1];
1313
try {
1414
forward_static_call_array($callback, $array);
1515
} catch (Error $e) {
16-
echo $e->getMessage(), "\n";
16+
echo $e::class, ': ', $e->getMessage(), "\n";
1717
}
1818
echo "Done\n";
1919
?>
2020
--EXPECT--
21-
Cannot use positional argument after named argument
21+
Error: Cannot use positional argument after named argument
2222
Done

‎Zend/tests/named_params/missing_param.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@ function test($a, $b, $c, $d) {
99
try {
1010
test(a: 'a', d: 'd');
1111
} catch (ArgumentCountError $e) {
12-
echo $e->getMessage(), "\n";
12+
echo $e::class, ': ', $e->getMessage(), "\n";
1313
}
1414

1515
try {
1616
array_keys(strict: true);
1717
} catch (ArgumentCountError $e) {
18-
echo $e->getMessage(), "\n";
18+
echo $e::class, ': ', $e->getMessage(), "\n";
1919
}
2020

2121
try {
2222
array_keys([], strict: true);
2323
} catch (ArgumentCountError $e) {
24-
echo $e->getMessage(), "\n";
24+
echo $e::class, ': ', $e->getMessage(), "\n";
2525
}
2626

2727
// This works fine, as search_value is explicitly specified.
2828
var_dump(array_keys([41, 42], filter_value: 42, strict: true));
2929

3030
?>
3131
--EXPECT--
32-
test(): Argument #2 ($b) not passed
33-
array_keys(): Argument #1 ($array) not passed
34-
array_keys(): Argument #2 ($filter_value) must be passed explicitly, because the default value is not known
32+
ArgumentCountError: test(): Argument #2 ($b) not passed
33+
ArgumentCountError: array_keys(): Argument #1 ($array) not passed
34+
ArgumentCountError: array_keys(): Argument #2 ($filter_value) must be passed explicitly, because the default value is not known
3535
array(1) {
3636
[0]=>
3737
int(1)

‎Zend/tests/named_params/unknown_named_param.phpt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,36 @@ function test2(...$a) {
1212
try {
1313
test(b: 42);
1414
} catch (Error $e) {
15-
echo $e->getMessage(), "\n";
15+
echo $e::class, ': ', $e->getMessage(), "\n";
1616
}
1717

1818
try {
1919
test(b: new stdClass);
2020
} catch (Error $e) {
21-
echo $e->getMessage(), "\n";
21+
echo $e::class, ': ', $e->getMessage(), "\n";
2222
}
2323

2424
try {
2525
test(b: 2, a: 1);
2626
} catch (Error $e) {
27-
echo $e->getMessage(), "\n";
27+
echo $e::class, ': ', $e->getMessage(), "\n";
2828
}
2929

3030
try {
3131
test(...new ArrayIterator(['unknown' => 42]));
3232
} catch (Error $e) {
33-
echo $e->getMessage(), "\n";
33+
echo $e::class, ': ', $e->getMessage(), "\n";
3434
}
3535

3636
try {
3737
test2(a: 42);
3838
} catch (Error $e) {
39-
echo $e->getMessage(), "\n";
39+
echo $e::class, ': ', $e->getMessage(), "\n";
4040
}
4141

4242
?>
4343
--EXPECT--
44-
Unknown named parameter $b
45-
Unknown named parameter $b
46-
Unknown named parameter $b
47-
Unknown named parameter $unknown
44+
Error: Unknown named parameter $b
45+
Error: Unknown named parameter $b
46+
Error: Unknown named parameter $b
47+
Error: Unknown named parameter $unknown

‎Zend/tests/named_params/unpack.phpt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ test(...['a', 'b' => 'b', 'c' => 'c']);
1818
try {
1919
test(...['a', 'b' => 'b', 'c']);
2020
} catch (Error $e) {
21-
echo $e->getMessage(), "\n";
21+
echo $e::class, ': ', $e->getMessage(), "\n";
2222
}
2323

2424
try {
2525
test(...['a', 'a' => 'a']);
2626
} catch (Error $e) {
27-
echo $e->getMessage(), "\n";
27+
echo $e::class, ': ', $e->getMessage(), "\n";
2828
}
2929

3030
$ary = ['b' => 0];
@@ -39,13 +39,13 @@ test(...new ArrayIterator(['a', 'b' => 'b', 'c' => 'c']));
3939
try {
4040
test(...new ArrayIterator(['a', 'b' => 'b', 'c']));
4141
} catch (Error $e) {
42-
echo $e->getMessage(), "\n";
42+
echo $e::class, ': ', $e->getMessage(), "\n";
4343
}
4444

4545
try {
4646
test(...new ArrayIterator(['a', 'a' => 'a']));
4747
} catch (Error $e) {
48-
echo $e->getMessage(), "\n";
48+
echo $e::class, ': ', $e->getMessage(), "\n";
4949
}
5050

5151
$ary = ['b' => 0];
@@ -58,8 +58,8 @@ var_dump($ary, $ary2);
5858
a = a, b = b, c = c
5959
a = a, b = b, c = c
6060
a = a, b = b, c = c
61-
Cannot use positional argument after named argument during unpacking
62-
Named parameter $a overwrites previous argument
61+
Error: Cannot use positional argument after named argument during unpacking
62+
Error: Named parameter $a overwrites previous argument
6363
array(1) {
6464
["b"]=>
6565
int(1)
@@ -71,8 +71,8 @@ array(1) {
7171
a = a, b = b, c = c
7272
a = a, b = b, c = c
7373
a = a, b = b, c = c
74-
Cannot use positional argument after named argument during unpacking
75-
Named parameter $a overwrites previous argument
74+
Error: Cannot use positional argument after named argument during unpacking
75+
Error: Named parameter $a overwrites previous argument
7676

7777
Warning: Cannot pass by-reference argument 2 of test2() by unpacking a Traversable, passing by-value instead in %s on line %d
7878
array(1) {

‎Zend/tests/named_params/unpack_and_named_1.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ test2(...['b' => 2, 'a' => 1], d: 40);
2020
try {
2121
test2(...[1, 2], b: 20);
2222
} catch (Error $e) {
23-
echo $e->getMessage(), "\n";
23+
echo $e::class, ': ', $e->getMessage(), "\n";
2424
}
2525
try {
2626
test2(...[1, 'b' => 2], b: 20);
2727
} catch (Error $e) {
28-
echo $e->getMessage(), "\n";
28+
echo $e::class, ': ', $e->getMessage(), "\n";
2929
}
3030

3131
?>
@@ -54,5 +54,5 @@ int(1)
5454
int(2)
5555
int(3)
5656
int(40)
57-
Named parameter $b overwrites previous argument
58-
Named parameter $b overwrites previous argument
57+
Error: Named parameter $b overwrites previous argument
58+
Error: Named parameter $b overwrites previous argument

‎Zend/tests/namespaces/ns_076.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ use Error;
88
try {
99
$a = array(unknown => unknown);
1010
} catch (Error $e) {
11-
echo $e->getMessage(), "\n";
11+
echo $e::class, ': ', $e->getMessage(), "\n";
1212
}
1313

1414
try {
1515
echo unknown;
1616
} catch (Error $e) {
17-
echo $e->getMessage(), "\n";
17+
echo $e::class, ': ', $e->getMessage(), "\n";
1818
}
1919

2020
try {
2121
echo \unknown;
2222
} catch (Error $e) {
23-
echo $e->getMessage(), "\n";
23+
echo $e::class, ': ', $e->getMessage(), "\n";
2424
}
2525

2626
?>
2727
--EXPECT--
28-
Undefined constant "foo\unknown"
29-
Undefined constant "foo\unknown"
30-
Undefined constant "unknown"
28+
Error: Undefined constant "foo\unknown"
29+
Error: Undefined constant "foo\unknown"
30+
Error: Undefined constant "unknown"

‎Zend/tests/not_002.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $b = array(1,2);
99
try {
1010
var_dump(~$b);
1111
} catch (Error $e) {
12-
echo "\nException: " . $e->getMessage() . "\n";
12+
echo $e::class, ': ', $e->getMessage(), "\n";
1313
}
1414

1515
$a = ~$b;
@@ -18,7 +18,7 @@ var_dump($a);
1818
echo "Done\n";
1919
?>
2020
--EXPECTF--
21-
Exception: Cannot perform bitwise not on array
21+
TypeError: Cannot perform bitwise not on array
2222

2323
Fatal error: Uncaught TypeError: Cannot perform bitwise not on array in %s:%d
2424
Stack trace:

0 commit comments

Comments
 (0)