Added FFI\CType::getName() method

Author: chopins

NEWS

@@ -12,6 +12,9 @@ PHP                                                                        NEWS
   . Fixed bug #80057 (DateTimeImmutable::createFromFormat() does not populate
     time). (Derick)
 
+- FFI:
+  . Added FFI\CType::getName() method. (chopins)
+
 03 Sep 2020, PHP 8.0.0beta3
 
 - Calendar:

ext/ffi/ffi.c

@@ -4427,6 +4427,26 @@ ZEND_METHOD(FFI, isNull) /* {{{ */
 }
 /* }}} */
 
+
+ZEND_METHOD(CType, getName) /* {{{ */
+{
+	zend_ffi_ctype *ctype = (zend_ffi_ctype*)(Z_OBJ_P(ZEND_THIS));
+	if (zend_parse_parameters_none() == FAILURE) {
+		RETURN_THROWS();
+	}
+
+	zend_ffi_ctype_name_buf buf;
+
+	buf.start = buf.end = buf.buf + ((MAX_TYPE_NAME_LEN * 3) / 4);
+	if (!zend_ffi_ctype_name(&buf, ZEND_FFI_TYPE(ctype->type))) {
+		RETURN_STR_COPY(Z_OBJ_P(ZEND_THIS)->ce->name);
+	} else {
+		size_t len = buf.end - buf.start;
+		zend_string *res = zend_string_init(buf.start, len, 0);
+		RETURN_STR(res);
+	}
+}
+
 static char *zend_ffi_parse_directives(const char *filename, char *code_pos, char **scope_name, char **lib, zend_bool preload) /* {{{ */
 {
 	char *p;
@@ -4984,7 +5004,7 @@ ZEND_MINIT_FUNCTION(ffi)
 	zend_ffi_cdata_free_handlers.get_properties       = zend_fake_get_properties;
 	zend_ffi_cdata_free_handlers.get_gc               = zend_fake_get_gc;
 
-	INIT_NS_CLASS_ENTRY(ce, "FFI", "CType", NULL);
+	INIT_NS_CLASS_ENTRY(ce, "FFI", "CType", class_CType_methods);
 	zend_ffi_ctype_ce = zend_register_internal_class(&ce);
 	zend_ffi_ctype_ce->ce_flags |= ZEND_ACC_FINAL;
 	zend_ffi_ctype_ce->create_object = zend_ffi_ctype_new;
@@ -5004,7 +5024,7 @@ ZEND_MINIT_FUNCTION(ffi)
 	zend_ffi_ctype_handlers.unset_property       = zend_fake_unset_property;
 	zend_ffi_ctype_handlers.has_dimension        = zend_fake_has_dimension;
 	zend_ffi_ctype_handlers.unset_dimension      = zend_fake_unset_dimension;
-	zend_ffi_ctype_handlers.get_method           = zend_fake_get_method;
+	//zend_ffi_ctype_handlers.get_method           = zend_fake_get_method;
 	zend_ffi_ctype_handlers.get_class_name       = zend_ffi_ctype_get_class_name;
 	zend_ffi_ctype_handlers.compare              = zend_ffi_ctype_compare_objects;
 	zend_ffi_ctype_handlers.cast_object          = zend_fake_cast_object;

ext/ffi/ffi.stub.php

@@ -61,3 +61,7 @@ public static function string(FFI\CData $ptr, ?int $size = null): ?string {}
     /** @prefer-ref $ptr */
     public static function isNull(FFI\CData $ptr): bool {}
 }
+
+final class CType {
+    public function getName() : string {}
+}

ext/ffi/ffi_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: c5ad08a2c62988e2b50468c1c5b941b5c28f23b5 */
+ * Stub hash: cf08aabbc0e1c50204772ace9285f1c5ef7a22fe */
 
 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, "\"\"")
@@ -79,6 +79,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_FFI_isNull, 0, 1, _IS_BOOL
 	ZEND_ARG_OBJ_INFO(ZEND_SEND_PREFER_REF, ptr, FFI\\CData, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_CType_getName, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 
 ZEND_METHOD(FFI, cdef);
 ZEND_METHOD(FFI, load);
@@ -97,6 +100,7 @@ ZEND_METHOD(FFI, memcmp);
 ZEND_METHOD(FFI, memset);
 ZEND_METHOD(FFI, string);
 ZEND_METHOD(FFI, isNull);
+ZEND_METHOD(CType, getName);
 
 
 static const zend_function_entry class_FFI_methods[] = {
@@ -119,3 +123,9 @@ static const zend_function_entry class_FFI_methods[] = {
 	ZEND_ME(FFI, isNull, arginfo_class_FFI_isNull, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_FE_END
 };
+
+
+static const zend_function_entry class_CType_methods[] = {
+	ZEND_ME(CType, getName, arginfo_class_CType_getName, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};