Merge branch 'master' into modernization

Author: flovilmart

.travis.yml

@@ -12,7 +12,7 @@ env:
     - TEST_TYPE=iOS
     - TEST_TYPE=macOS
     - TEST_TYPE=Deployment
-    - TEST_TYPE=Starters
+    - TEST_TYPE=Carthage
     - TEST_TYPE=CocoaPods
 git:
   submodules: false

Parse.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Parse'
-  s.version          = '1.15.2'
+  s.version          = '1.15.3'
   s.license          =  { :type => 'BSD', :file => 'LICENSE' }
   s.homepage         = 'http://parseplatform.org/'
   s.summary          = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.'

Parse.xcodeproj/project.pbxproj

@@ -8839,6 +8839,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 81DCD14A1D2DA080002501A2 /* Release.xcconfig */;
 			buildSettings = {
+				CLANG_ENABLE_CODE_COVERAGE = NO;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;

Parse/Internal/LocalDataStore/OfflineQueryLogic/PFOfflineQueryLogic.m

@@ -145,7 +145,7 @@ - (id)valueForContainer:(id)container
         } else if ([key isEqualToString:@"updatedAt"] || [key isEqualToString:@"_updated_at"]) {
             return object.updatedAt;
         } else {
-            return object[key];
+            return key ? object[key] : nil;
         }
     } else if ([container isKindOfClass:[NSDictionary class]]) {
         return ((NSDictionary *)container)[key];

Parse/Internal/PFEventuallyQueue.h

@@ -16,7 +16,6 @@
 
 @class BFTask<__covariant BFGenericType>;
 @class PFEventuallyPin;
-@class PFEventuallyQueueTestHelper;
 @class PFObject;
 @protocol PFCommandRunnerProvider;
 
@@ -39,9 +38,6 @@ extern NSTimeInterval const PFEventuallyQueueDefaultTimeoutRetryInterval;
 @property (atomic, assign, readonly) BOOL monitorsReachability PF_WATCH_UNAVAILABLE;
 @property (nonatomic, assign, readonly, getter=isConnected) BOOL connected;
 
-// Gets notifications of various events happening in the command cache, so that tests can be synchronized.
-@property (nonatomic, strong, readonly) PFEventuallyQueueTestHelper *testHelper;
-
 ///--------------------------------------
 #pragma mark - Init
 ///--------------------------------------
@@ -71,26 +67,3 @@ extern NSTimeInterval const PFEventuallyQueueDefaultTimeoutRetryInterval;
 - (void)removeAllCommands NS_REQUIRES_SUPER;
 
 @end
-
-typedef enum {
-    PFEventuallyQueueEventCommandEnqueued, // A command was placed into the queue.
-    PFEventuallyQueueEventCommandNotEnqueued, // A command could not be placed into the queue.
-
-    PFEventuallyQueueEventCommandSucceded, // A command has successfully running on the server.
-    PFEventuallyQueueEventCommandFailed, // A command has failed on the server.
-
-    PFEventuallyQueueEventObjectUpdated, // An object's data was updated after a command completed.
-    PFEventuallyQueueEventObjectRemoved, // An object was removed because it was deleted before creation.
-
-    PFEventuallyQueueEventCount // The total number of items in this enum.
-} PFEventuallyQueueTestHelperEvent;
-
-@interface PFEventuallyQueueTestHelper : NSObject {
-    dispatch_semaphore_t events[PFEventuallyQueueEventCount];
-}
-
-- (void)clear;
-- (void)notify:(PFEventuallyQueueTestHelperEvent)event;
-- (BOOL)waitFor:(PFEventuallyQueueTestHelperEvent)event;
-
-@end

Parse/Internal/PFEventuallyQueue.m

@@ -73,7 +73,6 @@ - (instancetype)initWithDataSource:(id<PFCommandRunnerProvider>)dataSource
     _commandEnqueueTaskQueue = [[PFTaskQueue alloc] init];
 
     _taskCompletionSources = [NSMutableDictionary dictionary];
-    _testHelper = [[PFEventuallyQueueTestHelper alloc] init];
 
     [self _startMonitoringNetworkReachability];
 
@@ -103,14 +102,11 @@ - (BFTask *)enqueueCommandInBackground:(id<PFNetworkCommand>)command withObject:
                                                 object:object
                                             identifier:identifier] continueWithBlock:^id(BFTask *task) {
                 if (task.faulted || task.cancelled) {
-                    [self.testHelper notify:PFEventuallyQueueEventCommandNotEnqueued];
                     if (task.error) {
                         taskCompletionSource.error = task.error;
                     } else if (task.cancelled) {
                         [taskCompletionSource cancel];
                     }
-                } else {
-                    [self.testHelper notify:PFEventuallyQueueEventCommandEnqueued];
                 }
 
                 return task;
@@ -337,12 +333,6 @@ - (BFTask *)_didFinishRunningCommand:(id<PFNetworkCommand>)command
         [_taskCompletionSources removeObjectForKey:identifier];
     });
 
-    if (resultTask.faulted || resultTask.cancelled) {
-        [self.testHelper notify:PFEventuallyQueueEventCommandFailed];
-    } else {
-        [self.testHelper notify:PFEventuallyQueueEventCommandSucceded];
-    }
-
     return resultTask;
 }
 
@@ -437,11 +427,6 @@ - (int)_commandsInMemory {
     return (int)_taskCompletionSources.count;
 }
 
-/** Called by PFObject whenever an object has been updated after a saveEventually. */
-- (void)_notifyTestHelperObjectUpdated {
-    [self.testHelper notify:PFEventuallyQueueEventObjectUpdated];
-}
-
 - (void)_setMaxAttemptsCount:(NSUInteger)attemptsCount {
     _maxAttemptsCount = attemptsCount;
 }
@@ -465,33 +450,3 @@ - (void)reachability:(PFReachability *)reachability didChangeReachabilityState:(
 #endif
 
 @end
-
-// PFEventuallyQueueTestHelper gets notifications of various events happening in the command cache,
-// so that tests can be synchronized. See CommandTests.m for examples of how to use this.
-
-@implementation PFEventuallyQueueTestHelper
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        [self clear];
-    }
-    return self;
-}
-
-- (void)clear {
-    for (int i = 0; i < PFEventuallyQueueEventCount; ++i) {
-        events[i] = dispatch_semaphore_create(0);
-    }
-}
-
-- (void)notify:(PFEventuallyQueueTestHelperEvent)event {
-    dispatch_semaphore_signal(events[event]);
-}
-
-- (BOOL)waitFor:(PFEventuallyQueueTestHelperEvent)event {
-    // Wait 1 second for a permit from the semaphore.
-    return (dispatch_semaphore_wait(events[event], dispatch_time(DISPATCH_TIME_NOW, 10LL * NSEC_PER_SEC)) == 0);
-}
-
-@end

Parse/Internal/PFEventuallyQueue_Private.h

@@ -64,20 +64,7 @@ extern NSTimeInterval const PFEventuallyQueueDefaultTimeoutRetryInterval;
 - (void)_startMonitoringNetworkReachability;
 - (void)_stopMonitoringNetworkReachability;
 
-///--------------------------------------
-#pragma mark - Test Helper
-///--------------------------------------
-
-- (void)_setMaxAttemptsCount:(NSUInteger)attemptsCount;
-
-- (void)_setRetryInterval:(NSTimeInterval)retryInterval;
-
 - (void)_simulateReboot NS_REQUIRES_SUPER;
-
-- (int)_commandsInMemory;
-
-- (void)_notifyTestHelperObjectUpdated;
-
 @end
 
 @protocol PFEventuallyQueueSubclass <NSObject>

Parse/Internal/PFLocationManager.m

@@ -126,7 +126,7 @@ - (void)addBlockForCurrentLocation:(PFLocationManagerLocationUpdateBlock)handler
         if ([NSThread currentThread].isMainThread) {
             block();
         } else {
-            dispatch_sync(dispatch_get_main_queue(), block);
+            dispatch_async(dispatch_get_main_queue(), block);
         }
     }
     [self.locationManager startUpdatingLocation];

Parse/Internal/PFReachability.m

@@ -135,7 +135,7 @@ - (void)removeListener:(id<PFReachabilityListener>)listener {
         @strongify(listener);
         [_listenersArray filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
             id weakObject = [evaluatedObject weakObject];
-            return (weakObject == nil || weakObject == listener);
+            return !(weakObject == nil || weakObject == listener);
         }]];
     });
 }
@@ -156,7 +156,7 @@ - (void)_notifyAllListeners {
         }
 
         dispatch_barrier_async(_synchronizationQueue, ^{
-            [_listenersArray filterUsingPredicate:[NSPredicate predicateWithFormat:@"SELf.weakObject != nil"]];
+            [_listenersArray filterUsingPredicate:[NSPredicate predicateWithFormat:@"SELF.weakObject != nil"]];
         });
     });
 }

Parse/Internal/PropertyInfo/PFPropertyInfo.m

@@ -94,7 +94,9 @@ - (instancetype)initWithClass:(Class)kls name:(NSString *)propertyName
         propertySetter = [NSString stringWithFormat:@"set%@:", stringByCapitalizingFirstCharacter(_name)];
     }
 
-    _setterSelector = NSSelectorFromString(propertySetter);
+    if (propertySetter != nil) {
+        _setterSelector = NSSelectorFromString(propertySetter);
+    }
 
     if (_associationType == PFPropertyInfoAssociationTypeDefault) {
         BOOL isCopy = safeStringWithPropertyAttributeValue(objcProperty, "C") != nil;