Skip to content

Commit 640b005

Browse files
NickSdotNickSdot
committed
Zend: applied fixers to improve test robustness (part 3/8)
1 parent a183f11 commit 640b005

86 files changed

Lines changed: 552 additions & 575 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/dynamic_call/bug77877.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ class Foo {
1010
try {
1111
array_map([new Foo, 'bar'],[1]);
1212
} catch (Throwable $e) {
13-
echo $e->getMessage() . "\n";
13+
echo $e::class, ': ', $e->getMessage(), "\n";
1414
}
1515
try {
1616
call_user_func([new Foo, 'bar']);
1717
} catch (Throwable $e) {
18-
echo $e->getMessage() . "\n";
18+
echo $e::class, ': ', $e->getMessage(), "\n";
1919
}
2020
?>
2121
--EXPECT--
22-
Using $this when not in object context
23-
Using $this when not in object context
22+
Error: Using $this when not in object context
23+
Error: Using $this when not in object context

‎Zend/tests/dynamic_call/dynamic_call_005.phpt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@ function test_calls($func) {
99
try {
1010
array_map($func, [['i' => new stdClass]]);
1111
var_dump($i);
12-
} catch (\Error $e) {
13-
echo $e->getMessage() . "\n";
12+
} catch (\Throwable $e) {
13+
echo $e::class, ': ', $e->getMessage(), "\n";
1414
}
1515

1616
try {
1717
$func(['i' => new stdClass]);
1818
var_dump($i);
19-
} catch (\Error $e) {
20-
echo $e->getMessage() . "\n";
19+
} catch (\Throwable $e) {
20+
echo $e::class, ': ', $e->getMessage(), "\n";
2121
}
2222

2323
try {
2424
call_user_func($func, ['i' => new stdClass]);
2525
var_dump($i);
26-
} catch (\Error $e) {
27-
echo $e->getMessage() . "\n";
26+
} catch (\Throwable $e) {
27+
echo $e::class, ': ', $e->getMessage(), "\n";
2828
}
2929
}
3030
test_calls('extract');
3131

3232
?>
3333
--EXPECT--
34-
Cannot call extract() dynamically
35-
Cannot call extract() dynamically
36-
Cannot call extract() dynamically
34+
Error: Cannot call extract() dynamically
35+
Error: Cannot call extract() dynamically
36+
Error: Cannot call extract() dynamically

‎Zend/tests/dynamic_call/dynamic_call_006.phpt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,52 @@ function test() {
77
try {
88
$func = 'extract';
99
$func(['a' => 'b']);
10-
} catch (\Error $e) {
11-
echo $e->getMessage() . "\n";
10+
} catch (\Throwable $e) {
11+
echo $e::class, ': ', $e->getMessage(), "\n";
1212
}
1313

1414
try {
1515
$func = 'compact';
1616
$func(['a']);
17-
} catch (\Error $e) {
18-
echo $e->getMessage() . "\n";
17+
} catch (\Throwable $e) {
18+
echo $e::class, ': ', $e->getMessage(), "\n";
1919
}
2020

2121
try {
2222
$func = 'get_defined_vars';
2323
$func();
24-
} catch (\Error $e) {
25-
echo $e->getMessage() . "\n";
24+
} catch (\Throwable $e) {
25+
echo $e::class, ': ', $e->getMessage(), "\n";
2626
}
2727

2828
try {
2929
$func = 'func_get_args';
3030
$func();
31-
} catch (\Error $e) {
32-
echo $e->getMessage() . "\n";
31+
} catch (\Throwable $e) {
32+
echo $e::class, ': ', $e->getMessage(), "\n";
3333
}
3434

3535
try {
3636
$func = 'func_get_arg';
3737
$func(1);
38-
} catch (\Error $e) {
39-
echo $e->getMessage() . "\n";
38+
} catch (\Throwable $e) {
39+
echo $e::class, ': ', $e->getMessage(), "\n";
4040
}
4141

4242
try {
4343
$func = 'func_num_args';
4444
$func();
45-
} catch (\Error $e) {
46-
echo $e->getMessage() . "\n";
45+
} catch (\Throwable $e) {
46+
echo $e::class, ': ', $e->getMessage(), "\n";
4747
}
4848
}
4949
test();
5050

5151
?>
5252
--EXPECT--
53-
Cannot call extract() dynamically
54-
Cannot call compact() dynamically
55-
Cannot call get_defined_vars() dynamically
56-
Cannot call func_get_args() dynamically
57-
Cannot call func_get_arg() dynamically
58-
Cannot call func_num_args() dynamically
53+
Error: Cannot call extract() dynamically
54+
Error: Cannot call compact() dynamically
55+
Error: Cannot call get_defined_vars() dynamically
56+
Error: Cannot call func_get_args() dynamically
57+
Error: Cannot call func_get_arg() dynamically
58+
Error: Cannot call func_num_args() dynamically

‎Zend/tests/dynamic_call/dynamic_call_007.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ function test() {
77
$i = 1;
88
try {
99
array_map('extract', [['i' => new stdClass]]);
10-
} catch (\Error $e) {
11-
echo $e->getMessage() . "\n";
10+
} catch (\Throwable $e) {
11+
echo $e::class, ': ', $e->getMessage(), "\n";
1212
}
1313
$i += 1;
1414
var_dump($i);
@@ -17,5 +17,5 @@ test();
1717

1818
?>
1919
--EXPECT--
20-
Cannot call extract() dynamically
20+
Error: Cannot call extract() dynamically
2121
int(2)

‎Zend/tests/dynamic_call/dynamic_call_008.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ Don't optimize dynamic call to non-dynamic one if it drops the warning
66
function test() {
77
try {
88
((string) 'extract')(['a' => 42]);
9-
} catch (\Error $e) {
10-
echo $e->getMessage() . "\n";
9+
} catch (\Throwable $e) {
10+
echo $e::class, ': ', $e->getMessage(), "\n";
1111
}
1212
}
1313
test();
1414

1515
?>
1616
--EXPECT--
17-
Cannot call extract() dynamically
17+
Error: Cannot call extract() dynamically

‎Zend/tests/dynamic_call/dynamic_call_freeing.phpt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ Freeing of function "name" when dynamic call fails
66
try {
77
$bar = "bar";
88
("foo" . $bar)();
9-
} catch (Error $e) {
10-
echo $e->getMessage(), "\n";
9+
} catch (Throwable $e) {
10+
echo $e::class, ': ', $e->getMessage(), "\n";
1111
}
1212
try {
1313
$bar = ["bar"];
1414
(["foo"] + $bar)();
15-
} catch (Error $e) {
16-
echo $e->getMessage(), "\n";
15+
} catch (Throwable $e) {
16+
echo $e::class, ': ', $e->getMessage(), "\n";
1717
}
1818
try {
1919
(new stdClass)();
20-
} catch (Error $e) {
21-
echo $e->getMessage(), "\n";
20+
} catch (Throwable $e) {
21+
echo $e::class, ': ', $e->getMessage(), "\n";
2222
}
2323

2424
?>
2525
--EXPECT--
26-
Call to undefined function foobar()
27-
Array callback must have exactly two elements
28-
Object of type stdClass is not callable
26+
Error: Call to undefined function foobar()
27+
Error: Array callback must have exactly two elements
28+
Error: Object of type stdClass is not callable

‎Zend/tests/dynamic_call/dynamic_call_non_static.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ class Foo {
1616
$x = new Foo;
1717
try {
1818
$x->test1();
19-
} catch (Error $e) {
20-
echo $e->getMessage(), "\n";
19+
} catch (Throwable $e) {
20+
echo $e::class, ': ', $e->getMessage(), "\n";
2121
}
2222
try {
2323
$x->test2();
24-
} catch (Error $e) {
25-
echo $e->getMessage(), "\n";
24+
} catch (Throwable $e) {
25+
echo $e::class, ': ', $e->getMessage(), "\n";
2626
}
2727
?>
2828
--EXPECT--
29-
Non-static method Foo::bar() cannot be called statically
30-
Non-static method Foo::bar() cannot be called statically
29+
Error: Non-static method Foo::bar() cannot be called statically
30+
Error: Non-static method Foo::bar() cannot be called statically

‎Zend/tests/dynamic_call/dynamic_fully_qualified_call.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Crash when using dynamic call syntax with fully qualified name in a namespace
66
namespace Foo;
77
try {
88
('\bar')();
9-
} catch (\Error $e) {
10-
echo $e->getMessage(), "\n";
9+
} catch (\Throwable $e) {
10+
echo $e::class, ': ', $e->getMessage(), "\n";
1111
}
1212

1313
?>
1414
--EXPECT--
15-
Call to undefined function bar()
15+
Error: Call to undefined function bar()

‎Zend/tests/dynamic_prop_deprecation_002.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ $a = new class{};
1010
try {
1111
[&$a->y];
1212
} catch (Throwable $ex) {
13-
echo "Exception: " .$ex->getMessage() . "\n";
13+
echo $ex::class, ': ', $ex->getMessage(), "\n";
1414
}
1515
?>
1616
--EXPECT--
1717
Err: Creation of dynamic property class@anonymous::$y is deprecated
18-
Exception: Cannot create dynamic property class@anonymous::$y
18+
Error: Cannot create dynamic property class@anonymous::$y

‎Zend/tests/enum/ast-dumper.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ try {
2222

2323
return false;
2424
})());
25-
} catch (Error $e) {
26-
echo $e->getMessage();
25+
} catch (Throwable $e) {
26+
echo $e::class, ': ', $e->getMessage(), "\n";
2727
}
2828

2929
?>
3030
--EXPECT--
31-
assert((function () {
31+
AssertionError: assert((function () {
3232
enum Foo {
3333
case Bar;
3434
}

0 commit comments

Comments
 (0)