Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "Vendor/xctoolchain"]
path = Vendor/xctoolchain
url = https://github.com/nlutsenko/xctoolchain.git
url = https://github.com/parse-community/xctoolchain.git
[submodule "Carthage/Checkouts/Bolts-ObjC"]
path = Carthage/Checkouts/Bolts-ObjC
url = https://github.com/BoltsFramework/Bolts-ObjC.git
Expand Down
2 changes: 1 addition & 1 deletion Parse/Parse/Internal/Commands/PFRESTQueryCommand.m
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ + (nullable NSDictionary *)findCommandParametersWithOrder:(NSString *)order
parameters[@"where"] = whereData;
}
if (encodingFailed && encodingError) {
*error = encodingError;
PFSetError(error, encodingError);
return nil;
}

Expand Down
2 changes: 1 addition & 1 deletion Parse/Parse/Internal/KeyValueCache/PFKeyValueCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark - Getting
///--------------------------------------

- (NSString *)objectForKey:(NSString *)key maxAge:(NSTimeInterval)age;
- (nullable NSString *)objectForKey:(NSString *)key maxAge:(NSTimeInterval)age;

///--------------------------------------
#pragma mark - Removing
Expand Down
2 changes: 1 addition & 1 deletion Parse/Parse/Internal/Object/PFObjectPrivate.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
@return Current object state.
*/
@property (nonatomic, copy) PFObjectState *_state;
@property (nonatomic, copy) NSMutableSet *_availableKeys;
@property (nonatomic, retain) NSMutableSet *_availableKeys;

- (instancetype)initWithObjectState:(PFObjectState *)state;
+ (instancetype)objectWithClassName:(NSString *)className
Expand Down
3 changes: 2 additions & 1 deletion Parse/Parse/Internal/Object/State/PFObjectState.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#import "PFAssert.h"
#import "PFObjectState.h"
#import "PFObjectState_Private.h"

Expand Down Expand Up @@ -129,7 +130,7 @@ - (NSDictionary *)dictionaryRepresentationWithObjectEncoder:(PFEncoder *)objectE
result[key] = encoded;
}];
if (failed && encodingError) {
*error = encodingError;
PFSetError(error, encodingError);
return nil;
}
return [result copy];
Expand Down
6 changes: 3 additions & 3 deletions Parse/Parse/Internal/Object/Utilities/PFObjectUtilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark - Operations
///--------------------------------------

+ (id)newValueByApplyingFieldOperation:(PFFieldOperation *)operation
toDictionary:(NSMutableDictionary *)dictionary
forKey:(NSString *)key;
+ (nullable id)newValueByApplyingFieldOperation:(PFFieldOperation *)operation
toDictionary:(NSMutableDictionary *)dictionary
forKey:(NSString *)key;
+ (void)applyOperationSet:(PFOperationSet *)operationSet toDictionary:(NSMutableDictionary *)dictionary;

///--------------------------------------
Expand Down
5 changes: 5 additions & 0 deletions Parse/Parse/Internal/PFAssert.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ if (!(condition) && error && *error == nil) { \
return rval;\
}

#define PFSetError(errorPointer, error) \
if (errorPointer) {\
*errorPointer = error;\
}

/*
Returns the passed value if the condition isn't met and the *error is set
*/
Expand Down
2 changes: 1 addition & 1 deletion Parse/Parse/Internal/Query/Controller/PFQueryController.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark - Caching
///--------------------------------------

- (NSString *)cacheKeyForQueryState:(PFQueryState *)queryState sessionToken:(nullable NSString *)sessionToken;
- (nullable NSString *)cacheKeyForQueryState:(PFQueryState *)queryState sessionToken:(nullable NSString *)sessionToken;
- (BOOL)hasCachedResultForQueryState:(PFQueryState *)queryState sessionToken:(nullable NSString *)sessionToken;

- (void)clearCachedResultForQueryState:(PFQueryState *)queryState sessionToken:(nullable NSString *)sessionToken;
Expand Down
2 changes: 1 addition & 1 deletion Parse/Parse/PFEncoder.m
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ - (id)encodeObject:(id)object error:(NSError * __autoreleasing *) error {
}
}];
if (encodingFailed) {
*error = encodingError;
PFSetError(error, encodingError);
return nil;
}
return dict;
Expand Down
2 changes: 1 addition & 1 deletion Parse/Parse/PFObject.m
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ + (BOOL)collectDirtyChildren:(id)node
}
}];
if (wasStopped) {
*error = localError;
PFSetError(error, localError);
return NO;
}
} else if ([node isKindOfClass:[PFACL class]]) {
Expand Down