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

Use dependency injection for config classes

Browse Source
This commit is contained in:
Benjamin Carleski
2020-01-21 17:03:46 -08:00
parent 1bf1a86f94
commit fd3ef48367
42 changed files with 230 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
View File

@@ -1,10 +1,10 @@
using System;
using System.Threading.Tasks;
using Umbraco.Core;
using Umbraco.Web.Composing;
using Umbraco.Core.Logging;
using Umbraco.Core.Migrations.Install;
using Umbraco.Web.Install.Models;
using Umbraco.Core.Configuration;
namespace Umbraco.Web.Install.InstallSteps
{
@@ -15,10 +15,12 @@ namespace Umbraco.Web.Install.InstallSteps
{
private readonly DatabaseBuilder _databaseBuilder;
private readonly ILogger _logger;
private readonly IConnectionStrings _connectionStrings;
public DatabaseConfigureStep(DatabaseBuilder databaseBuilder)
public DatabaseConfigureStep(DatabaseBuilder databaseBuilder, IConnectionStrings connectionStrings)
{
_databaseBuilder = databaseBuilder;
_connectionStrings = connectionStrings ?? throw new ArgumentNullException(nameof(connectionStrings));
}
public override Task<InstallSetupResult> ExecuteAsync(DatabaseModel database)
@@ -72,7 +74,7 @@ namespace Umbraco.Web.Install.InstallSteps
private bool ShouldDisplayView()
{
//If the connection string is already present in web.config we don't need to show the settings page and we jump to installing/upgrading.
var databaseSettings = Current.Configs.ConnectionStrings()[Constants.System.UmbracoConnectionName];
var databaseSettings = _connectionStrings[Constants.System.UmbracoConnectionName];
if (databaseSettings.IsConnectionStringConfigured())
{