Restore behaviour for nil tranformed objects without errors

Author: flovilmart

Parse/Parse/Internal/Commands/PFRESTCommand.m

@@ -225,7 +225,7 @@ - (BOOL)forEachLocalId:(BOOL(^)(PFObject *pointer))block error:(NSError **)error
 
     if ([[self class] forEachLocalIdIn:data doBlock:block]) {
         self.parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:data error:error];
-        if (!self.parameters) {
+        if (!self.parameters && error && *error) {
             return NO;
         }
     }

Parse/Parse/Internal/FieldOperation/PFFieldOperation.m

@@ -193,7 +193,7 @@ - (NSString *)description {
 
 - (id)encodeWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error {
     NSMutableArray *encodedObjects = [objectEncoder encodeObject:self.objects error: error];
-    if (!encodedObjects) {
+    if (!encodedObjects && error && *error) {
         return nil;
     }
     return @{ @"__op" : @"Add",
@@ -256,7 +256,7 @@ - (NSString *)description {
 
 - (id)encodeWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error {
     NSMutableArray *encodedObjects = [objectEncoder encodeObject:self.objects error:error];
-    if (!encodedObjects) {
+    if (!encodedObjects && error && *error) {
         return nil;
     }
     return @{ @"__op" : @"AddUnique",
@@ -334,7 +334,7 @@ - (NSString *)description {
 
 - (id)encodeWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error {
     NSMutableArray *encodedObjects = [objectEncoder encodeObject:self.objects error:error];
-    if (!encodedObjects) {
+    if (!encodedObjects && error && *error) {
         return nil;
     }
     return @{ @"__op" : @"Remove",

Parse/Parse/Internal/PFAssert.h

@@ -68,12 +68,14 @@ return rval;\
 }
 
 #define PFBailIfError(condition, error, rval) \
-if (!(condition) && error) { \
+if (!(condition) && *error) { \
 return rval;\
 }
 
 #define PFBailTaskIfError(condition, error) \
-PFBailIfError(condition, error, [BFTask taskWithError:error])
+if (!(condition) && error) { \
+return [BFTask taskWithError:error];\
+}
 
 #define PFPrecondition(condition, description, ...) \
 if (!(condition)) { \

Parse/Parse/PFEncoder.m

@@ -99,7 +99,7 @@ - (id)encodeObject:(id)object error:(NSError **) error {
         __block NSError *encodingError = nil;
         [object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
             dict[key] = [self encodeObject:obj error:&encodingError];
-            if (!dict[key]) {
+            if (!dict[key] && encodingError) {
                 hasErrored = YES;
                 *stop = YES;
             }

Parse/Tests/Unit/FieldOperationTests.m

@@ -203,9 +203,7 @@ - (void)testAddOperationEncoding {
     OCMStub([encoder encodeObject:[OCMArg isEqual:@[ @"yarr" ]] error:nil]).andReturn(@"yolo");
 
     PFAddOperation *operation = [PFAddOperation addWithObjects:@[ @"yarr" ]];
-    NSError *error;
-    XCTAssertNil([operation encodeWithObjectEncoder:nil error:&error]);
-    XCTAssertNil(error);
+    XCTAssertThrows([operation encodeWithObjectEncoder:nil error:nil]);
     XCTAssertEqualObjects([operation encodeWithObjectEncoder:encoder error:nil], (@{ @"__op" : @"Add",
                                                                            @"objects" : @"yolo" }));
 }
@@ -254,9 +252,7 @@ - (void)testAddUniqueOperationEncoding {
     OCMStub([encoder encodeObject:[OCMArg isEqual:@[ @"yarr" ]] error:nil]).andReturn(@"yolo");
 
     PFAddUniqueOperation *operation = [PFAddUniqueOperation addUniqueWithObjects:@[ @"yarr" ]];
-    NSError *error;
-    XCTAssertNil([operation encodeWithObjectEncoder:nil error:&error]);
-    XCTAssertNil(error);
+    XCTAssertThrows([operation encodeWithObjectEncoder:nil error:nil]);
     XCTAssertEqualObjects([operation encodeWithObjectEncoder:encoder error:nil], (@{ @"__op" : @"AddUnique",
                                                                            @"objects" : @"yolo" }));
 }
@@ -305,9 +301,7 @@ - (void)testRemoveOperationEncoding {
     OCMStub([encoder encodeObject:[OCMArg isEqual:@[ @"yarr" ]] error:nil]).andReturn(@"yolo");
 
     PFRemoveOperation *operation = [PFRemoveOperation removeWithObjects:@[ @"yarr" ]];
-    NSError *error;
-    XCTAssertNil([operation encodeWithObjectEncoder:nil error:&error]);
-    XCTAssertNil(error);
+    XCTAssertThrows([operation encodeWithObjectEncoder:nil error:nil]);
     XCTAssertEqualObjects([operation encodeWithObjectEncoder:encoder error:nil], (@{ @"__op" : @"Remove",
                                                                            @"objects" : @"yolo" }));
 }