Merge branch 'release/16.0'

# Conflicts:
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs

Author: Zeegaan

src/Umbraco.Core/Configuration/Models/DeliveryApiSettings.cs

@@ -144,7 +144,7 @@ public class AuthorizationCodeFlowSettings
         /// <value>
         /// The URLs allowed as redirect targets.
         /// </value>
-        public ISet<Uri> LoginRedirectUrls { get; set; } = new HashSet<Uri>();
+        public IEnumerable<Uri> LoginRedirectUrls { get; set; } = [];
 
         /// <summary>
         ///     Gets or sets the URLs allowed to use as redirect targets after a successful logout (session termination).
@@ -155,7 +155,7 @@ public class AuthorizationCodeFlowSettings
         /// <remarks>
         /// These are only required if logout is to be used.
         /// </remarks>
-        public ISet<Uri> LogoutRedirectUrls { get; set; } = new HashSet<Uri>();
+        public IEnumerable<Uri> LogoutRedirectUrls { get; set; } = [];
     }
 
     /// <summary>

src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs

@@ -98,5 +98,5 @@ public class RequestHandlerSettings
     /// <summary>
     ///     Add additional character replacements, or override defaults
     /// </summary>
-    public ISet<CharItem> UserDefinedCharCollection { get; set; } = new HashSet<CharItem>();
+    public IEnumerable<CharItem> UserDefinedCharCollection { get; set; } = [];
 }

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs

@@ -95,7 +95,12 @@ internal static void AddAllCoreCollectionBuilders(this IUmbracoBuilder builder)
         builder.ContentIndexHandlers().Add(() => builder.TypeLoader.GetTypes<IContentIndexHandler>());
 
         WebhookPayloadType webhookPayloadType = Constants.Webhooks.DefaultPayloadType;
-        if (builder.Config.GetSection(Constants.Configuration.ConfigWebhookPayloadType).Value is not null)
+
+        // IntelliSense indicates that GetSection cannot return null. However, in certain unit test setups,
+        // the configuration may not be fully initialized, leading to GetSection returning null. This null
+        // check ensures that the code behaves correctly in such scenarios and prevents potential null
+        // reference exceptions during testing.
+        if (builder.Config.GetSection(Constants.Configuration.ConfigWebhookPayloadType)?.Value is not null)
         {
             webhookPayloadType = builder.Config.GetValue<WebhookPayloadType>(Constants.Configuration.ConfigWebhookPayloadType);
         }

src/Umbraco.Core/Services/ContentService.cs

@@ -1108,14 +1108,8 @@ public OperationResult Save(IContent content, int? userId = null, ContentSchedul
 
             if (culturesChanging != null)
             {
-                IEnumerable<string>? languages = _languageRepository.GetMany()?
-                    .Where(x => culturesChanging.InvariantContains(x.IsoCode))
-                    .Select(x => x.CultureName);
-                if (languages is not null)
-                {
-                    var langs = string.Join(", ", languages);
-                    Audit(AuditType.SaveVariant, userId.Value, content.Id, $"Saved languages: {langs}", langs);
-                }
+                var langs = GetLanguageDetailsForAuditEntry(culturesChanging);
+                Audit(AuditType.SaveVariant, userId.Value, content.Id, $"Saved languages: {langs}", langs);
             }
             else
             {
@@ -1625,9 +1619,7 @@ void SaveDocument(IContent c)
                 if (culturesUnpublishing != null)
                 {
                     // This will mean that that we unpublished a mandatory culture or we unpublished the last culture.
-                    var langs = string.Join(", ", allLangs
-                        .Where(x => culturesUnpublishing.InvariantContains(x.IsoCode))
-                        .Select(x => x.CultureName));
+                    var langs = GetLanguageDetailsForAuditEntry(allLangs, culturesUnpublishing);
                     Audit(AuditType.UnpublishVariant, userId, content.Id, $"Unpublished languages: {langs}", langs);
 
                     if (publishResult == null)
@@ -1707,19 +1699,15 @@ void SaveDocument(IContent c)
                     case PublishResultType.SuccessPublishCulture:
                         if (culturesPublishing != null)
                         {
-                            var langs = string.Join(", ", allLangs
-                                .Where(x => culturesPublishing.InvariantContains(x.IsoCode))
-                                .Select(x => x.CultureName));
+                            var langs = GetLanguageDetailsForAuditEntry(allLangs, culturesPublishing);
                             Audit(AuditType.PublishVariant, userId, content.Id, $"Published languages: {langs}", langs);
                         }
 
                         break;
                     case PublishResultType.SuccessUnpublishCulture:
                         if (culturesUnpublishing != null)
                         {
-                            var langs = string.Join(", ", allLangs
-                                .Where(x => culturesUnpublishing.InvariantContains(x.IsoCode))
-                                .Select(x => x.CultureName));
+                            var langs = GetLanguageDetailsForAuditEntry(allLangs, culturesUnpublishing);
                             Audit(AuditType.UnpublishVariant, userId, content.Id, $"Unpublished languages: {langs}", langs);
                         }
 
@@ -1741,9 +1729,7 @@ void SaveDocument(IContent c)
         {
             if (culturesChanging != null)
             {
-                var langs = string.Join(", ", allLangs
-                    .Where(x => culturesChanging.InvariantContains(x.IsoCode))
-                    .Select(x => x.CultureName));
+                var langs = GetLanguageDetailsForAuditEntry(allLangs, culturesChanging);
                 Audit(AuditType.SaveVariant, userId, content.Id, $"Saved languages: {langs}", langs);
             }
             else
@@ -3098,6 +3084,17 @@ internal IEnumerable<IContent> GetPublishedDescendantsLocked(IContent content)
     private void Audit(AuditType type, int userId, int objectId, string? message = null, string? parameters = null) =>
         _auditRepository.Save(new AuditItem(objectId, type, userId, UmbracoObjectTypes.Document.GetName(), message, parameters));
 
+    private string GetLanguageDetailsForAuditEntry(IEnumerable<string> affectedCultures)
+        => GetLanguageDetailsForAuditEntry(_languageRepository.GetMany(), affectedCultures);
+
+    private static string GetLanguageDetailsForAuditEntry(IEnumerable<ILanguage> languages, IEnumerable<string> affectedCultures)
+    {
+        IEnumerable<string> languageIsoCodes = languages
+            .Where(x => affectedCultures.InvariantContains(x.IsoCode))
+            .Select(x => x.IsoCode);
+        return string.Join(", ", languageIsoCodes);
+    }
+
     private static bool IsDefaultCulture(IReadOnlyCollection<ILanguage>? langs, string culture) =>
         langs?.Any(x => x.IsDefault && x.IsoCode.InvariantEquals(culture)) ?? false;