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.Web.Common/ModelBinders/ContentModelBinder.cs
View File

@@ -32,7 +32,7 @@ namespace Umbraco.Cms.Web.Common.ModelBinders
// only IPublishedContent will ever exist in the request so when this model binder is used as an IModelBinder
// in the aspnet pipeline it will really only support converting from IPublishedContent which is contained
// in the UmbracoRouteValues --> IContentModel
UmbracoRouteValues umbracoRouteValues = bindingContext.HttpContext.Features.Get<UmbracoRouteValues>();
UmbracoRouteValues? umbracoRouteValues = bindingContext.HttpContext.Features.Get<UmbracoRouteValues>();
if (umbracoRouteValues is null)
{
return Task.CompletedTask;
@@ -53,7 +53,7 @@ namespace Umbraco.Cms.Web.Common.ModelBinders
/// <summary>
/// Attempts to bind the model
/// </summary>
public void BindModel(ModelBindingContext bindingContext, object source, Type modelType)
public void BindModel(ModelBindingContext bindingContext, object? source, Type modelType)
{
// Null model, return
if (source == null)
@@ -124,7 +124,7 @@ namespace Umbraco.Cms.Web.Common.ModelBinders
}
// Last chance : try to convert
Attempt<object> attempt2 = source.TryConvertTo(modelType);
Attempt<object?> attempt2 = source.TryConvertTo(modelType);
if (attempt2.Success)
{
bindingContext.Result = ModelBindingResult.Success(attempt2.Result);

2
src/Umbraco.Web.Common/ModelBinders/ContentModelBinderProvider.cs
View File

@@ -10,7 +10,7 @@ namespace Umbraco.Cms.Web.Common.ModelBinders
/// </summary>
public class ContentModelBinderProvider : IModelBinderProvider
{
public IModelBinder GetBinder(ModelBinderProviderContext context)
public IModelBinder? GetBinder(ModelBinderProviderContext context)
{
var modelType = context.Metadata.ModelType;