Merge pull request #122 from gonzalonunez/analyzer

Cleaned up some warnings from the static analyzer

Author: nlutsenko

Parse/Internal/Object/PFObjectPrivate.h

@@ -86,8 +86,8 @@
 #if PARSE_OSX_ONLY
 // Not available publicly, but available for testing
 
-- (void)refresh;
-- (void)refresh:(NSError **)error;
+- (instancetype)refresh;
+- (instancetype)refresh:(NSError **)error;
 - (void)refreshInBackgroundWithBlock:(PFObjectResultBlock)block;
 - (void)refreshInBackgroundWithTarget:(id)target selector:(SEL)selector;
 

Parse/PFObject.h

@@ -504,7 +504,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
 
  @deprecated Please use `-fetch` instead.
  */
-- (void)refresh PARSE_DEPRECATED("Please use `-fetch` instead.");
+- (instancetype)refresh PARSE_DEPRECATED("Please use `-fetch` instead.");
 
 /*!
  @abstract *Synchronously* refreshes the `PFObject` with the current data from the server and sets an error if it occurs.
@@ -513,7 +513,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
 
  @deprecated Please use `-fetch:` instead.
  */
-- (void)refresh:(NSError **)error PARSE_DEPRECATED("Please use `-fetch:` instead.");
+- (instancetype)refresh:(NSError **)error PARSE_DEPRECATED("Please use `-fetch:` instead.");
 
 /*!
  @abstract *Asynchronously* refreshes the `PFObject` and executes the given callback block.
@@ -544,13 +544,13 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
 /*!
  @abstract *Synchronously* fetches the PFObject with the current data from the server.
  */
-- (void)fetch;
+- (instancetype)fetch;
 /*!
  @abstract *Synchronously* fetches the PFObject with the current data from the server and sets an error if it occurs.
 
  @param error Pointer to an `NSError` that will be set if necessary.
  */
-- (void)fetch:(NSError **)error;
+- (instancetype)fetch:(NSError **)error;
 
 /*!
  @abstract *Synchronously* fetches the `PFObject` data from the server if <isDataAvailable> is `NO`.
@@ -627,7 +627,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
 
  @param objects The list of objects to fetch.
  */
-+ (void)fetchAll:(PF_NULLABLE NSArray *)objects;
++ (NSArray *)fetchAll:(PF_NULLABLE NSArray *)objects;
 
 /*!
  @abstract *Synchronously* fetches all of the `PFObject` objects with the current data from the server
@@ -636,13 +636,13 @@ 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)fetchAll:(PF_NULLABLE NSArray *)objects error:(NSError **)error;
++ (NSArray *)fetchAll:(PF_NULLABLE NSArray *)objects error:(NSError **)error;
 
 /*!
  @abstract *Synchronously* fetches all of the `PFObject` objects with the current data from the server.
  @param objects The list of objects to fetch.
  */
-+ (void)fetchAllIfNeeded:(PF_NULLABLE NSArray *)objects;
++ (NSArray *)fetchAllIfNeeded:(PF_NULLABLE NSArray *)objects;
 
 /*!
  @abstract *Synchronously* fetches all of the `PFObject` objects with the current data from the server
@@ -651,7 +651,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;
++ (NSArray *)fetchAllIfNeeded:(PF_NULLABLE NSArray *)objects error:(NSError **)error;
 
 /*!
  @abstract Fetches all of the `PFObject` objects with the current data from the server *asynchronously*.
@@ -731,7 +731,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
  @abstract *Synchronously* loads data from the local datastore into this object,
  if it has not been fetched from the server already.
  */
-- (void)fetchFromLocalDatastore;
+- (instancetype)fetchFromLocalDatastore;
 
 /*!
  @abstract *Synchronously* loads data from the local datastore into this object, if it has not been fetched
@@ -742,7 +742,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
 
  @param error Pointer to an `NSError` that will be set if necessary.
  */
-- (void)fetchFromLocalDatastore:(NSError **)error;
+- (instancetype)fetchFromLocalDatastore:(NSError **)error;
 
 /*!
  @abstract *Asynchronously* loads data from the local datastore into this object,

Parse/PFObject.m

@@ -1110,6 +1110,7 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)
                     [localOperationSet.updatedAt compare:remoteOperationSet.updatedAt] != NSOrderedAscending) {
                     [localOperationSet mergeOperationSet:remoteOperationSet];
                 } else {
+                    PFConsistencyAssert(remoteOperationSet, @"'remoteOperationSet' should not be nil.");
                     NSUInteger index = [operationSetQueue indexOfObject:localOperationSet];
                     [remoteOperationSet mergeOperationSet:localOperationSet];
                     [operationSetQueue replaceObjectAtIndex:index withObject:remoteOperationSet];
@@ -2097,12 +2098,12 @@ - (BOOL)isDataAvailable {
     return self._state.complete;
 }
 
-- (void)refresh {
-    [self fetch];
+- (instancetype)refresh {
+    return [self fetch];
 }
 
-- (void)refresh:(NSError **)error {
-    [self fetch:error];
+- (instancetype)refresh:(NSError **)error {
+    return [self fetch:error];
 }
 
 - (void)refreshInBackgroundWithTarget:(id)target selector:(SEL)selector {
@@ -2113,12 +2114,12 @@ - (void)refreshInBackgroundWithBlock:(PFObjectResultBlock)block {
     [self fetchInBackgroundWithBlock:block];
 }
 
-- (void)fetch {
-    [self fetch:nil];
+- (instancetype)fetch {
+    return [self fetch:nil];
 }
 
-- (void)fetch:(NSError **)error {
-    [[self fetchInBackground] waitForResult:error];
+- (instancetype)fetch:(NSError **)error {
+    return [[self fetchInBackground] waitForResult:error];
 }
 
 - (BFTask *)fetchInBackground {
@@ -2171,20 +2172,20 @@ - (void)fetchIfNeededInBackgroundWithTarget:(id)target selector:(SEL)selector {
 #pragma mark - Fetching Many Objects
 ///--------------------------------------
 
-+ (void)fetchAll:(NSArray *)objects {
-    [PFObject fetchAll:objects error:nil];
++ (NSArray *)fetchAll:(NSArray *)objects {
+    return [PFObject fetchAll:objects error:nil];
 }
 
-+ (void)fetchAllIfNeeded:(NSArray *)objects {
-    [PFObject fetchAllIfNeeded:objects error:nil];
++ (NSArray *)fetchAllIfNeeded:(NSArray *)objects {
+    return [PFObject fetchAllIfNeeded:objects error:nil];
 }
 
-+ (void)fetchAll:(NSArray *)objects error:(NSError **)error {
-    [[self fetchAllInBackground:objects] waitForResult:error];
++ (NSArray *)fetchAll:(NSArray *)objects error:(NSError **)error {
+    return [[self fetchAllInBackground:objects] waitForResult:error];
 }
 
-+ (void)fetchAllIfNeeded:(NSArray *)objects error:(NSError **)error {
-    [[self fetchAllIfNeededInBackground:objects] waitForResult:error];
++ (NSArray *)fetchAllIfNeeded:(NSArray *)objects error:(NSError **)error {
+    return [[self fetchAllIfNeededInBackground:objects] waitForResult:error];
 }
 
 + (BFTask *)fetchAllInBackground:(NSArray *)objects {
@@ -2245,12 +2246,12 @@ + (void)fetchAllIfNeededInBackground:(NSArray *)objects block:(PFArrayResultBloc
 #pragma mark - Fetch From Local Datastore
 ///--------------------------------------
 
-- (void)fetchFromLocalDatastore {
-    [self fetchFromLocalDatastore:nil];
+- (instancetype)fetchFromLocalDatastore {
+    return [self fetchFromLocalDatastore:nil];
 }
 
-- (void)fetchFromLocalDatastore:(NSError **)error {
-    [[self fetchFromLocalDatastoreInBackground] waitForResult:error];
+- (instancetype)fetchFromLocalDatastore:(NSError **)error {
+    return [[self fetchFromLocalDatastoreInBackground] waitForResult:error];
 }
 
 - (void)fetchFromLocalDatastoreInBackgroundWithBlock:(PFObjectResultBlock)block {

Parse/PFUser.m

@@ -1098,11 +1098,11 @@ - (BFTask *)fetchAsync:(BFTask *)toAwait {
     }];
 }
 
-- (void)fetch:(NSError **)error {
+- (instancetype)fetch:(NSError **)error {
     if (self.isLazy) {
-        return;
+        return self;
     }
-    [super fetch:error];
+    return [super fetch:error];
 }
 
 - (void)fetchInBackgroundWithBlock:(PFObjectResultBlock)block {