Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/Resolve.swift
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ extension DependencyContainer {

//if no definition registered for exact type try to find type-forwarding definition that can resolve the type
//that will actually happen only when resolving optionals
if definitions.filter({ $0.0.type == key.type }).isEmpty {
guard definitions.contains(where: { $0.0.type == key.type }) else {
return typeForwardingDefinition(forKey: key)
}
return nil
Expand Down
8 changes: 4 additions & 4 deletions Tests/DipTests/AutoInjectionTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ private class ClientImp: Client {

@Injected(didInject: { _ in
AutoInjectionTests.serverDidInjectCalled = true
}) var server: Server
}) var server: Server?

@Injected(required: false) var _optionalProperty: AnyObject?

@Injected(tag: "tagged") var taggedServer: Server
@Injected(tag: nil) var nilTaggedServer: Server
@Injected(tag: "tagged") var taggedServer: Server?
@Injected(tag: nil) var nilTaggedServer: Server?

var anotherServer: Server!
}
Expand Down