update IResolver

Author: gustavopsantos

Assets/Reflex/Resolvers/IResolver.cs

@@ -7,6 +7,6 @@ namespace Reflex.Resolvers
     public interface IResolver : IDisposable
     {
         Lifetime Lifetime { get; }
-        object Resolve(Container container);
+        object Resolve(Container resolvingContainer);
     }
 }

Assets/Reflex/Resolvers/ScopedFactoryResolver.cs

@@ -17,15 +17,15 @@ public ScopedFactoryResolver(Func<Container, object> factory)
             _factory = factory;
         }
 
-        public object Resolve(Container container)
+        public object Resolve(Container resolvingContainer)
         {
             Diagnosis.IncrementResolutions(this);
 
-            if (!_instances.TryGetValue(container, out var instance))
+            if (!_instances.TryGetValue(resolvingContainer, out var instance))
             {
-                instance = _factory.Invoke(container);
-                _instances.Add(container, instance);
-                container.Disposables.TryAdd(instance);
+                instance = _factory.Invoke(resolvingContainer);
+                _instances.Add(resolvingContainer, instance);
+                resolvingContainer.Disposables.TryAdd(instance);
                 Diagnosis.RegisterInstance(this, instance);
             }
 

Assets/Reflex/Resolvers/ScopedTypeResolver.cs

@@ -17,15 +17,15 @@ public ScopedTypeResolver(Type concreteType)
             _concreteType = concreteType;
         }
 
-        public object Resolve(Container container)
+        public object Resolve(Container resolvingContainer)
         {
             Diagnosis.IncrementResolutions(this);
 
-            if (!_instances.TryGetValue(container, out var instance))
+            if (!_instances.TryGetValue(resolvingContainer, out var instance))
             {
-                instance = container.Construct(_concreteType);
-                _instances.Add(container, instance);
-                container.Disposables.TryAdd(instance);
+                instance = resolvingContainer.Construct(_concreteType);
+                _instances.Add(resolvingContainer, instance);
+                resolvingContainer.Disposables.TryAdd(instance);
                 Diagnosis.RegisterInstance(this, instance);
             }
 

Assets/Reflex/Resolvers/SingletonFactoryResolver.cs

@@ -19,13 +19,13 @@ public SingletonFactoryResolver(Func<Container, object> factory)
             _factory = factory;
         }
 
-        public object Resolve(Container container)
+        public object Resolve(Container resolvingContainer)
         {
             Diagnosis.IncrementResolutions(this);
 
             if (_instance == null)
             {
-                _instance = _factory.Invoke(container);
+                _instance = _factory.Invoke(resolvingContainer);
                 _disposables.TryAdd(_instance);
                 Diagnosis.RegisterInstance(this, _instance);
             }

Assets/Reflex/Resolvers/SingletonTypeResolver.cs

@@ -18,13 +18,13 @@ public SingletonTypeResolver(Type concreteType)
             _concreteType = concreteType;
         }
 
-        public object Resolve(Container container)
+        public object Resolve(Container resolvingContainer)
         {
             Diagnosis.IncrementResolutions(this);
 
             if (_instance == null)
             {
-                _instance = container.Construct(_concreteType);
+                _instance = resolvingContainer.Construct(_concreteType);
                 _disposables.TryAdd(_instance);
                 Diagnosis.RegisterInstance(this, _instance);
             }

Assets/Reflex/Resolvers/SingletonValueResolver.cs

@@ -18,7 +18,7 @@ public SingletonValueResolver(object value)
             _disposables.TryAdd(value);
         }
 
-        public object Resolve(Container container)
+        public object Resolve(Container resolvingContainer)
         {
             Diagnosis.IncrementResolutions(this);
             return _value;

Assets/Reflex/Resolvers/TransientFactoryResolver.cs

@@ -15,11 +15,11 @@ public TransientFactoryResolver(Func<Container, object> factory)
             _factory = factory;
         }
 
-        public object Resolve(Container container)
+        public object Resolve(Container resolvingContainer)
         {
             Diagnosis.IncrementResolutions(this);
-            var instance = _factory.Invoke(container);
-            container.Disposables.TryAdd(instance);
+            var instance = _factory.Invoke(resolvingContainer);
+            resolvingContainer.Disposables.TryAdd(instance);
             Diagnosis.RegisterInstance(this, instance);
             return instance;
         }

Assets/Reflex/Resolvers/TransientTypeResolver.cs

@@ -15,11 +15,11 @@ public TransientTypeResolver(Type concreteType)
             _concreteType = concreteType;
         }
 
-        public object Resolve(Container container)
+        public object Resolve(Container resolvingContainer)
         {
             Diagnosis.IncrementResolutions(this);
-            var instance = container.Construct(_concreteType);
-            container.Disposables.TryAdd(instance);
+            var instance = resolvingContainer.Construct(_concreteType);
+            resolvingContainer.Disposables.TryAdd(instance);
             Diagnosis.RegisterInstance(this, instance);
             return instance;
         }