Merge branch 'PHP-8.4'

* PHP-8.4: Fix FFI prototypes (these functions can't return NULL) (#16075)
php · Sep 26, 2024 · c34b37f · c34b37f
2 parents 5e83586 + a37a3d3
commit c34b37f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ext/ffi/ffi.stub.php b/ext/ffi/ffi.stub.php
@@ -15,7 +15,7 @@ public static function load(string $filename): ?FFI {}
 
         public static function scope(string $name): FFI {}
 
-        public static function new(FFI\CType|string $type, bool $owned = true, bool $persistent = false): ?FFI\CData {}
+        public static function new(FFI\CType|string $type, bool $owned = true, bool $persistent = false): FFI\CData {}
 
         /** @prefer-ref $ptr */
         public static function free(FFI\CData $ptr): void {}
@@ -24,9 +24,9 @@ public static function free(FFI\CData $ptr): void {}
          * @param FFI\CData|int|float|bool|null $ptr
          * @prefer-ref $ptr
          */
-        public static function cast(FFI\CType|string $type, $ptr): ?FFI\CData {}
+        public static function cast(FFI\CType|string $type, $ptr): FFI\CData {}
 
-        public static function type(string $type): ?FFI\CType {}
+        public static function type(string $type): FFI\CType {}
 
         /** @prefer-ref $ptr */
         public static function typeof(FFI\CData $ptr): FFI\CType {}

diff --git a/ext/ffi/ffi_arginfo.h b/ext/ffi/ffi_arginfo.h