From 830ee8501169c9752891ff5b62c83caf8a35a8d2 Mon Sep 17 00:00:00 2001 From: Michael Baltaks Date: Tue, 22 Oct 2013 12:16:17 +1100 Subject: [PATCH 1/3] Use correct NSNumber method for incoming type. --- .../TypeConversion/Converters/TyphoonPrimitiveTypeConverter.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/TypeConversion/Converters/TyphoonPrimitiveTypeConverter.m b/Source/TypeConversion/Converters/TyphoonPrimitiveTypeConverter.m index 25ce22f6b..758a31874 100644 --- a/Source/TypeConversion/Converters/TyphoonPrimitiveTypeConverter.m +++ b/Source/TypeConversion/Converters/TyphoonPrimitiveTypeConverter.m @@ -81,7 +81,7 @@ - (unsigned long)convertToUnsignedLong:(NSString*)stringValue NSScanner* scanner = [[NSScanner alloc] initWithString:stringValue]; long long converted = 0; [scanner scanLongLong:&converted]; - return [[NSNumber numberWithLong:converted] unsignedLongValue]; + return [[NSNumber numberWithLongLong:converted] unsignedLongValue]; } - (unsigned long long)convertToUnsignedLongLong:(NSString*)stringValue @@ -204,4 +204,4 @@ - (void)setPrimitiveArgumentFor:(NSInvocation*)invocation index:(NSUInteger)inde } -@end \ No newline at end of file +@end From cd4b38d91334ae888f29d7426e9dee65a35e1375 Mon Sep 17 00:00:00 2001 From: Michael Baltaks Date: Tue, 22 Oct 2013 12:18:54 +1100 Subject: [PATCH 2/3] Don't return a nil object pointer as a TyphoonCollectionType --- .../Collection/TyphoonPropertyInjectedAsCollection.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Component/Properties/Collection/TyphoonPropertyInjectedAsCollection.m b/Source/Component/Properties/Collection/TyphoonPropertyInjectedAsCollection.m index b2686d5fb..64a3c7048 100644 --- a/Source/Component/Properties/Collection/TyphoonPropertyInjectedAsCollection.m +++ b/Source/Component/Properties/Collection/TyphoonPropertyInjectedAsCollection.m @@ -70,7 +70,7 @@ - (TyphoonCollectionType)resolveCollectionTypeWith:(id Date: Tue, 22 Oct 2013 12:19:50 +1100 Subject: [PATCH 3/3] Don't return a nil object pointer as a TyphoonCollectionType --- .../Collection/TyphoonParameterInjectedAsCollection.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Component/Initializer/Collection/TyphoonParameterInjectedAsCollection.m b/Source/Component/Initializer/Collection/TyphoonParameterInjectedAsCollection.m index c998377ad..472fe0d16 100644 --- a/Source/Component/Initializer/Collection/TyphoonParameterInjectedAsCollection.m +++ b/Source/Component/Initializer/Collection/TyphoonParameterInjectedAsCollection.m @@ -66,7 +66,7 @@ -(TyphoonCollectionType)collectionType { [NSException raise:NSInvalidArgumentException format:@"Required collection type '%@' is neither an NSSet nor NSArray.", NSStringFromClass(clazz)]; - return nil; + return 0; } @end