Enable SwiftLint rule: redundant_nil_coalescing

.swiftlint.yml

@@ -60,6 +60,9 @@ only_rules:
   # Example: CGPoint.zero instead of CGPoint(x: 0, y: 0)
   - prefer_zero_over_explicit_init
 
+  # `nil` coalescing on a non-optional is redundant.
+  - redundant_nil_coalescing
+
   - shorthand_optional_binding
 
   # Prefer `someBool.toggle()` over `someBool = !someBool`.

Modules/Sources/AsyncImageKit/Helpers/ImageSaliencyService.swift

@@ -138,6 +138,7 @@ private final class SaliencyCache: @unchecked Sendable {
     }
 
     func cachedRect(for url: URL) -> CGRect? {
+        // swiftlint:disable:next redundant_nil_coalescing
         lock.withLock { store[url.absoluteString] ?? nil }
     }
 

Modules/Sources/WordPressKit/DomainsServiceRemote.swift

@@ -59,8 +59,8 @@ public struct DomainSuggestion: Codable {
         }
 
         self.domainName = domain
-        self.productID = json["product_id"] as? Int ?? nil
-        self.supportsPrivacy = json["supports_privacy"] as? Bool ?? nil
+        self.productID = json["product_id"] as? Int
+        self.supportsPrivacy = json["supports_privacy"] as? Bool
         self.costString = json["cost"] as? String ?? ""
         self.cost = json["raw_price"] as? Double
         self.saleCost = json["sale_cost"] as? Double

Modules/Sources/WordPressKit/JetpackScanThreat.swift

@@ -96,7 +96,7 @@ public struct JetpackScanThreat: Decodable {
         description = try container.decode(String.self, forKey: .description)
         firstDetected = try container.decode(Date.self, forKey: .firstDetected)
         fixedOn = try container.decodeIfPresent(Date.self, forKey: .fixedOn)
-        fixable = try? container.decodeIfPresent(JetpackScanThreatFixer.self, forKey: .fixable) ?? nil
+        fixable = try? container.decodeIfPresent(JetpackScanThreatFixer.self, forKey: .fixable)
         `extension` = try container.decodeIfPresent(JetpackThreatExtension.self, forKey: .extension)
         diff = try container.decodeIfPresent(String.self, forKey: .diff)
         rows = try container.decodeIfPresent([String: Any].self, forKey: .rows)

Modules/Sources/WordPressKitModels/RemoteUser+Likes.swift

@@ -50,7 +50,7 @@ import Foundation
     public init(dictionary: [String: Any]) {
         blogUrl = dictionary["url"] as? String ?? ""
         blogName = dictionary["name"] as? String ?? ""
-        blogID = dictionary["id"] as? NSNumber ?? nil
+        blogID = dictionary["id"] as? NSNumber
 
         iconUrl = {
             if let iconInfo = dictionary["icon"] as? [String: Any],

Sources/WordPressData/Swift/SiteTaxonomy.swift

@@ -33,13 +33,13 @@ public struct SiteTaxonomy: Codable {
         self.name = details.name
         self.restBase = details.restBase
         self.labels = LocalizedLabels(
-            name: details.labels[.name] ?? nil,
-            newItemName: details.labels[.newItemName] ?? nil,
-            addNewItem: details.labels[.addNewItem] ?? nil,
-            nameFieldDescription: details.labels[.nameFieldDescription] ?? nil,
-            descFieldDescription: details.labels[.descFieldDescription] ?? nil,
-            noTerms: details.labels[.noTerms] ?? nil,
-            searchItems: details.labels[.searchItems] ?? nil
+            name: details.labels[.name],
+            newItemName: details.labels[.newItemName],
+            addNewItem: details.labels[.addNewItem],
+            nameFieldDescription: details.labels[.nameFieldDescription],
+            descFieldDescription: details.labels[.descFieldDescription],
+            noTerms: details.labels[.noTerms],
+            searchItems: details.labels[.searchItems]
         )
         self.supportedPostTypes = details.types
     }

Tests/KeystoneTests/Tests/Features/Domains/RegisterDomainDetailsViewModelTests.swift

@@ -8,8 +8,8 @@ extension FullyQuotedDomainSuggestion {
         }
 
         let domainName = domain
-        let productID = json["product_id"] as? Int ?? nil
-        let supportsPrivacy = json["supports_privacy"] as? Bool ?? nil
+        let productID = json["product_id"] as? Int
+        let supportsPrivacy = json["supports_privacy"] as? Bool
         let costString = json["cost"] as? String ?? ""
         let saleCostString: String? = nil
 

Tests/WordPressKitTests/WordPressKitTests/Tests/MediaLibraryTestSupport.swift

@@ -58,7 +58,7 @@ extension MediaLibraryTestSupport {
     }
 
     private func handleREST(request: URLRequest, failAtPage pageToFail: Int) -> HTTPStubsResponse {
-        let cursor = request.url?.query("page_handle") ?? nil
+        let cursor = request.url?.query("page_handle")
         let number = request.url?.query("number").flatMap(Int.init(_:)) ?? 100
 
         let cursorIndex = media.firstIndex { $0.cusor == cursor } ?? 0

WordPress/Classes/Stores/StatsPeriodStore.swift

@@ -1160,7 +1160,7 @@ extension StatsPeriodStore {
         guard let postId else {
             return nil
         }
-        return state.postStats[postId] ?? nil
+        return state.postStats[postId]
     }
 
     func getMostRecentDate(forPost postId: Int?) -> Date? {

WordPress/Classes/ViewRelated/Jetpack/Jetpack Scan/JetpackScanCoordinator.swift

@@ -46,7 +46,7 @@ class JetpackScanCoordinator {
         let returnThreats: [JetpackScanThreat]?
 
         if scan?.state == .fixingThreats {
-            returnThreats = scan?.threatFixStatus?.compactMap { $0.threat } ?? nil
+            returnThreats = scan?.threatFixStatus?.compactMap { $0.threat }
         } else {
             returnThreats = scan?.state == .idle ? scan?.threats : nil
         }

WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailHeaderView.swift

@@ -140,7 +140,7 @@ class ReaderDetailHeaderViewModel: ObservableObject {
 
             self.isFollowingSite = post.isFollowing
 
-            self.authorAvatarURL = post.avatarURLForDisplay() ?? nil
+            self.authorAvatarURL = post.avatarURLForDisplay()
 
             if let authorName = post.authorForDisplay(), !authorName.isEmpty {
                 self.authorName = authorName

WordPress/Classes/ViewRelated/Reader/Manage/OffsetTableViewHandler.swift

@@ -35,11 +35,11 @@ class OffsetTableViewHandler: WPTableViewHandler {
 
         let oldIndexPath = indexPath.map {
             adjustedToTable(indexPath: $0)
-        } ?? nil
+        }
 
         let newPath = newIndexPath.map {
             adjustedToTable(indexPath: $0)
-        } ?? nil
+        }
 
         super.controller(controller, didChange: anObject, at: oldIndexPath, for: type, newIndexPath: newPath)
     }

WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift

@@ -540,7 +540,7 @@ private extension SupportTableViewController {
     // MARK: - Helpers
 
     func controllerToShowFrom() -> UIViewController? {
-        return showHelpFromViewController ?? navigationController ?? nil
+        return showHelpFromViewController ?? navigationController
     }
 
     // MARK: - Localized Text