feat: register phpinfo info entries under frankenphp extension

Author: henderkes

caddy/caddy.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
+	"github.com/dunglas/frankenphp"
 )
 
 const (
@@ -26,6 +27,14 @@ func init() {
 	caddy.RegisterModule(FrankenPHPModule{})
 	caddy.RegisterModule(FrankenPHPAdmin{})
 
+	// Report Caddy version in phpinfo()
+	simpleVersion, fullVersion := caddy.Version()
+	if fullVersion != "" {
+		frankenphp.AddPhpinfoEntry("Caddy Version", fullVersion)
+	} else if simpleVersion != "" {
+		frankenphp.AddPhpinfoEntry("Caddy Version", simpleVersion)
+	}
+
 	httpcaddyfile.RegisterGlobalOption("frankenphp", parseGlobalOption)
 
 	httpcaddyfile.RegisterHandlerDirective("php", parseCaddyfile)

cli.go

@@ -9,6 +9,7 @@ import "unsafe"
 func ExecuteScriptCLI(script string, args []string) int {
 	// Ensure extensions are registered before CLI execution
 	registerExtensions()
+	initPhpinfoEntries()
 
 	cScript := C.CString(script)
 	defer C.free(unsafe.Pointer(cScript))
@@ -22,6 +23,7 @@ func ExecuteScriptCLI(script string, args []string) int {
 func ExecutePHPCode(phpCode string) int {
 	// Ensure extensions are registered before CLI execution
 	registerExtensions()
+	initPhpinfoEntries()
 
 	cCode := C.CString(phpCode)
 	defer C.free(unsafe.Pointer(cCode))

frankenphp.c

@@ -6,6 +6,7 @@
 #include <errno.h>
 #include <ext/spl/spl_exceptions.h>
 #include <ext/standard/head.h>
+#include <ext/standard/info.h>
 #ifdef HAVE_PHP_SESSION
 #include <ext/session/php_session.h>
 #endif
@@ -107,6 +108,8 @@ frankenphp_config frankenphp_get_config() {
   };
 }
 
+const char **frankenphp_phpinfo_entries = NULL;
+
 bool should_filter_var = 0;
 bool original_user_abort_setting = 0;
 frankenphp_interned_strings_t frankenphp_strings = {0};
@@ -1101,6 +1104,17 @@ PHP_MINIT_FUNCTION(frankenphp) {
   return SUCCESS;
 }
 
+PHP_MINFO_FUNCTION(frankenphp) {
+  php_info_print_table_start();
+  php_info_print_table_row(2, "Version", TOSTRING(FRANKENPHP_VERSION));
+  if (frankenphp_phpinfo_entries) {
+    for (int i = 0; frankenphp_phpinfo_entries[i] != NULL; i += 2) {
+      php_info_print_table_row(2, frankenphp_phpinfo_entries[i], frankenphp_phpinfo_entries[i + 1]);
+    }
+  }
+  php_info_print_table_end();
+}
+
 static zend_module_entry frankenphp_module = {
     STANDARD_MODULE_HEADER,
     "frankenphp",
@@ -1109,7 +1123,7 @@ static zend_module_entry frankenphp_module = {
     NULL,                  /* shutdown */
     NULL,                  /* request initialization */
     NULL,                  /* request shutdown */
-    NULL,                  /* information */
+    PHP_MINFO(frankenphp), /* information */
     TOSTRING(FRANKENPHP_VERSION),
     STANDARD_MODULE_PROPERTIES};
 

frankenphp.go

@@ -37,7 +37,7 @@ import (
 	"time"
 	"unsafe"
 	// debug on Linux
-	//_ "github.com/ianlancetaylor/cgosymbolizer"
+	// _ "github.com/ianlancetaylor/cgosymbolizer"
 )
 
 type contextKeyStruct struct{}
@@ -156,6 +156,22 @@ func Config() PHPConfig {
 	}
 }
 
+var phpinfoEntries []*C.char
+
+func AddPhpinfoEntry(key, value string) {
+	cKey := C.CString(key)
+	cValue := C.CString(value)
+	phpinfoEntries = append(phpinfoEntries, cKey, cValue)
+}
+
+func initPhpinfoEntries() {
+	if len(phpinfoEntries) == 0 {
+		return
+	}
+	phpinfoEntries = append(phpinfoEntries, nil)
+	C.frankenphp_phpinfo_entries = (**C.char)(unsafe.Pointer(&phpinfoEntries[0]))
+}
+
 func calculateMaxThreads(opt *opt) (numWorkers int, _ error) {
 	maxProcs := runtime.GOMAXPROCS(0) * 2
 	maxThreadsFromWorkers := 0
@@ -250,6 +266,7 @@ func Init(options ...Option) error {
 	signal.Ignore(syscall.SIGPIPE)
 
 	registerExtensions()
+	initPhpinfoEntries()
 
 	opt := &opt{}
 	for _, o := range options {

frankenphp.h

@@ -74,6 +74,9 @@ typedef struct {
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
 
+/* phpinfo entries from Go - null-terminated array of key, value, key, value, ... */
+extern const char **frankenphp_phpinfo_entries;
+
 typedef struct go_string {
   size_t len;
   char *data;