space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some code that I forgot to change to help IoC instantiate protected constructors.

Browse Source
This commit is contained in:
Acruid
2021-11-17 02:07:35 -08:00
parent e1b9327ec0
commit 424e0768c8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Robust.Shared/IoC/DependencyCollection.cs
View File

@@ -82,11 +82,12 @@ namespace Robust.Shared.IoC
Register<TInterface, TImplementation>(() =>
{
var objectType = typeof(TImplementation);
var constructors = objectType.GetConstructors();
var constructors = objectType.GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
if (constructors.Length != 1)
throw new InvalidOperationException($"Dependency '{typeof(TImplementation).FullName}' requires exactly one constructor.");
var chosenConstructor = constructors[0];
var constructorParams = constructors[0].GetParameters();
var parameters = new object[constructorParams.Length];
@@ -109,7 +110,7 @@ namespace Robust.Shared.IoC
}
}
return (TImplementation) Activator.CreateInstance(objectType, parameters)!;
return (TImplementation) chosenConstructor.Invoke(parameters);
}, overwrite);
}
@@ -142,7 +143,8 @@ namespace Robust.Shared.IoC
if (constructors.Length != 1)
throw new InvalidOperationException($"Dependency '{implementation.FullName}' requires exactly one constructor.");
var constructorParams = constructors[0].GetParameters();
var chosenConstructor = constructors[0];
var constructorParams = chosenConstructor.GetParameters();
var parameters = new object[constructorParams.Length];
for (var index = 0; index < constructorParams.Length; index++)
@@ -164,7 +166,7 @@ namespace Robust.Shared.IoC
}
}
return Activator.CreateInstance(implementation, parameters)!;
return chosenConstructor.Invoke(parameters);
}
_resolveTypes[interfaceType] = implementation;