Skip to content

Commit d42cda0

Browse files
committed
fixup! Deprecate calling FFI::cast(), FFI::new(), and FFI::type() statically
1 parent ccc8c87 commit d42cda0

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

ext/ffi/tests/017.phpt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,18 @@ ffi
66
ffi.enable=1
77
--FILE--
88
<?php
9-
$ffi = FFI::cdef();
10-
119
try {
12-
var_dump($ffi->new("struct X {void x();}"));
10+
var_dump(FFI::new("struct X {void x();}"));
1311
} catch (Throwable $e) {
1412
echo get_class($e) . ": " . $e->getMessage()."\n";
1513
}
1614
try {
17-
var_dump($ffi->new("struct X {struct X x;}"));
15+
var_dump(FFI::new("struct X {struct X x;}"));
1816
} catch (Throwable $e) {
1917
echo get_class($e) . ": " . $e->getMessage()."\n";
2018
}
2119
try {
22-
var_dump($ffi->new("struct X {struct X *ptr;}"));
20+
var_dump(FFI::new("struct X {struct X *ptr;}"));
2321
} catch (Throwable $e) {
2422
echo get_class($e) . ": " . $e->getMessage()."\n";
2523
}

ext/ffi/tests/021.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ffi.enable=1
77
--FILE--
88
<?php
99
function test($size, $type) {
10-
if (FFI::sizeof(FFI::cdef()->new($type)) !== $size) {
10+
if (FFI::sizeof(FFI::new($type)) !== $size) {
1111
echo "FAIL: sizeof($type) != $size\n";
1212
}
1313
}

ext/ffi/tests/046.phpt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ ffi
66
ffi.enable=1
77
--FILE--
88
<?php
9-
$x = FFI::cdef()->type("uint8_t");
9+
$x = FFI::type("uint8_t");
1010
var_dump($x->getKind() === $x::TYPE_UINT8);
1111
var_dump($x->getSize());
1212
var_dump($x->getAlignment());
1313

14-
$x = FFI::cdef()->type("enum __attribute__((packed)) {a2, b2}");
14+
$x = FFI::type("enum __attribute__((packed)) {a2, b2}");
1515
var_dump($x->getKind() === $x::TYPE_ENUM);
1616
var_dump($x->getEnumKind() === $x::TYPE_UINT8);
1717

18-
$x = FFI::cdef()->type("char[5]");
18+
$x = FFI::type("char[5]");
1919
var_dump($x->getKind() === $x::TYPE_ARRAY);
2020
var_dump($x->getSize());
2121
var_dump($x->getArrayElementType()->getKind() === $x::TYPE_CHAR);
2222
var_dump($x->getArrayLength());
2323

24-
$x = FFI::cdef()->type("void*");
24+
$x = FFI::type("void*");
2525
var_dump($x->getKind() === $x::TYPE_POINTER);
2626
var_dump($x->getPointerType()->getKind() === $x::TYPE_VOID);
2727

28-
$x = FFI::cdef()->type("struct {double x; double y;}");
28+
$x = FFI::type("struct {double x; double y;}");
2929
var_dump($x->getKind() === $x::TYPE_STRUCT);
3030
var_dump(($x->getAttributes() & $x::ATTR_UNION) != 0);
3131
var_dump($x->getStructFieldNames());
@@ -34,7 +34,7 @@ var_dump($x->getStructFieldOffset("y"));
3434
var_dump($x->getStructFieldType("x")->getKind() == $x::TYPE_DOUBLE);
3535
var_dump($x->getStructFieldType("y")->getKind() == $x::TYPE_DOUBLE);
3636

37-
$x = FFI::cdef()->type("union {double x; double y;}");
37+
$x = FFI::type("union {double x; double y;}");
3838
var_dump($x->getKind() === $x::TYPE_STRUCT);
3939
var_dump(($x->getAttributes() & $x::ATTR_UNION) != 0);
4040
var_dump($x->getStructFieldNames());
@@ -43,7 +43,7 @@ var_dump($x->getStructFieldOffset("y"));
4343
var_dump($x->getStructFieldType("x")->getKind() == $x::TYPE_DOUBLE);
4444
var_dump($x->getStructFieldType("y")->getKind() == $x::TYPE_DOUBLE);
4545

46-
$x = FFI::cdef()->type("void (*)(double,int32_t)");
46+
$x = FFI::type("void (*)(double,int32_t)");
4747
var_dump($x->getKind() === $x::TYPE_POINTER);
4848
var_dump($x->getPointerType()->getKind() === $x::TYPE_FUNC);
4949
var_dump($x->getPointerType()->getFuncReturnType()->getKind() === $x::TYPE_VOID);

0 commit comments

Comments
 (0)