Skip to content

ext/ffi: applied fixers to improve test robustness #23131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickSdot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ext/ffi: applied fixers to improve test robustness #23131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/ffi/tests/003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ var_dump($ffi->new("d"));
try {
var_dump($ffi->new("struct _e"));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";

@NickSdot NickSdot Aug 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This (and following) saves us a function call; not style-only.

echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump($ffi->new("f"));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
echo "ok\n";
?>
Expand Down
4 changes: 2 additions & 2 deletions ext/ffi/tests/004.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ var_dump($ffi->new("int[_c4]"));
try {
var_dump($ffi->new("enum _e"));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump($ffi->new("f"));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
echo "ok\n";
?>
Expand Down
4 changes: 2 additions & 2 deletions ext/ffi/tests/008.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ $a = $ffi->new("struct {int x,y;}");
try {
var_dump(count($a));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

try {
foreach ($a as $key => $val) {
echo "$key => $val\n";
}
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
Expand Down
2 changes: 1 addition & 1 deletion ext/ffi/tests/010.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ FFI::memset($a, ord("a"), FFI::sizeof($a));
var_dump(FFI::string($a, FFI::sizeof($a)));
?>
--EXPECT--
string(12) "aaaaaaaaaaaa"
string(12) "aaaaaaaaaaaa"
2 changes: 1 addition & 1 deletion ext/ffi/tests/012.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ffi.enable=1
try {
var_dump(serialize(FFI::cdef()->new("int[2]")));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
Expand Down
14 changes: 7 additions & 7 deletions ext/ffi/tests/013.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,43 @@ var_dump(count($a[0][0]));
try {
var_dump($ffi->new("void"));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

try {
var_dump($ffi->new("void[1]"));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("static int foo(int)[5];");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("static int foo[5](int);");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("static int foo(int)(int);");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("typedef int foo[2][];");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("typedef int foo[][2];");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
Expand Down
2 changes: 1 addition & 1 deletion ext/ffi/tests/014.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ ok
int(8)
int(8)
int(16)
ok
ok
16 changes: 8 additions & 8 deletions ext/ffi/tests/015.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,49 +10,49 @@ try {
FFI::cdef("struct DIR; static struct DIR dir;");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("struct DIR; static struct DIR *ptr;");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("struct DIR; typedef struct DIR DIR; static DIR dir;");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("struct DIR; typedef struct DIR DIR; static DIR *ptr;");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("struct DIR; static struct DIR foo();");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("struct DIR; static struct DIR* foo();");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("struct DIR; static void foo(struct DIR);");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("struct DIR; static void foo(struct DIR*);");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
ok
Expand Down
6 changes: 3 additions & 3 deletions ext/ffi/tests/016.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ try {
FFI::cdef("struct X {void x();};");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("struct X {struct X x;};");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("struct X {struct X *ptr;};");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
ok
Expand Down
6 changes: 3 additions & 3 deletions ext/ffi/tests/017.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ ffi.enable=1
try {
var_dump(FFI::new("struct X {void x();}"));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump(FFI::new("struct X {struct X x;}"));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump(FFI::new("struct X {struct X *ptr;}"));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
ok
Expand Down
4 changes: 2 additions & 2 deletions ext/ffi/tests/018.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ try {
FFI::cdef("struct X {struct X x[2];};");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("struct X {struct X *ptr[2];};");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
ok
Expand Down
4 changes: 2 additions & 2 deletions ext/ffi/tests/019.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ try {
FFI::cdef("static int foo(int[]);");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
FFI::cdef("static int foo(int bar(int));");
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
ok
Expand Down
14 changes: 7 additions & 7 deletions ext/ffi/tests/020.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,51 +14,51 @@ try {
$p->y = 1;
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
$p = $ffi->new("struct {const int x; int y;}");
$p->y = 1;
$p->x = 1;
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
$p = $ffi->new("const struct {int x; int y;}");
$p->x = 1;
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
$p = $ffi->new("const int[10]");
$p[1] = 1;
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
$p = $ffi->new("const int * [1]");
$p[0] = null;
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
$p = $ffi->new("int * const [1]");
$p[0] = null;
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
$f = FFI::cdef("typedef int * const t[1];");
$p = $f->new("t");
$p[0] = null;
echo "ok\n";
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage()."\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
ok
Expand Down
2 changes: 1 addition & 1 deletion ext/ffi/tests/023.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ffi.enable=1
try {
var_dump(FFI::sizeof($ffi->new("struct {}")));
} catch (Throwable $e) {
echo get_class($e) . ": " . $e->getMessage() . "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
var_dump(FFI::sizeof($ffi->new("struct {int a}")));
var_dump(FFI::sizeof($ffi->new("struct {int a; int b}")));
Expand Down
Loading
Loading