fix tests and use the appropriate logger

Author: dunglas

frankenphp.go

@@ -663,6 +663,7 @@ func go_read_cookies(threadIndex C.uintptr_t) *C.char {
 //export go_log
 func go_log(threadIndex C.uintptr_t, message *C.char, level C.int) {
 	ctx := phpThreads[threadIndex].context()
+	logger := phpThreads[threadIndex].frankenPHPContext().logger
 
 	m := C.GoString(message)
 	le := syslogLevelInfo
@@ -673,47 +674,49 @@ func go_log(threadIndex C.uintptr_t, message *C.char, level C.int) {
 
 	switch le {
 	case syslogLevelEmerg, syslogLevelAlert, syslogLevelCrit, syslogLevelErr:
-		if globalLogger.Enabled(ctx, slog.LevelError) {
-			globalLogger.LogAttrs(ctx, slog.LevelError, m, slog.String("syslog_level", syslogLevel(level).String()))
+		if logger.Enabled(ctx, slog.LevelError) {
+			logger.LogAttrs(ctx, slog.LevelError, m, slog.String("syslog_level", le.String()))
 		}
 
 	case syslogLevelWarn:
-		if globalLogger.Enabled(ctx, slog.LevelWarn) {
-			globalLogger.LogAttrs(ctx, slog.LevelWarn, m, slog.String("syslog_level", syslogLevel(level).String()))
+		if logger.Enabled(ctx, slog.LevelWarn) {
+			logger.LogAttrs(ctx, slog.LevelWarn, m, slog.String("syslog_level", le.String()))
 		}
+
 	case syslogLevelDebug:
-		if globalLogger.Enabled(ctx, slog.LevelDebug) {
-			globalLogger.LogAttrs(ctx, slog.LevelDebug, m, slog.String("syslog_level", syslogLevel(level).String()))
+		if logger.Enabled(ctx, slog.LevelDebug) {
+			logger.LogAttrs(ctx, slog.LevelDebug, m, slog.String("syslog_level", le.String()))
 		}
 
 	default:
-		if globalLogger.Enabled(ctx, slog.LevelInfo) {
-			globalLogger.LogAttrs(ctx, slog.LevelInfo, m, slog.String("syslog_level", syslogLevel(level).String()))
+		if logger.Enabled(ctx, slog.LevelInfo) {
+			logger.LogAttrs(ctx, slog.LevelInfo, m, slog.String("syslog_level", le.String()))
 		}
 	}
 }
 
 //export go_log_attrs
 func go_log_attrs(threadIndex C.uintptr_t, message *C.zend_string, cLevel C.zend_long, cAttrs *C.zval) *C.char {
 	ctx := phpThreads[threadIndex].context()
+	logger := phpThreads[threadIndex].frankenPHPContext().logger
 
 	level := slog.Level(cLevel)
 
-	if !globalLogger.Enabled(ctx, level) {
+	if !logger.Enabled(ctx, level) {
 		return nil
 	}
 
 	var attrs map[string]any
 
 	if cAttrs != nil {
 		var err error
-		if attrs, err = GoMap[any](unsafe.Pointer(cAttrs)); err != nil {
+		if attrs, err = GoMap[any](unsafe.Pointer(*(**C.zend_array)(unsafe.Pointer(&cAttrs.value[0])))); err != nil {
 			// PHP exception message.
 			return C.CString("Failed to log message: converting attrs: " + err.Error())
 		}
 	}
 
-	globalLogger.LogAttrs(ctx, level, GoString(unsafe.Pointer(message)), mapToAttr(attrs)...)
+	logger.LogAttrs(ctx, level, GoString(unsafe.Pointer(message)), mapToAttr(attrs)...)
 
 	return nil
 }