yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add nullability to web.common

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-03-29 13:44:21 +02:00
parent 86ae730b1e
commit b52c4e50cf
151 changed files with 731 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Routing/DomainUtilities.cs
View File

@@ -29,7 +29,7 @@ namespace Umbraco.Cms.Core.Routing
/// one document per culture), and domains, withing the context of a current Uri, assign
/// a culture to that document.</para>
/// </remarks>
public static string? GetCultureFromDomains(int contentId, string contentPath, Uri current, IUmbracoContext umbracoContext, ISiteDomainMapper siteDomainMapper)
public static string? GetCultureFromDomains(int contentId, string contentPath, Uri? current, IUmbracoContext umbracoContext, ISiteDomainMapper siteDomainMapper)
{
if (umbracoContext == null)
throw new InvalidOperationException("A current UmbracoContext is required.");
@@ -51,11 +51,11 @@ namespace Umbraco.Cms.Core.Routing
: DomainForNode(umbracoContext.Domains, siteDomainMapper, int.Parse(route.Substring(0, pos), CultureInfo.InvariantCulture), current);
var rootContentId = domain?.ContentId ?? -1;
var wcDomain = FindWildcardDomainInPath(umbracoContext.Domains.GetAll(true), contentPath, rootContentId);
var wcDomain = FindWildcardDomainInPath(umbracoContext.Domains?.GetAll(true), contentPath, rootContentId);
if (wcDomain != null) return wcDomain.Culture;
if (domain != null) return domain.Culture;
return umbracoContext.Domains.DefaultCulture;
return umbracoContext.Domains?.DefaultCulture;
}
#endregion

2
src/Umbraco.Core/Routing/IPublishedRequestBuilder.cs
View File

@@ -69,7 +69,7 @@ namespace Umbraco.Cms.Core.Routing
/// <summary>
/// Sets the culture for the request
/// </summary>
IPublishedRequestBuilder SetCulture(string culture);
IPublishedRequestBuilder SetCulture(string? culture);
/// <summary>
/// Sets the found <see cref="IPublishedContent"/> for the request

2
src/Umbraco.Core/Routing/PublishedRequestBuilder.cs
View File

@@ -94,7 +94,7 @@ namespace Umbraco.Cms.Core.Routing
}
/// <inheritdoc/>
public IPublishedRequestBuilder SetCulture(string culture)
public IPublishedRequestBuilder SetCulture(string? culture)
{
Culture = culture;
return this;