Skip to content

Fix analyze errors #2047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 5, 2018
Merged

Fix analyze errors #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
891cac1
Fix analyze errors
Nov 5, 2018
4f2e633
Remove unnecessary cast
Nov 5, 2018
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 Example/Database/Tests/Unit/FPruneForestTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ - (void) testKeepUnderPruneWorks {
FPruneForest *forest = [FPruneForest empty];
forest = [forest prunePath:[FPath pathWithString:@"foo/bar"]];
forest = [forest keepPath:[FPath pathWithString:@"foo/bar/baz"]];
forest = [forest keepAll:[NSSet setWithArray:@[@"qux", @"quu"]] atPath:[FPath pathWithString:@"foo/bar"]];
[forest keepAll:[NSSet setWithArray:@[@"qux", @"quu"]] atPath:[FPath pathWithString:@"foo/bar"]];
}

- (void) testPruneUnderKeepThrows {
Expand Down
2 changes: 1 addition & 1 deletion Example/DynamicLinks/Tests/FIRDLScionLoggingTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ - (void)clearConditionalUserProperty:(nonnull NSString *)userPropertyName
- (nonnull NSArray<FIRAConditionalUserProperty *> *)
conditionalUserProperties:(nonnull NSString *)origin
propertyNamePrefix:(nonnull NSString *)propertyNamePrefix {
return nil;
return @[];
}

- (NSInteger)maxUserProperties:(nonnull NSString *)origin {
Expand Down
28 changes: 21 additions & 7 deletions Example/Firebase.xcodeproj/xcshareddata/xcschemes/AllUnitTests_iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DE3373891E73773400881891"
Expand All @@ -25,7 +25,7 @@
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DE9314DD1E86C6BE0083EDBF"
Expand All @@ -39,7 +39,7 @@
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DEE14D581E84464D006FA992"
Expand All @@ -53,7 +53,7 @@
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DE7B8D1C1E8EF078009EB6DF"
Expand All @@ -67,7 +67,7 @@
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DE9315A61E8738460083EDBF"
Expand All @@ -81,7 +81,7 @@
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DEB13A0A1E73507E00AC236D"
Expand All @@ -95,7 +95,7 @@
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DE7B8D041E8EF077009EB6DF"
Expand All @@ -104,6 +104,20 @@
ReferencedContainer = "container:Firebase.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DEDFF0121FD6135D00F7D466"
BuildableName = "DynamicLinks_Tests_iOS.xctest"
BlueprintName = "DynamicLinks_Tests_iOS"
ReferencedContainer = "container:Firebase.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand Down
2 changes: 1 addition & 1 deletion Example/Messaging/Tests/FIRMessagingAnalyticsTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ - (void)clearConditionalUserProperty:(nonnull NSString *)userPropertyName
- (nonnull NSArray<FIRAConditionalUserProperty *> *)
conditionalUserProperties:(nonnull NSString *)origin
propertyNamePrefix:(nonnull NSString *)propertyNamePrefix {
return nil;
return @[];
}

- (NSInteger)maxUserProperties:(nonnull NSString *)origin {
Expand Down
2 changes: 1 addition & 1 deletion Firebase/DynamicLinks/FDLURLComponents/FDLURLComponents.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/// The exact behavior of dict[key] = value is unclear when value is nil. This function safely adds
/// the key-value pair to the dictionary, even when value is nil.
/// This function will treat empty string in the same way as nil.
NS_INLINE void FDLSafelyAddKeyValuePairToDictionary(id<NSCopying> key,
NS_INLINE void FDLSafelyAddKeyValuePairToDictionary(NSString *key,
NSString *stringValue,
NSMutableDictionary *dictionary) {
if (stringValue != nil && stringValue.length > 0) {
Expand Down
2 changes: 1 addition & 1 deletion Firebase/DynamicLinks/FIRDLDefaultRetrievalProcessV2.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ - (void)retrievePendingDynamicLinkInternal {
return [self.requestResults filteredArrayUsingPredicate:predicate];
}

- (FIRDLRetrievalProcessResult *)resultWithUniqueMatchedDynamicLink {
- (nullable FIRDLRetrievalProcessResult *)resultWithUniqueMatchedDynamicLink {
// return result with unique-matched dynamic link if found
NSArray<FIRDLRetrievalProcessResult *> *foundResultsWithDynamicLinks =
[self foundResultsWithDynamicLinks];
Expand Down
2 changes: 1 addition & 1 deletion Firebase/DynamicLinks/FIRDynamicLinks.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ - (void)configureDynamicLinks:(FIRApp *)app {
service:kFIRServiceDynamicLinks
reason:errorDescription];
}
[app sendLogsWithServiceName:kFIRServiceDynamicLinks version:kFIRDLVersion error:error];
if (error) {
[app sendLogsWithServiceName:kFIRServiceDynamicLinks version:kFIRDLVersion error:error];
NSString *message = nil;
if (options.usingOptionsFromDefaultPlist) {
// Configured using plist file
Expand Down