diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-12-27 20:29:00 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-12-28 19:04:47 +0100 |
| commit | 13f898b56a5ddcb9a5878543ff98103e265fd49c (patch) | |
| tree | b509a297df384ab3dd020d7da55d8ae0a09467d7 | |
| parent | 46a2c6a8d7d7d48e7f32c2738cdbae46ced0c65b (diff) | |
| download | php-git-13f898b56a5ddcb9a5878543ff98103e265fd49c.tar.gz | |
Fix ffi stubs
Closes GH-6543.
| -rw-r--r-- | ext/ffi/ffi.stub.php | 8 | ||||
| -rw-r--r-- | ext/ffi/ffi_arginfo.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/ffi/ffi.stub.php b/ext/ffi/ffi.stub.php index 18f51aa254..4b345b9147 100644 --- a/ext/ffi/ffi.stub.php +++ b/ext/ffi/ffi.stub.php @@ -10,7 +10,7 @@ final class FFI public static function load(string $filename): ?FFI {} - public static function scope(string $name): ?FFI {} + public static function scope(string $name): FFI {} public static function new(FFI\CType|string $type, bool $owned = true, bool $persistent = false): ?FFI\CData {} @@ -18,7 +18,7 @@ final class FFI public static function free(FFI\CData $ptr): void {} /** - * @param FFI\CData|string|int|null $ptr + * @param FFI\CData|int|float|bool|null $ptr * @prefer-ref $ptr */ public static function cast(FFI\CType|string $type, $ptr): ?FFI\CData {} @@ -28,7 +28,7 @@ final class FFI /** @prefer-ref $ptr */ public static function typeof(FFI\CData $ptr): FFI\CType {} - public static function arrayType(FFI\CType $type, array $dimensions): ?FFI\CType {} + public static function arrayType(FFI\CType $type, array $dimensions): FFI\CType {} /** @prefer-ref $ptr */ public static function addr(FFI\CData $ptr): FFI\CData {} @@ -64,7 +64,7 @@ final class FFI public static function memset(FFI\CData $ptr, int $value, int $size): void {} /** @prefer-ref $ptr */ - public static function string(FFI\CData $ptr, ?int $size = null): ?string {} + public static function string(FFI\CData $ptr, ?int $size = null): string {} /** @prefer-ref $ptr */ public static function isNull(FFI\CData $ptr): bool {} diff --git a/ext/ffi/ffi_arginfo.h b/ext/ffi/ffi_arginfo.h index 16dcdf7f09..cbeb1983fc 100644 --- a/ext/ffi/ffi_arginfo.h +++ b/ext/ffi/ffi_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 677c62adf295003b4b2d273995a4bda623d507bf */ + * Stub hash: 0b4215e4686f4184b2eef0de7d60e01855725924 */ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_cdef, 0, 0, FFI, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code, IS_STRING, 0, "\"\"") @@ -10,7 +10,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_load, 0, 1, FFI, 1) ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_scope, 0, 1, FFI, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_scope, 0, 1, FFI, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -37,7 +37,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_typeof, 0, 1, FFI\\CTyp ZEND_ARG_OBJ_INFO(ZEND_SEND_PREFER_REF, ptr, FFI\\CData, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_arrayType, 0, 2, FFI\\CType, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_arrayType, 0, 2, FFI\\CType, 0) ZEND_ARG_OBJ_INFO(0, type, FFI\\CType, 0) ZEND_ARG_TYPE_INFO(0, dimensions, IS_ARRAY, 0) ZEND_END_ARG_INFO() @@ -70,7 +70,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_FFI_memset, 0, 3, IS_VOID, ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_FFI_string, 0, 1, IS_STRING, 1) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_FFI_string, 0, 1, IS_STRING, 0) ZEND_ARG_OBJ_INFO(ZEND_SEND_PREFER_REF, ptr, FFI\\CData, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, size, IS_LONG, 1, "null") ZEND_END_ARG_INFO() |