Skip to content

Commit f89fe1f

Browse files
NickSdotNickSdot
committed
tests: applied fixers to improve test robustness
1 parent 7213ed7 commit f89fe1f

55 files changed

Lines changed: 601 additions & 610 deletions

Some content is hidden

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

‎tests/basic/GHSA-9pqp-7h25-4f32.phpt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,3 @@ Content-type: text/html; charset=UTF-8
100100
Hello world
101101
array(0) {
102102
}
103-

‎tests/classes/abstract_user_call.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ $o->func();
2323
try {
2424
call_user_func(array($o, 'test_base::func'));
2525
} catch (TypeError $e) {
26-
echo $e->getMessage(), "\n";
26+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
2727
}
2828

2929
?>
3030
--EXPECTF--
3131
test::func()
3232

3333
Deprecated: Callables of the form ["test", "test_base::func"] are deprecated in %s on line %d
34-
call_user_func(): Argument #1 ($callback) must be a valid callback, cannot call abstract method test_base::func()
34+
TypeError: call_user_func(): Argument #1 ($callback) must be a valid callback, cannot call abstract method test_base::func()

‎tests/classes/array_access_013.phpt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ try
1919
}
2020
catch(Exception $e)
2121
{
22-
echo "Caught in " . $e->getMessage() . "()\n";
22+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
2323
}
2424

2525
try
@@ -28,7 +28,7 @@ try
2828
}
2929
catch(Exception $e)
3030
{
31-
echo "Caught in " . $e->getMessage() . "()\n";
31+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
3232
}
3333

3434
try
@@ -37,7 +37,7 @@ try
3737
}
3838
catch(Exception $e)
3939
{
40-
echo "Caught in " . $e->getMessage() . "()\n";
40+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
4141
}
4242

4343
try
@@ -46,11 +46,11 @@ try
4646
}
4747
catch(Exception $e)
4848
{
49-
echo "Caught in " . $e->getMessage() . "()\n";
49+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
5050
}
5151
?>
5252
--EXPECT--
53-
Caught in Test::offsetExists()
54-
Caught in Test::offsetGet()
55-
Caught in Test::offsetSet()
56-
Caught in Test::offsetUnset()
53+
Exception: Test::offsetExists
54+
Exception: Test::offsetGet
55+
Exception: Test::offsetSet
56+
Exception: Test::offsetUnset

‎tests/classes/autoload_012.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ spl_autoload_register(function ($name) {
99
try {
1010
call_user_func("UndefC::test");
1111
} catch (TypeError $e) {
12-
echo $e->getMessage(), "\n";
12+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1313
}
1414
?>
1515
--EXPECT--
1616
In autoload: string(6) "UndefC"
17-
call_user_func(): Argument #1 ($callback) must be a valid callback, class "UndefC" not found
17+
TypeError: call_user_func(): Argument #1 ($callback) must be a valid callback, class "UndefC" not found

‎tests/classes/autoload_013.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ try {
1111
new ReflectionClass("UndefC");
1212
}
1313
catch (ReflectionException $e) {
14-
echo $e->getMessage();
14+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1515
}
1616
?>
1717
--EXPECT--
1818
In autoload: string(6) "UndefC"
19-
Class "UndefC" does not exist
19+
ReflectionException: Class "UndefC" does not exist

‎tests/classes/autoload_014.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ try {
1111
new ReflectionMethod("UndefC", "test");
1212
}
1313
catch (ReflectionException $e) {
14-
echo $e->getMessage();
14+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1515
}
1616
?>
1717
--EXPECT--
1818
In autoload: string(6) "UndefC"
19-
Class "UndefC" does not exist
19+
ReflectionException: Class "UndefC" does not exist

‎tests/classes/autoload_015.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ try {
1111
new ReflectionProperty('UndefC', 'p');
1212
}
1313
catch (ReflectionException $e) {
14-
echo $e->getMessage();
14+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1515
}
1616
?>
1717
--EXPECT--
1818
In autoload: string(6) "UndefC"
19-
Class "UndefC" does not exist
19+
ReflectionException: Class "UndefC" does not exist

‎tests/classes/autoload_016.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ $rc = new ReflectionClass("stdClass");
1212
try {
1313
$rc->getProperty("UndefC::p");
1414
} catch (ReflectionException $e) {
15-
echo $e->getMessage();
15+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1616
}
1717
?>
1818
--EXPECT--
1919
In autoload: string(6) "UndefC"
20-
Class "UndefC" does not exist
20+
ReflectionException: Class "UndefC" does not exist

‎tests/classes/autoload_017.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ $rc = new ReflectionClass("stdClass");
1212
try {
1313
$rc->implementsInterface("UndefI");
1414
} catch (ReflectionException $e) {
15-
echo $e->getMessage();
15+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1616
}
1717
?>
1818
--EXPECT--
1919
In autoload: string(6) "UndefI"
20-
Interface "UndefI" does not exist
20+
ReflectionException: Interface "UndefI" does not exist

‎tests/classes/bug27504.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ $foo = new foo();
1616
try {
1717
call_user_func_array( array( $foo , 'bar' ) , array( '2' ) );
1818
} catch (TypeError $e) {
19-
echo $e->getMessage(), "\n";
19+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
2020
}
2121
try {
2222
$foo->bar('3');
2323
} catch (Error $e) {
24-
echo $e->getMessage(), "\n";
24+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
2525
}
2626

2727
?>
2828
--EXPECT--
2929
Called function foo:bar(1)
30-
call_user_func_array(): Argument #1 ($callback) must be a valid callback, cannot access private method foo::bar()
31-
Call to private method foo::bar() from global scope
30+
TypeError: call_user_func_array(): Argument #1 ($callback) must be a valid callback, cannot access private method foo::bar()
31+
Error: Call to private method foo::bar() from global scope

0 commit comments

Comments
 (0)