Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix ffi stubs

Author: cmb69

ext/ffi/ffi.stub.php

@@ -10,15 +10,15 @@ public static function cdef(string $code = "", ?string $lib = null): 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 {}
 
     /** @prefer-ref $ptr */
     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 @@ public static function type(string $type): ?FFI\CType {}
     /** @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 @@ public static function memcmp($ptr1, $ptr2, int $size): int {}
     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 {}

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()