proper ARC modifier for NSError**

Author: flovilmart

Parse/Parse/Internal/Commands/PFRESTQueryCommand.m

@@ -209,7 +209,7 @@ + (nullable NSDictionary *)findCommandParametersWithOrder:(NSString *)order
     return parameters;
 }
 
-+ (nullable id)_encodeSubqueryIfNeeded:(id)object error:(NSError **)error {
++ (nullable id)_encodeSubqueryIfNeeded:(id)object error:(NSError * __autoreleasing *)error {
     if (![object isKindOfClass:[NSDictionary class]]) {
         return object;
     }

Parse/Parse/Internal/Object/LocalIdStore/PFObjectLocalIdStore.m

@@ -134,7 +134,7 @@ + (BOOL)isLocalId:(NSString *)localId {
 /**
  * Grabs one entry in the local id map off the disk.
  */
-- (PFObjectLocalIdStoreMapEntry *)getMapEntry:(NSString *)localId error:(NSError **) error {
+- (PFObjectLocalIdStoreMapEntry *)getMapEntry:(NSString *)localId error:(NSError * __autoreleasing *) error {
 
     PFConsistencyError(error, [[self class] isLocalId:localId], nil, @"Tried to get invalid local id: \"%@\".", localId);
 
@@ -167,7 +167,7 @@ - (PFObjectLocalIdStoreMapEntry *)getMapEntry:(NSString *)localId error:(NSError
 /**
  * Writes one entry to the local id map on disk.
  */
-- (BOOL)putMapEntry:(PFObjectLocalIdStoreMapEntry *)entry forLocalId:(NSString *)localId error:(NSError **)error {
+- (BOOL)putMapEntry:(PFObjectLocalIdStoreMapEntry *)entry forLocalId:(NSString *)localId error:(NSError * __autoreleasing *)error {
     PFConsistencyError(error, [[self class] isLocalId:localId], NO, @"Tried to get invalid local id: \"%@\".", localId);
 
     NSString *file = [_diskPath stringByAppendingPathComponent:localId];
@@ -178,7 +178,7 @@ - (BOOL)putMapEntry:(PFObjectLocalIdStoreMapEntry *)entry forLocalId:(NSString *
 /**
  * Removes an entry from the local id map on disk.
  */
-- (BOOL)removeMapEntry:(NSString *)localId error:(NSError **)error {
+- (BOOL)removeMapEntry:(NSString *)localId error:(NSError * __autoreleasing *)error {
     PFConsistencyError(error, [[self class] isLocalId:localId], NO, @"Tried to get invalid local id: \"%@\".", localId);
 
     NSString *file = [_diskPath stringByAppendingPathComponent:localId];

Parse/Parse/Internal/Object/OperationSet/PFOperationSet.m

@@ -74,7 +74,7 @@ - (void)mergeOperationSet:(PFOperationSet *)other {
 
 - (nullable NSDictionary *)RESTDictionaryUsingObjectEncoder:(PFEncoder *)objectEncoder
                                  operationSetUUIDs:(NSArray **)operationSetUUIDs
-                                             error:(NSError **)error {
+                                             error:(NSError * __autoreleasing *)error {
     NSMutableDictionary *operationSetResult = [[NSMutableDictionary alloc] init];
     __block NSError *encodingError;
     __block BOOL wasStopped = false;

Parse/Parse/Internal/Object/State/PFObjectState.m

@@ -106,7 +106,7 @@ - (void)setServerData:(NSDictionary *)serverData {
 #pragma mark - Coding
 ///--------------------------------------
 
-- (NSDictionary *)dictionaryRepresentationWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error {
+- (NSDictionary *)dictionaryRepresentationWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError * __autoreleasing *)error {
     NSMutableDictionary *result = [NSMutableDictionary dictionary];
     if (self.objectId) {
         result[PFObjectObjectIdRESTKey] = self.objectId;

Parse/Parse/Internal/PFAssert.h

@@ -62,8 +62,8 @@ do { \
 Sets a recoverable error for propagation
  */
 #define PFConsistencyError(error, condition, rval, description, ...) \
-if (!(condition) && error) { \
-*error = [PFErrorUtilities errorWithCode:-1 message:[NSString stringWithFormat:description, ##__VA_ARGS__]];\
+if (!(condition) && error && *error == nil) { \
+*error =  [PFErrorUtilities errorWithCode:-1 message:[NSString stringWithFormat:description, ##__VA_ARGS__]];\
 return rval;\
 }
 

Parse/Parse/PFEncoder.m

@@ -33,7 +33,7 @@ + (instancetype)objectEncoder {
     return encoder;
 }
 
-- (id)encodeObject:(id)object error:(NSError **) error {
+- (id)encodeObject:(id)object error:(NSError * __autoreleasing *) error {
     if ([object isKindOfClass:[PFObject class]]) {
         return [self encodeParseObject:object error:error];
     } else if ([object isKindOfClass:[NSData class]]) {
@@ -190,7 +190,7 @@ + (instancetype)objectEncoder {
     return encoder;
 }
 
-- (id)encodeParseObject:(PFObject *)object error:(NSError **)error {
+- (id)encodeParseObject:(PFObject *)object error:(NSError * __autoreleasing *)error {
     PFConsistencyError(error, object.objectId, nil, @"Tried to save an object with a new, unsaved child.");
     return [super encodeParseObject:object error:error];
 }

Parse/Parse/PFObject.m

@@ -745,7 +745,7 @@ - (NSString *)getOrCreateLocalId {
     return self.localId;
 }
 
-- (BOOL)resolveLocalId:(NSError **)error {
+- (BOOL)resolveLocalId:(NSError *__autoreleasing*)error {
     @synchronized (lock) {
         PFConsistencyAssert(self.localId, @"Tried to resolve a localId for an object with no localId.");
         NSString *newObjectId = [[Parse _currentManager].coreManager.objectLocalIdStore objectIdForLocalId:self.localId];

Parse/Tests/Unit/ObjectLocalIdStoreTests.m

@@ -140,4 +140,19 @@ - (void)testLongSerialization {
     XCTAssertEqual(expected, actual, @"The number should be parsed correctly.");
 }
 
+- (void)testInvalidLocalId {
+    id<PFFileManagerProvider> dataSource = [self mockedDataSource];
+    PFFileManager *fileManager = dataSource.fileManager;
+    OCMStub([fileManager parseDataItemPathForPathComponent:[OCMArg isNotNil]]).andReturn(NSTemporaryDirectory());
+
+    PFObjectLocalIdStore *store = [[PFObjectLocalIdStore alloc] initWithDataSource:dataSource];
+    NSError *error;
+    BOOL rval = [store retainLocalIdOnDisk:@"bad-local-id" error:&error];
+    XCTAssertFalse(rval);
+    XCTAssertNotNil(error.domain);
+    XCTAssertEqual(error.domain, PFParseErrorDomain);
+    XCTAssertEqual(error.code, -1);
+    XCTAssertEqualObjects(error.localizedDescription, @"Tried to get invalid local id: \"bad-local-id\".");
+}
+
 @end