FFI extension add FFI\CDef class and other update

ext/ffi/ffi.stub.php

@@ -7,13 +7,13 @@
 	/** @not-serializable */
     final class FFI
     {
-        public static function cdef(string $code = "", ?string $lib = null): FFI {}
+        public static function cdef(string $code = "", ?string $lib = null): FFI\CDef {}
 
-        public static function load(string $filename): ?FFI {}
+        public static function load(string $filename): ?FFI\CDef {}
 
-        public static function scope(string $name): FFI {}
+        public static function scope(string $name): FFI\CDef {}
 
-        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\CDef $cdef = null): ?FFI\CData {}
 
         /** @prefer-ref $ptr */
         public static function free(FFI\CData $ptr): void {}
@@ -22,9 +22,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\CDef $cdef = null): ?FFI\CData {}
 
-        public static function type(string $type): ?FFI\CType {}
+        public static function type(string $type, ?FFI\CDef $cdef = null): ?FFI\CType {}
 
         /** @prefer-ref $ptr */
         public static function typeof(FFI\CData $ptr): FFI\CType {}
@@ -63,11 +63,18 @@ public static function string(FFI\CData $ptr, ?int $size = null): string {}
 
         /** @prefer-ref $ptr */
         public static function isNull(FFI\CData $ptr): bool {}
+
+        public static function hasSymbol(FFI\CDef $cdef, string $symbol, ?int $symbol_kind = null): bool {}
+
+        public static function getSymbols(FFI\CDef $cdef, ?int $symbol_kind = null): array {}
     }
 
 }
 
 namespace FFI {
+    /** @not-serializable */
+    final class CDef {
+    }
 
 	/** @not-serializable */
     final class CData {

ext/ffi/ffi_arginfo.h

@@ -1,23 +1,24 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d9dd3b93c0d1623fe61ea0bd8ee9d4c3a359bf78 */
+ * Stub hash: 754463b45c9c4a1313e2bd690c84656d5d6ec853 */
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_cdef, 0, 0, FFI, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_cdef, 0, 0, FFI\\CDef, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code, IS_STRING, 0, "\"\"")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, lib, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_load, 0, 1, FFI, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_load, 0, 1, FFI\\CDef, 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, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_scope, 0, 1, FFI\\CDef, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_new, 0, 1, FFI\\CData, 1)
 	ZEND_ARG_OBJ_TYPE_MASK(0, type, FFI\\CType, MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owned, _IS_BOOL, 0, "true")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, persistent, _IS_BOOL, 0, "false")
+	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, cdef, FFI\\CDef, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_FFI_free, 0, 1, IS_VOID, 0)
@@ -27,10 +28,12 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_cast, 0, 2, FFI\\CData, 1)
 	ZEND_ARG_OBJ_TYPE_MASK(0, type, FFI\\CType, MAY_BE_STRING, NULL)
 	ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, ptr)
+	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, cdef, FFI\\CDef, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_type, 0, 1, FFI\\CType, 1)
 	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
+	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, cdef, FFI\\CDef, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_typeof, 0, 1, FFI\\CType, 0)
@@ -79,6 +82,17 @@ 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_FFI_hasSymbol, 0, 2, _IS_BOOL, 0)
+	ZEND_ARG_OBJ_INFO(0, cdef, FFI\\CDef, 0)
+	ZEND_ARG_TYPE_INFO(0, symbol, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, symbol_kind, IS_LONG, 1, "null")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_FFI_getSymbols, 0, 1, IS_ARRAY, 0)
+	ZEND_ARG_OBJ_INFO(0, cdef, FFI\\CDef, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, symbol_kind, IS_LONG, 1, "null")
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_FFI_CType_getName, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -139,6 +153,8 @@ ZEND_METHOD(FFI, memcmp);
 ZEND_METHOD(FFI, memset);
 ZEND_METHOD(FFI, string);
 ZEND_METHOD(FFI, isNull);
+ZEND_METHOD(FFI, hasSymbol);
+ZEND_METHOD(FFI, getSymbols);
 ZEND_METHOD(FFI_CType, getName);
 ZEND_METHOD(FFI_CType, getKind);
 ZEND_METHOD(FFI_CType, getSize);
@@ -175,6 +191,13 @@ static const zend_function_entry class_FFI_methods[] = {
 	ZEND_ME(FFI, memset, arginfo_class_FFI_memset, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_ME(FFI, string, arginfo_class_FFI_string, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_ME(FFI, isNull, arginfo_class_FFI_isNull, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	ZEND_ME(FFI, hasSymbol, arginfo_class_FFI_hasSymbol, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	ZEND_ME(FFI, getSymbols, arginfo_class_FFI_getSymbols, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_FFI_CDef_methods[] = {
 	ZEND_FE_END
 };
 
@@ -225,6 +248,17 @@ static zend_class_entry *register_class_FFI(void)
 	return class_entry;
 }
 
+static zend_class_entry *register_class_FFI_CDef(void)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_NS_CLASS_ENTRY(ce, "FFI", "CDef", class_FFI_CDef_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NOT_SERIALIZABLE;
+
+	return class_entry;
+}
+
 static zend_class_entry *register_class_FFI_CData(void)
 {
 	zend_class_entry ce, *class_entry;

ext/ffi/tests/003.phpt

@@ -25,17 +25,17 @@ struct _f;
 typedef struct _f f;
 EOF
 );
-var_dump($ffi->new("struct _a"));
-var_dump($ffi->new("struct _b"));
-var_dump($ffi->new("c"));
-var_dump($ffi->new("d"));
+var_dump(FFI::new("struct _a", cdef : $ffi));
+var_dump(FFI::new("struct _b", cdef : $ffi));
+var_dump(FFI::new("c", cdef : $ffi));
+var_dump(FFI::new("d", cdef : $ffi));
 try {
-    var_dump($ffi->new("struct _e"));
+    var_dump(FFI::new("struct _e", cdef : $ffi));
 } catch (Throwable $e) {
     echo get_class($e) . ": " . $e->getMessage()."\n";
 }
 try {
-    var_dump($ffi->new("f"));
+    var_dump(FFI::new("f", cdef : $ffi));
 } catch (Throwable $e) {
     echo get_class($e) . ": " . $e->getMessage()."\n";
 }

ext/ffi/tests/004.phpt

@@ -32,20 +32,20 @@ enum _g {
 };
 EOF
 );
-var_dump($ffi->new("enum _a"));
-var_dump($ffi->new("enum _b"));
-var_dump($ffi->new("c"));
-var_dump($ffi->new("d"));
-var_dump($ffi->new("int[_c2]"));
-var_dump($ffi->new("int[_c3]"));
-var_dump($ffi->new("int[_c4]"));
+var_dump(FFI::new("enum _a", cdef : $ffi));
+var_dump(FFI::new("enum _b", cdef : $ffi));
+var_dump(FFI::new("c", cdef : $ffi));
+var_dump(FFI::new("d", cdef : $ffi));
+var_dump(FFI::new("int[_c2]", cdef : $ffi));
+var_dump(FFI::new("int[_c3]", cdef : $ffi));
+var_dump(FFI::new("int[_c4]", cdef : $ffi));
 try {
-    var_dump($ffi->new("enum _e"));
+    var_dump(FFI::new("enum _e", cdef : $ffi));
 } catch (Throwable $e) {
     echo get_class($e) . ": " . $e->getMessage()."\n";
 }
 try {
-    var_dump($ffi->new("f"));
+    var_dump(FFI::new("f", cdef : $ffi));
 } catch (Throwable $e) {
     echo get_class($e) . ": " . $e->getMessage()."\n";
 }

ext/ffi/tests/020.phpt

@@ -52,7 +52,7 @@ try {
 }
 try {
     $f = FFI::cdef("typedef int * const t[1];");
-    $p = $f->new("t");
+    $p = FFI::new("t", cdef : $f);
     $p[0] = null;
     echo "ok\n";
 } catch (Throwable $e) {

ext/ffi/tests/029.phpt

@@ -10,8 +10,8 @@ $ffi = FFI::cdef("
     typedef char t1;
     typedef char _Alignas(int) t2;
 ");
-var_dump(FFI::sizeof($ffi->new("struct {char a; t1 b;}")));
-var_dump(FFI::sizeof($ffi->new("struct {char a; t2 b;}")));
+var_dump(FFI::sizeof(FFI::new("struct {char a; t1 b;}", cdef : $ffi)));
+var_dump(FFI::sizeof(FFI::new("struct {char a; t2 b;}", cdef : $ffi)));
 ?>
 --EXPECT--
 int(2)

ext/ffi/tests/044.phpt

@@ -18,16 +18,16 @@ typedef unsigned int ud __attribute__ ((__mode__ (__DI__)));
 typedef float e __attribute__ ((__mode__ (__SF__)));
 typedef float f __attribute__ ((__mode__ (__DF__)));
 ");
-var_dump(FFI::sizeof($ffi->new("a")));
-var_dump(FFI::sizeof($ffi->new("ua")));
-var_dump(FFI::sizeof($ffi->new("b")));
-var_dump(FFI::sizeof($ffi->new("ub")));
-var_dump(FFI::sizeof($ffi->new("c")));
-var_dump(FFI::sizeof($ffi->new("uc")));
-var_dump(FFI::sizeof($ffi->new("d")));
-var_dump(FFI::sizeof($ffi->new("ud")));
-var_dump(FFI::sizeof($ffi->new("e")));
-var_dump(FFI::sizeof($ffi->new("f")));
+var_dump(FFI::sizeof(FFI::new("a", cdef : $ffi)));
+var_dump(FFI::sizeof(FFI::new("ua", cdef : $ffi)));
+var_dump(FFI::sizeof(FFI::new("b", cdef : $ffi)));
+var_dump(FFI::sizeof(FFI::new("ub", cdef : $ffi)));
+var_dump(FFI::sizeof(FFI::new("c", cdef : $ffi)));
+var_dump(FFI::sizeof(FFI::new("uc", cdef : $ffi)));
+var_dump(FFI::sizeof(FFI::new("d", cdef : $ffi)));
+var_dump(FFI::sizeof(FFI::new("ud", cdef : $ffi)));
+var_dump(FFI::sizeof(FFI::new("e", cdef : $ffi)));
+var_dump(FFI::sizeof(FFI::new("f", cdef : $ffi)));
 ?>
 --EXPECT--
 int(1)

ext/ffi/tests/047.phpt

@@ -0,0 +1,26 @@
+--TEST--
+FFI 047: FFI::hasSymbol()
+--EXTENSIONS--
+ffi
+--INI--
+ffi.enable=1
+--FILE--
+<?php
+
+
+$ffi = FFI::cdef(<<<EOF
+    /* allowed storage classes */
+    typedef  int type1;
+EOF
+);
+
+var_dump(FFI::hasSymbol($ffi, 'type1'));
+var_dump(FFI::hasSymbol($ffi, 'type1', FFI::SYM_TYPE));
+var_dump(FFI::hasSymbol($ffi, 'type1', FFI::SYM_FUNC));
+?>
+ok
+--EXPECT--
+bool(true)
+bool(true)
+bool(false)
+ok

ext/ffi/tests/048.phpt

@@ -0,0 +1,76 @@
+--TEST--
+FFI 048: FFI::getSymbols()
+--EXTENSIONS--
+ffi
+--INI--
+ffi.enable=1
+--FILE--
+<?php
+
+
+$ffi = FFI::cdef(<<<EOF
+    /* allowed storage classes */
+    typedef  int type1;
+    typedef  char type2;
+    enum _g {
+    _c1,
+    _c2,
+    _c3 = 1,
+    _c4,
+    };
+
+EOF
+);
+
+var_dump(FFI::getSymbols($ffi));
+var_dump(FFI::getSymbols($ffi, FFI::SYM_TYPE));
+var_dump(FFI::getSymbols($ffi, FFI::SYM_FUNC));
+var_dump(FFI::getSymbols($ffi, FFI::SYM_CONST));
+?>
+ok
+--EXPECTF--
+array(6) {
+  ["type1"]=>
+  object(FFI\CType:int32_t)#%d (0) {
+  }
+  ["type2"]=>
+  object(FFI\CType:char)#%d (0) {
+  }
+  ["_c1"]=>
+  object(FFI\CType:uint32_t)#%d (0) {
+  }
+  ["_c2"]=>
+  object(FFI\CType:uint32_t)#%d (0) {
+  }
+  ["_c3"]=>
+  object(FFI\CType:uint32_t)#%d (0) {
+  }
+  ["_c4"]=>
+  object(FFI\CType:uint32_t)#%d (0) {
+  }
+}
+array(2) {
+  ["type1"]=>
+  object(FFI\CType:int32_t)#%d (0) {
+  }
+  ["type2"]=>
+  object(FFI\CType:char)#%d (0) {
+  }
+}
+array(0) {
+}
+array(4) {
+  ["_c1"]=>
+  object(FFI\CType:uint32_t)#%d (0) {
+  }
+  ["_c2"]=>
+  object(FFI\CType:uint32_t)#%d (0) {
+  }
+  ["_c3"]=>
+  object(FFI\CType:uint32_t)#%d (0) {
+  }
+  ["_c4"]=>
+  object(FFI\CType:uint32_t)#%d (0) {
+  }
+}
+ok

ext/ffi/tests/100.phpt

@@ -34,7 +34,7 @@ var_dump(($zend->zend_printf)("Hello %s!\n", "World"));
 
 var_dump($zend->zend_hash_func("file", strlen("file")));
 
-$str = $zend->new("char[16]");
+$str = FFI::new("char[16]", cdef : $zend);
 FFI::memcpy($str, "Hello World!", strlen("Hello World!"));
 $zend->zend_str_tolower($str, strlen("Hello World!"));
 var_dump(FFI::string($str));

ext/ffi/tests/101.phpt

@@ -36,7 +36,7 @@ var_dump(($zend->zend_printf)("Hello %s!\n", "World"));
 $f = $zend->zend_hash_func;
 var_dump($f("file", strlen("file")));
 
-$str = $zend->new("char[16]");
+$str = FFI::new("char[16]", cdef : $zend);
 FFI::memcpy($str, "Hello World!", strlen("Hello World!"));
 $f = $zend->zend_str_tolower;
 $f($str, strlen("Hello World!"));

ext/ffi/tests/bug77768.phpt

@@ -32,7 +32,7 @@ int printf(const char *format, ...);
 int printf(const char *format, ...);
 ");
 
-var_dump(FFI::sizeof($x->new("uint8_t")));
+var_dump(FFI::sizeof(FFI::new("uint8_t", cdef : $x)));
 var_dump(FFI::sizeof(FFI::new("uint8_t")));
 ?>
 --EXPECT--

ext/ffi/tests/bug78543.phpt

@@ -5,7 +5,7 @@ ffi
 --FILE--
 <?php
 $ffi = FFI::cdef(' struct test { int dummy; }; ');
-$test = $ffi->new('struct test');
+$test = FFI::new('struct test', cdef : $ffi);
 var_dump(is_callable($test));
 ?>
 --EXPECT--