Skip to content

Commit b1bae98

Browse files
NickSdotNickSdot
committed
ext/ffi: applied fixers to improve test robustness
1 parent ba43f3c commit b1bae98

30 files changed

Lines changed: 103 additions & 102 deletions

‎ext/ffi/tests/003.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ var_dump($ffi->new("d"));
3232
try {
3333
var_dump($ffi->new("struct _e"));
3434
} catch (Throwable $e) {
35-
echo get_class($e) . ": " . $e->getMessage()."\n";
35+
echo $e::class, ': ', $e->getMessage(), "\n";
3636
}
3737
try {
3838
var_dump($ffi->new("f"));
3939
} catch (Throwable $e) {
40-
echo get_class($e) . ": " . $e->getMessage()."\n";
40+
echo $e::class, ': ', $e->getMessage(), "\n";
4141
}
4242
echo "ok\n";
4343
?>

‎ext/ffi/tests/004.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ var_dump($ffi->new("int[_c4]"));
4242
try {
4343
var_dump($ffi->new("enum _e"));
4444
} catch (Throwable $e) {
45-
echo get_class($e) . ": " . $e->getMessage()."\n";
45+
echo $e::class, ': ', $e->getMessage(), "\n";
4646
}
4747
try {
4848
var_dump($ffi->new("f"));
4949
} catch (Throwable $e) {
50-
echo get_class($e) . ": " . $e->getMessage()."\n";
50+
echo $e::class, ': ', $e->getMessage(), "\n";
5151
}
5252
echo "ok\n";
5353
?>

‎ext/ffi/tests/008.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ $a = $ffi->new("struct {int x,y;}");
2020
try {
2121
var_dump(count($a));
2222
} catch (Throwable $e) {
23-
echo get_class($e) . ": " . $e->getMessage()."\n";
23+
echo $e::class, ': ', $e->getMessage(), "\n";
2424
}
2525

2626
try {
2727
foreach ($a as $key => $val) {
2828
echo "$key => $val\n";
2929
}
3030
} catch (Throwable $e) {
31-
echo get_class($e) . ": " . $e->getMessage()."\n";
31+
echo $e::class, ': ', $e->getMessage(), "\n";
3232
}
3333
?>
3434
--EXPECT--

‎ext/ffi/tests/010.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ FFI::memset($a, ord("a"), FFI::sizeof($a));
1111
var_dump(FFI::string($a, FFI::sizeof($a)));
1212
?>
1313
--EXPECT--
14-
string(12) "aaaaaaaaaaaa"
14+
string(12) "aaaaaaaaaaaa"

‎ext/ffi/tests/012.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ffi.enable=1
99
try {
1010
var_dump(serialize(FFI::cdef()->new("int[2]")));
1111
} catch (Throwable $e) {
12-
echo get_class($e) . ": " . $e->getMessage()."\n";
12+
echo $e::class, ': ', $e->getMessage(), "\n";
1313
}
1414
?>
1515
--EXPECT--

‎ext/ffi/tests/013.phpt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,43 +16,43 @@ var_dump(count($a[0][0]));
1616
try {
1717
var_dump($ffi->new("void"));
1818
} catch (Throwable $e) {
19-
echo get_class($e) . ": " . $e->getMessage()."\n";
19+
echo $e::class, ': ', $e->getMessage(), "\n";
2020
}
2121

2222
try {
2323
var_dump($ffi->new("void[1]"));
2424
} catch (Throwable $e) {
25-
echo get_class($e) . ": " . $e->getMessage()."\n";
25+
echo $e::class, ': ', $e->getMessage(), "\n";
2626
}
2727
try {
2828
FFI::cdef("static int foo(int)[5];");
2929
echo "ok\n";
3030
} catch (Throwable $e) {
31-
echo get_class($e) . ": " . $e->getMessage()."\n";
31+
echo $e::class, ': ', $e->getMessage(), "\n";
3232
}
3333
try {
3434
FFI::cdef("static int foo[5](int);");
3535
echo "ok\n";
3636
} catch (Throwable $e) {
37-
echo get_class($e) . ": " . $e->getMessage()."\n";
37+
echo $e::class, ': ', $e->getMessage(), "\n";
3838
}
3939
try {
4040
FFI::cdef("static int foo(int)(int);");
4141
echo "ok\n";
4242
} catch (Throwable $e) {
43-
echo get_class($e) . ": " . $e->getMessage()."\n";
43+
echo $e::class, ': ', $e->getMessage(), "\n";
4444
}
4545
try {
4646
FFI::cdef("typedef int foo[2][];");
4747
echo "ok\n";
4848
} catch (Throwable $e) {
49-
echo get_class($e) . ": " . $e->getMessage()."\n";
49+
echo $e::class, ': ', $e->getMessage(), "\n";
5050
}
5151
try {
5252
FFI::cdef("typedef int foo[][2];");
5353
echo "ok\n";
5454
} catch (Throwable $e) {
55-
echo get_class($e) . ": " . $e->getMessage()."\n";
55+
echo $e::class, ': ', $e->getMessage(), "\n";
5656
}
5757
?>
5858
--EXPECT--

‎ext/ffi/tests/014.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ok
1717
int(8)
1818
int(8)
1919
int(16)
20-
ok
20+
ok

‎ext/ffi/tests/015.phpt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,49 @@ try {
1010
FFI::cdef("struct DIR; static struct DIR dir;");
1111
echo "ok\n";
1212
} catch (Throwable $e) {
13-
echo get_class($e) . ": " . $e->getMessage()."\n";
13+
echo $e::class, ': ', $e->getMessage(), "\n";
1414
}
1515
try {
1616
FFI::cdef("struct DIR; static struct DIR *ptr;");
1717
echo "ok\n";
1818
} catch (Throwable $e) {
19-
echo get_class($e) . ": " . $e->getMessage()."\n";
19+
echo $e::class, ': ', $e->getMessage(), "\n";
2020
}
2121
try {
2222
FFI::cdef("struct DIR; typedef struct DIR DIR; static DIR dir;");
2323
echo "ok\n";
2424
} catch (Throwable $e) {
25-
echo get_class($e) . ": " . $e->getMessage()."\n";
25+
echo $e::class, ': ', $e->getMessage(), "\n";
2626
}
2727
try {
2828
FFI::cdef("struct DIR; typedef struct DIR DIR; static DIR *ptr;");
2929
echo "ok\n";
3030
} catch (Throwable $e) {
31-
echo get_class($e) . ": " . $e->getMessage()."\n";
31+
echo $e::class, ': ', $e->getMessage(), "\n";
3232
}
3333
try {
3434
FFI::cdef("struct DIR; static struct DIR foo();");
3535
echo "ok\n";
3636
} catch (Throwable $e) {
37-
echo get_class($e) . ": " . $e->getMessage()."\n";
37+
echo $e::class, ': ', $e->getMessage(), "\n";
3838
}
3939
try {
4040
FFI::cdef("struct DIR; static struct DIR* foo();");
4141
echo "ok\n";
4242
} catch (Throwable $e) {
43-
echo get_class($e) . ": " . $e->getMessage()."\n";
43+
echo $e::class, ': ', $e->getMessage(), "\n";
4444
}
4545
try {
4646
FFI::cdef("struct DIR; static void foo(struct DIR);");
4747
echo "ok\n";
4848
} catch (Throwable $e) {
49-
echo get_class($e) . ": " . $e->getMessage()."\n";
49+
echo $e::class, ': ', $e->getMessage(), "\n";
5050
}
5151
try {
5252
FFI::cdef("struct DIR; static void foo(struct DIR*);");
5353
echo "ok\n";
5454
} catch (Throwable $e) {
55-
echo get_class($e) . ": " . $e->getMessage()."\n";
55+
echo $e::class, ': ', $e->getMessage(), "\n";
5656
}
5757
?>
5858
ok

‎ext/ffi/tests/016.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ try {
1010
FFI::cdef("struct X {void x();};");
1111
echo "ok\n";
1212
} catch (Throwable $e) {
13-
echo get_class($e) . ": " . $e->getMessage()."\n";
13+
echo $e::class, ': ', $e->getMessage(), "\n";
1414
}
1515
try {
1616
FFI::cdef("struct X {struct X x;};");
1717
echo "ok\n";
1818
} catch (Throwable $e) {
19-
echo get_class($e) . ": " . $e->getMessage()."\n";
19+
echo $e::class, ': ', $e->getMessage(), "\n";
2020
}
2121
try {
2222
FFI::cdef("struct X {struct X *ptr;};");
2323
echo "ok\n";
2424
} catch (Throwable $e) {
25-
echo get_class($e) . ": " . $e->getMessage()."\n";
25+
echo $e::class, ': ', $e->getMessage(), "\n";
2626
}
2727
?>
2828
ok

‎ext/ffi/tests/017.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ ffi.enable=1
99
try {
1010
var_dump(FFI::new("struct X {void x();}"));
1111
} catch (Throwable $e) {
12-
echo get_class($e) . ": " . $e->getMessage()."\n";
12+
echo $e::class, ': ', $e->getMessage(), "\n";
1313
}
1414
try {
1515
var_dump(FFI::new("struct X {struct X x;}"));
1616
} catch (Throwable $e) {
17-
echo get_class($e) . ": " . $e->getMessage()."\n";
17+
echo $e::class, ': ', $e->getMessage(), "\n";
1818
}
1919
try {
2020
var_dump(FFI::new("struct X {struct X *ptr;}"));
2121
} catch (Throwable $e) {
22-
echo get_class($e) . ": " . $e->getMessage()."\n";
22+
echo $e::class, ': ', $e->getMessage(), "\n";
2323
}
2424
?>
2525
ok

0 commit comments

Comments
 (0)