Skip to content

Commit d36f1ba

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fix FFI tests on 8.3+
2 parents 3d65848 + 43064ca commit d36f1ba

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

ext/ffi/tests/weak_reference_002.phpt

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ ffi
66
ffi.enable=1
77
--FILE--
88
<?php
9-
$cdata_value = \FFI::new('int');
10-
$cdata_array = \FFI::new('int[1]');
11-
$cdata_free = \FFI::new('int[1]', false);
9+
$cdef = \FFI::cdef();
10+
$cdata_value = $cdef->new('int');
11+
$cdata_array = $cdef->new('int[1]');
12+
$cdata_free = $cdef->new('int[1]', false);
1213
\FFI::free($cdata_free);
1314

1415
$ref_value = \WeakReference::create($cdata_value);

ext/ffi/tests/weak_reference_003.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ffi
66
ffi.enable=1
77
--FILE--
88
<?php
9-
$ctype = \FFI::type('int');
9+
$ctype = \FFI::cdef()->type('int');
1010
$ref = \WeakReference::create($ctype);
1111
var_dump($ref->get() === $ctype);
1212
unset($ctype);

ext/ffi/tests/weak_reference_004.phpt

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ ffi.enable=1
99
$map = new WeakMap();
1010

1111
$ffi = \FFI::cdef('');
12-
$cdata_value = \FFI::new('int');
13-
$cdata_array = \FFI::new('int[1]');
14-
$cdata_free = \FFI::new('int[1]', false);
12+
$cdata_value = $ffi->new('int');
13+
$cdata_array = $ffi->new('int[1]');
14+
$cdata_free = $ffi->new('int[1]', false);
1515
\FFI::free($cdata_free);
16-
$ctype = \FFI::type('int');
16+
$ctype = $ffi->type('int');
1717

1818
$map[$ffi] = 'ffi';
1919
$map[$cdata_value] = 'cdata_value';

0 commit comments

Comments
 (0)