From 43064cae94332bb929926f81af5f4d257e43cc3b Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sat, 28 Oct 2023 16:28:43 +0200
Subject: [PATCH] Fix FFI tests on 8.3+

---
 ext/ffi/tests/weak_reference_002.phpt | 7 ++++---
 ext/ffi/tests/weak_reference_003.phpt | 2 +-
 ext/ffi/tests/weak_reference_004.phpt | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ext/ffi/tests/weak_reference_002.phpt b/ext/ffi/tests/weak_reference_002.phpt
index 5c36cfa7034..102dedf3c31 100644
--- a/ext/ffi/tests/weak_reference_002.phpt
+++ b/ext/ffi/tests/weak_reference_002.phpt
@@ -6,9 +6,10 @@ ffi
 ffi.enable=1
 --FILE--
 <?php
-$cdata_value = \FFI::new('int');
-$cdata_array = \FFI::new('int[1]');
-$cdata_free = \FFI::new('int[1]', false);
+$cdef = \FFI::cdef();
+$cdata_value = $cdef->new('int');
+$cdata_array = $cdef->new('int[1]');
+$cdata_free = $cdef->new('int[1]', false);
 \FFI::free($cdata_free);
 
 $ref_value = \WeakReference::create($cdata_value);
diff --git a/ext/ffi/tests/weak_reference_003.phpt b/ext/ffi/tests/weak_reference_003.phpt
index 15b9397a685..60eccba9419 100644
--- a/ext/ffi/tests/weak_reference_003.phpt
+++ b/ext/ffi/tests/weak_reference_003.phpt
@@ -6,7 +6,7 @@ ffi
 ffi.enable=1
 --FILE--
 <?php
-$ctype = \FFI::type('int');
+$ctype = \FFI::cdef()->type('int');
 $ref = \WeakReference::create($ctype);
 var_dump($ref->get() === $ctype);
 unset($ctype);
diff --git a/ext/ffi/tests/weak_reference_004.phpt b/ext/ffi/tests/weak_reference_004.phpt
index 500776fa218..f2cc9ed171b 100644
--- a/ext/ffi/tests/weak_reference_004.phpt
+++ b/ext/ffi/tests/weak_reference_004.phpt
@@ -9,11 +9,11 @@ ffi.enable=1
 $map = new WeakMap();
 
 $ffi = \FFI::cdef('');
-$cdata_value = \FFI::new('int');
-$cdata_array = \FFI::new('int[1]');
-$cdata_free = \FFI::new('int[1]', false);
+$cdata_value = $ffi->new('int');
+$cdata_array = $ffi->new('int[1]');
+$cdata_free = $ffi->new('int[1]', false);
 \FFI::free($cdata_free);
-$ctype = \FFI::type('int');
+$ctype = $ffi->type('int');
 
 $map[$ffi] = 'ffi';
 $map[$cdata_value] = 'cdata_value';