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

Inject IFactory and ILogger more places

Browse Source
This commit is contained in:
Nikolaj
2020-09-15 15:42:04 +02:00
parent 633d42039e
commit 4492d48aef
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
View File

@@ -29,13 +29,14 @@ namespace Umbraco.Tests.Integration.TestServerTest
AppCaches.NoCache, // Disable caches in integration tests
testHelper.GetLoggingConfiguration(),
// TODO: Yep that's extremely ugly
(configs, umbVersion, ioHelper, logger, profiler, hostingEnv, backOfficeInfo, typeFinder, appCaches, dbProviderFactoryCreator) =>
(configs, umbVersion, ioHelper, logger, factory, profiler, hostingEnv, backOfficeInfo, typeFinder, appCaches, dbProviderFactoryCreator) =>
{
var runtime = UmbracoIntegrationTest.CreateTestRuntime(
configs,
umbVersion,
ioHelper,
logger,
factory,
profiler,
hostingEnv,
backOfficeInfo,

10
src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
View File

@@ -2,6 +2,7 @@
using System.Linq;
using System.Web.Mvc;
using System.Web.Routing;
using Microsoft.Extensions.Logging;
using Moq;
using NUnit.Framework;
using Umbraco.Core;
@@ -50,7 +51,7 @@ namespace Umbraco.Tests.Routing
public class TestRuntime : CoreRuntime
{
public TestRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
: base(configs, umbracoVersion, ioHelper, Mock.Of<ILogger>(), Mock.Of<IProfiler>(), new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, TestHelper.GetTypeFinder(), AppCaches.NoCache)
: base(configs, umbracoVersion, ioHelper, Mock.Of<ILogger>(), Mock.Of<ILoggerFactory>(), Mock.Of<IProfiler>(), new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, TestHelper.GetTypeFinder(), AppCaches.NoCache)
{
}
@@ -153,7 +154,8 @@ namespace Umbraco.Tests.Routing
umbracoContextAccessor,
Factory.GetInstance<ServiceContext>(),
Factory.GetInstance<AppCaches>(),
Factory.GetInstance<IProfilingLogger>());
Factory.GetInstance<IProfilingLogger>(),
Factory.GetInstance<ILogger>());
}), ShortStringHelper);
handler.GetHandlerForRoute(httpContext.Request.RequestContext, frequest);
@@ -190,8 +192,8 @@ namespace Umbraco.Tests.Routing
/// </summary>
public class CustomDocumentController : RenderMvcController
{
public CustomDocumentController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
public CustomDocumentController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, ILogger logger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, logger)
{
}

3
src/Umbraco.Web/Editors/BackOfficeController.cs
View File

@@ -44,12 +44,13 @@ namespace Umbraco.Web.Editors
ServiceContext services,
AppCaches appCaches,
IProfilingLogger profilingLogger,
ILogger logger,
IUmbracoVersion umbracoVersion,
IContentSettings contentSettings,
IHostingEnvironment hostingEnvironment,
IRuntimeSettings settings,
ISecuritySettings securitySettings)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, logger)
{
_features = features;

4
src/Umbraco.Web/Mvc/RenderMvcController.cs
View File

@@ -25,8 +25,8 @@ namespace Umbraco.Web.Mvc
ActionInvoker = new RenderActionInvoker();
}
public RenderMvcController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
public RenderMvcController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, ILogger logger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, logger)
{
ActionInvoker = new RenderActionInvoker();
}

4
src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
View File

@@ -21,8 +21,8 @@ namespace Umbraco.Web.Mvc
{
}
protected UmbracoAuthorizedController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
protected UmbracoAuthorizedController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, ILogger logger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, logger)
{
}
}