diff --git a/build/gen_stub.php b/build/gen_stub.php
index 657b630c6bf40..2edc7fc10450a 100755
--- a/build/gen_stub.php
+++ b/build/gen_stub.php
@@ -2584,7 +2584,7 @@ protected function getFieldSynopsisDefaultLinkend(): string
     {
         $className = str_replace(["\\", "_"], ["-", "-"], $this->name->class->toLowerString());
 
-        return "$className.constants." . strtolower(str_replace("_", "-", $this->name->getDeclarationName()));
+        return "$className.constants." . strtolower(str_replace(["__", "_"], ["", "-"], $this->name->getDeclarationName()));
     }
 
     protected function getFieldSynopsisName(): string
@@ -2919,7 +2919,7 @@ protected function getFieldSynopsisDefaultLinkend(): string
     {
         $className = str_replace(["\\", "_"], ["-", "-"], $this->name->class->toLowerString());
 
-        return "$className.props." . strtolower(str_replace("_", "-", $this->name->getDeclarationName()));
+        return "$className.props." . strtolower(str_replace(["__", "_"], ["", "-"], $this->name->getDeclarationName()));
     }
 
     protected function getFieldSynopsisName(): string
diff --git a/ext/ffi/ffi.stub.php b/ext/ffi/ffi.stub.php
index 5ae957634b86f..0ed3cb32ac6ed 100644
--- a/ext/ffi/ffi.stub.php
+++ b/ext/ffi/ffi.stub.php
@@ -6,10 +6,7 @@
 	/** @not-serializable */
     final class FFI
     {
-        /**
-         * @cvalue __BIGGEST_ALIGNMENT__
-         * @link ffi-ffi.constants.biggest-alignment
-         */
+        /** @cvalue __BIGGEST_ALIGNMENT__ */
         public const int __BIGGEST_ALIGNMENT__ = UNKNOWN;
 
         public static function cdef(string $code = "", ?string $lib = null): FFI {}
diff --git a/ext/ffi/ffi_arginfo.h b/ext/ffi/ffi_arginfo.h
index 62a4171734504..aca7a8d25637c 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: 81892d30ea498304dfa4105fc430a3d43f0ad54f */
+ * Stub hash: 1255ed4477be5b4361622aab54ebe37f42b1dada */
 
 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, "\"\"")
diff --git a/ext/snmp/snmp.stub.php b/ext/snmp/snmp.stub.php
index 87496c936fe4d..0a303aea77ff0 100644
--- a/ext/snmp/snmp.stub.php
+++ b/ext/snmp/snmp.stub.php
@@ -183,66 +183,30 @@ function snmp_read_mib(string $filename): bool {}
 
 class SNMP
 {
-    /**
-     * @cvalue SNMP_VERSION_1
-     * @link snmp.class.constants.version-1
-     */
+    /** @cvalue SNMP_VERSION_1 */
     public const int VERSION_1 = UNKNOWN;
-    /**
-     * @cvalue SNMP_VERSION_2c
-     * @link snmp.class.constants.version-2c
-     */
+    /** @cvalue SNMP_VERSION_2c */
     public const int VERSION_2c = UNKNOWN;
-    /**
-     * @cvalue SNMP_VERSION_2c
-     * @link snmp.class.constants.version-2c
-     */
+    /** @cvalue SNMP_VERSION_2c */
     public const int VERSION_2C = UNKNOWN;
-    /**
-     * @cvalue SNMP_VERSION_3
-     * @link snmp.class.constants.version-3
-     */
+    /** @cvalue SNMP_VERSION_3 */
     public const int VERSION_3 = UNKNOWN;
 
-    /**
-     * @cvalue PHP_SNMP_ERRNO_NOERROR
-     * @link snmp.class.constants.errno-noerror
-     */
+    /** @cvalue PHP_SNMP_ERRNO_NOERROR */
     public const int ERRNO_NOERROR = UNKNOWN;
-    /**
-     * @cvalue PHP_SNMP_ERRNO_ANY
-     * @link snmp.class.constants.errno-any
-     */
+    /** @cvalue PHP_SNMP_ERRNO_ANY */
     public const int ERRNO_ANY = UNKNOWN;
-    /**
-     * @cvalue PHP_SNMP_ERRNO_GENERIC
-     * @link snmp.class.constants.errno-generic
-     */
+    /** @cvalue PHP_SNMP_ERRNO_GENERIC */
     public const int ERRNO_GENERIC = UNKNOWN;
-    /**
-     * @cvalue PHP_SNMP_ERRNO_TIMEOUT
-     * @link snmp.class.constants.errno-timeout
-     */
+    /** @cvalue PHP_SNMP_ERRNO_TIMEOUT */
     public const int ERRNO_TIMEOUT = UNKNOWN;
-    /**
-     * @cvalue PHP_SNMP_ERRNO_ERROR_IN_REPLY
-     * @link snmp.class.constants.errno-error-in-reply
-     */
+    /** @cvalue PHP_SNMP_ERRNO_ERROR_IN_REPLY */
     public const int ERRNO_ERROR_IN_REPLY = UNKNOWN;
-    /**
-     * @cvalue PHP_SNMP_ERRNO_OID_NOT_INCREASING
-     * @link snmp.class.constants.errno-oid-not-increasing
-     */
+    /** @cvalue PHP_SNMP_ERRNO_OID_NOT_INCREASING */
     public const int ERRNO_OID_NOT_INCREASING = UNKNOWN;
-    /**
-     * @cvalue PHP_SNMP_ERRNO_OID_PARSING_ERROR
-     * @link snmp.class.constants.errno-oid-parsing-error
-     */
+    /** @cvalue PHP_SNMP_ERRNO_OID_PARSING_ERROR */
     public const int ERRNO_OID_PARSING_ERROR = UNKNOWN;
-    /**
-     * @cvalue PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES
-     * @link snmp.class.constants.errno-multiple-set-queries
-     */
+    /** @cvalue PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES */
     public const int ERRNO_MULTIPLE_SET_QUERIES = UNKNOWN;
 
     /** @readonly */
diff --git a/ext/snmp/snmp_arginfo.h b/ext/snmp/snmp_arginfo.h
index 60a91c61b550d..307c22ecb8d8e 100644
--- a/ext/snmp/snmp_arginfo.h
+++ b/ext/snmp/snmp_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 449ae0af39f24f3e5696b88a30d2a440628c409b */
+ * Stub hash: e2451ac3ea0fa5eb1158e8b7252e61c6794d514f */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmpget, 0, 3, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
diff --git a/ext/sqlite3/sqlite3.stub.php b/ext/sqlite3/sqlite3.stub.php
index c88ec780b021f..3545da36acfcd 100644
--- a/ext/sqlite3/sqlite3.stub.php
+++ b/ext/sqlite3/sqlite3.stub.php
@@ -78,197 +78,86 @@ class SQLite3Exception extends \Exception
 /** @not-serializable */
 class SQLite3
 {
-    /**
-     * @cvalue SQLITE_OK
-     * @link sqlite3.class.constants.ok
-     */
+    /** @cvalue SQLITE_OK */
     public const int OK = UNKNOWN;
 
     /* Constants for authorizer return */
 
-    /**
-     * @cvalue SQLITE_DENY
-     * @link sqlite3.class.constants.deny
-     */
+    /** @cvalue SQLITE_DENY */
     public const int DENY = UNKNOWN;
-    /**
-     * @cvalue SQLITE_IGNORE
-     * @link sqlite3.class.constants.ignore
-     */
+    /** @cvalue SQLITE_IGNORE */
     public const int IGNORE = UNKNOWN;
 
     /* Constants for authorizer actions */
 
-    /**
-     * @cvalue SQLITE_CREATE_INDEX
-     * @link sqlite3.class.constants.create-index
-     */
+    /** @cvalue SQLITE_CREATE_INDEX */
     public const int CREATE_INDEX = UNKNOWN;
-    /**
-     * @cvalue SQLITE_CREATE_TABLE
-     * @link sqlite3.class.constants.create-table
-     */
+    /** @cvalue SQLITE_CREATE_TABLE */
     public const int CREATE_TABLE = UNKNOWN;
-    /**
-     * @cvalue SQLITE_CREATE_TEMP_INDEX
-     * @link sqlite3.class.constants.create-temp-index
-     */
+    /** @cvalue SQLITE_CREATE_TEMP_INDEX */
     public const int CREATE_TEMP_INDEX = UNKNOWN;
-    /**
-     * @cvalue SQLITE_CREATE_TEMP_TABLE
-     * @link sqlite3.class.constants.create-temp-table
-     */
+    /** @cvalue SQLITE_CREATE_TEMP_TABLE */
     public const int CREATE_TEMP_TABLE = UNKNOWN;
-    /**
-     * @cvalue SQLITE_CREATE_TEMP_TRIGGER
-     * @link sqlite3.class.constants.create-temp-trigger
-     */
+    /** @cvalue SQLITE_CREATE_TEMP_TRIGGER */
     public const int CREATE_TEMP_TRIGGER = UNKNOWN;
-    /**
-     * @cvalue SQLITE_CREATE_TEMP_VIEW
-     * @link sqlite3.class.constants.create-temp-view
-     */
+    /** @cvalue SQLITE_CREATE_TEMP_VIEW */
     public const int CREATE_TEMP_VIEW = UNKNOWN;
-    /**
-     * @cvalue SQLITE_CREATE_TRIGGER
-     * @link sqlite3.class.constants.create-trigger
-     */
+    /** @cvalue SQLITE_CREATE_TRIGGER */
     public const int CREATE_TRIGGER = UNKNOWN;
-    /**
-     * @cvalue SQLITE_CREATE_VIEW
-     * @link sqlite3.class.constants.create-view
-     */
+    /** @cvalue SQLITE_CREATE_VIEW */
     public const int CREATE_VIEW = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DELETE
-     * @link sqlite3.class.constants.delete
-     */
+    /** @cvalue SQLITE_DELETE */
     public const int DELETE = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DROP_INDEX
-     * @link sqlite3.class.constants.drop-index
-     */
+    /** @cvalue SQLITE_DROP_INDEX */
     public const int DROP_INDEX = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DROP_TABLE
-     * @link sqlite3.class.constants.drop-table
-     */
+    /** @cvalue SQLITE_DROP_TABLE */
     public const int DROP_TABLE = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DROP_TEMP_INDEX
-     * @link sqlite3.class.constants.drop-temp-index
-     */
+    /** @cvalue SQLITE_DROP_TEMP_INDEX */
     public const int DROP_TEMP_INDEX = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DROP_TEMP_TABLE
-     * @link sqlite3.class.constants.drop-temp-table
-     */
+    /** @cvalue SQLITE_DROP_TEMP_TABLE */
     public const int DROP_TEMP_TABLE = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DROP_TEMP_TRIGGER
-     * @link sqlite3.class.constants.drop-temp-trigger
-     */
+    /** @cvalue SQLITE_DROP_TEMP_TRIGGER */
     public const int DROP_TEMP_TRIGGER = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DROP_TEMP_VIEW
-     * @link sqlite3.class.constants.drop-temp-view
-     */
+    /** @cvalue SQLITE_DROP_TEMP_VIEW */
     public const int DROP_TEMP_VIEW = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DROP_TRIGGER
-     * @link sqlite3.class.constants.drop-trigger
-     */
+    /** @cvalue SQLITE_DROP_TRIGGER */
     public const int DROP_TRIGGER = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DROP_VIEW
-     * @link sqlite3.class.constants.drop-view
-     */
+    /** @cvalue SQLITE_DROP_VIEW */
     public const int DROP_VIEW = UNKNOWN;
-    /**
-     * @cvalue SQLITE_INSERT
-     * @link sqlite3.class.constants.insert
-     */
+    /** @cvalue SQLITE_INSERT */
     public const int INSERT = UNKNOWN;
-    /**
-     * @cvalue SQLITE_PRAGMA
-     * @link sqlite3.class.constants.pragma
-     */
+    /** @cvalue SQLITE_PRAGMA */
     public const int PRAGMA = UNKNOWN;
-    /**
-     * @cvalue SQLITE_READ
-     * @link sqlite3.class.constants.read
-     */
+    /** @cvalue SQLITE_READ */
     public const int READ = UNKNOWN;
-    /**
-     * @cvalue SQLITE_SELECT
-     * @link sqlite3.class.constants.select
-     */
+    /** @cvalue SQLITE_SELECT */
     public const int SELECT = UNKNOWN;
-    /**
-     * @cvalue SQLITE_TRANSACTION
-     * @link sqlite3.class.constants.transaction
-     */
+    /** @cvalue SQLITE_TRANSACTION */
     public const int TRANSACTION = UNKNOWN;
-    /**
-     * @cvalue SQLITE_UPDATE
-     * @link sqlite3.class.constants.update
-     */
+    /** @cvalue SQLITE_UPDATE */
     public const int UPDATE = UNKNOWN;
-    /**
-     * @cvalue SQLITE_ATTACH
-     * @link sqlite3.class.constants.attach
-     */
+    /** @cvalue SQLITE_ATTACH */
     public const int ATTACH = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DETACH
-     * @link sqlite3.class.constants.detach
-     */
+    /** @cvalue SQLITE_DETACH */
     public const int DETACH = UNKNOWN;
-    /**
-     * @cvalue SQLITE_ALTER_TABLE
-     * @link sqlite3.class.constants.alter-table
-     */
+    /** @cvalue SQLITE_ALTER_TABLE */
     public const int ALTER_TABLE = UNKNOWN;
-    /**
-     * @cvalue SQLITE_REINDEX
-     * @link sqlite3.class.constants.reindex
-     */
+    /** @cvalue SQLITE_REINDEX */
     public const int REINDEX = UNKNOWN;
-    /**
-     * @cvalue SQLITE_ANALYZE
-     * @link sqlite3.class.constants.analyze
-     */
+    /** @cvalue SQLITE_ANALYZE */
     public const int ANALYZE = UNKNOWN;
-    /**
-     * @cvalue SQLITE_CREATE_VTABLE
-     * @link sqlite3.class.constants.create-vtable
-     */
+    /** @cvalue SQLITE_CREATE_VTABLE */
     public const int CREATE_VTABLE = UNKNOWN;
-    /**
-     * @cvalue SQLITE_DROP_VTABLE
-     * @link sqlite3.class.constants.drop-vtable
-     */
+    /** @cvalue SQLITE_DROP_VTABLE */
     public const int DROP_VTABLE = UNKNOWN;
-    /**
-     * @cvalue SQLITE_FUNCTION
-     * @link sqlite3.class.constants.function
-     */
+    /** @cvalue SQLITE_FUNCTION */
     public const int FUNCTION = UNKNOWN;
-    /**
-     * @cvalue SQLITE_SAVEPOINT
-     * @link sqlite3.class.constants.savepoint
-     */
+    /** @cvalue SQLITE_SAVEPOINT */
     public const int SAVEPOINT = UNKNOWN;
-    /**
-     * @cvalue SQLITE_COPY
-     * @link sqlite3.class.constants.copy
-     */
+    /** @cvalue SQLITE_COPY */
     public const int COPY = UNKNOWN;
 #ifdef SQLITE_RECURSIVE
-    /**
-     * @cvalue SQLITE_RECURSIVE
-     * @link sqlite3.class.constants.recursive
-     */
+    /** @cvalue SQLITE_RECURSIVE */
     public const int RECURSIVE = UNKNOWN;
 #endif
 
diff --git a/ext/sqlite3/sqlite3_arginfo.h b/ext/sqlite3/sqlite3_arginfo.h
index 46b2fb820a37c..9c813bace265c 100644
--- a/ext/sqlite3/sqlite3_arginfo.h
+++ b/ext/sqlite3/sqlite3_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4474d0a8fb45923895d172af430663932675a4ac */
+ * Stub hash: edf910997672a2b8d8b5c25e8a7a4ff1c135e7b1 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)