Skip to content

Commit c34b37f

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix FFI prototypes (these functions can't return NULL) (#16075)
2 parents 5e83586 + a37a3d3 commit c34b37f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ext/ffi/ffi.stub.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static function load(string $filename): ?FFI {}
1515

1616
public static function scope(string $name): FFI {}
1717

18-
public static function new(FFI\CType|string $type, bool $owned = true, bool $persistent = false): ?FFI\CData {}
18+
public static function new(FFI\CType|string $type, bool $owned = true, bool $persistent = false): FFI\CData {}
1919

2020
/** @prefer-ref $ptr */
2121
public static function free(FFI\CData $ptr): void {}
@@ -24,9 +24,9 @@ public static function free(FFI\CData $ptr): void {}
2424
* @param FFI\CData|int|float|bool|null $ptr
2525
* @prefer-ref $ptr
2626
*/
27-
public static function cast(FFI\CType|string $type, $ptr): ?FFI\CData {}
27+
public static function cast(FFI\CType|string $type, $ptr): FFI\CData {}
2828

29-
public static function type(string $type): ?FFI\CType {}
29+
public static function type(string $type): FFI\CType {}
3030

3131
/** @prefer-ref $ptr */
3232
public static function typeof(FFI\CData $ptr): FFI\CType {}

ext/ffi/ffi_arginfo.h

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)