Cleaned up some warnings from the static analyzer #122
Conversation
| @@ -638,7 +638,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS | |||
| @param objects The list of objects to fetch. | |||
| @param error Pointer to an `NSError` that will be set if necessary. | |||
| */ | |||
| + (void)fetchAllIfNeeded:(PF_NULLABLE NSArray *)objects error:(NSError **)error; | |||
| + (instancetype)fetchAllIfNeeded:(PF_NULLABLE NSArray *)objects error:(NSError **)error; | |||
There was a problem hiding this comment.
This one should have an NSArray return type, since the block has an NSArray as a result.
| @@ -1110,7 +1110,7 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *) | |||
| if (localOperationSet.updatedAt != nil && | |||
| [localOperationSet.updatedAt compare:remoteOperationSet.updatedAt] != NSOrderedAscending) { | |||
| [localOperationSet mergeOperationSet:remoteOperationSet]; | |||
| } else { | |||
| } else if (remoteOperationSet) { | |||
There was a problem hiding this comment.
This one is actually very tricky, since remoteOperationSet should always be here, according to the logic above.
Maybe replace it with PFConsistencyAssert with a useful error message?
I just checked locally - it actually supresses the analyzer warning if you have an assert here.
There was a problem hiding this comment.
Yeah, I wasn't too sure about that either. I'll go ahead and do that instead!
|
@gonzalonunez, almost there... |
|
Should've fixed it all. Waiting to make sure Travis doesn't fail. |
|
Seems to be missing something. Checking over it now. |
|
Looks like it's related to |
|
Ow, right... Those methods are declared also in |
|
Ah, great catch. I'll go ahead and change those now. Thanks for the tip, would've taken me all night! Lol |
| @@ -1111,6 +1111,7 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *) | |||
| [localOperationSet.updatedAt compare:remoteOperationSet.updatedAt] != NSOrderedAscending) { | |||
| [localOperationSet mergeOperationSet:remoteOperationSet]; | |||
| } else { | |||
| PFConsistencyAssert(remoteOperationSet, @"'remoteOperationSet' should not be nil."); | |||
|
@gonzalonunez, almost there, a single change around |
|
Fixed the issue in PFUser.m and squashed the commits 🙌 |
|
Looks perfect! Merging now! |
Cleaned up some warnings from the static analyzer
Fixes #121