Swiftlint fixes

guykogus · guykogus · commit 9298bab3a106 · 2024-10-17T10:42:00.000+02:00
diff --git a/Sources/SwifterSwift/Foundation/URLRequestExtensions.swift b/Sources/SwifterSwift/Foundation/URLRequestExtensions.swift
@@ -38,8 +38,8 @@ public extension URLRequest {
             }
         }
 
-        if let data = httpBody {
-            let body = String(decoding: data, as: UTF8.self)
+        if let data = httpBody,
+           let body = String(data: data, encoding: .utf8) {
             command.append("-d '\(body)'")
         }
 
diff --git a/Sources/SwifterSwift/SwiftStdlib/DictionaryExtensions.swift b/Sources/SwifterSwift/SwiftStdlib/DictionaryExtensions.swift
@@ -92,7 +92,7 @@ public extension Dictionary {
         let options = (prettify == true) ? JSONSerialization.WritingOptions.prettyPrinted : JSONSerialization
             .WritingOptions()
         guard let jsonData = try? JSONSerialization.data(withJSONObject: self, options: options) else { return nil }
-        return String(decoding: jsonData, as: UTF8.self)
+        return String(data: jsonData, encoding: .utf8)
     }
     #endif
 
diff --git a/Sources/SwifterSwift/SwiftStdlib/StringExtensions.swift b/Sources/SwifterSwift/SwiftStdlib/StringExtensions.swift
@@ -27,7 +27,7 @@ public extension String {
     var base64Decoded: String? {
         if let data = Data(base64Encoded: self,
                            options: .ignoreUnknownCharacters) {
-            return String(decoding: data, as: UTF8.self)
+            return String(data: data, encoding: .utf8)
         }
 
         let remainder = count % 4
@@ -40,7 +40,7 @@ public extension String {
         guard let data = Data(base64Encoded: self + padding,
                               options: .ignoreUnknownCharacters) else { return nil }
 
-        return String(decoding: data, as: UTF8.self)
+        return String(data: data, encoding: .utf8)
     }
     #endif
 
@@ -1227,8 +1227,9 @@ public extension String {
     ///
     /// - Parameter base64: base64 string.
     init?(base64: String) {
-        guard let decodedData = Data(base64Encoded: base64) else { return nil }
-        self.init(String(decoding: decodedData, as: UTF8.self))
+        guard let decodedData = Data(base64Encoded: base64),
+              let decodedString = String(data: decodedData, encoding: .utf8) else { return nil }
+        self = decodedString
     }
     #endif
 }
diff --git a/Tests/FoundationTests/URLSessionExtensionsTests.swift b/Tests/FoundationTests/URLSessionExtensionsTests.swift
@@ -27,7 +27,7 @@ final class URLSessionExtensionsTests: XCTestCase {
         XCTAssertNotNil(data)
         XCTAssertNotNil(response)
         let httpResponse = response as? HTTPURLResponse
-        let content = String(decoding: data!, as: UTF8.self)
+        let content = String(data: data!, encoding: .utf8)
         XCTAssertEqual(content, gemfileContent)
         XCTAssertNotNil(httpResponse)
         XCTAssertEqual(httpResponse!.statusCode, 200)

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public extension URLRequest {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- if let data = httpBody {`
`42`		`- let body = String(decoding: data, as: UTF8.self)`
	`41`	`+ if let data = httpBody,`
	`42`	`+ let body = String(data: data, encoding: .utf8) {`
`43`	`43`	`command.append("-d '\(body)'")`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public extension Dictionary {`
`92`	`92`	`let options = (prettify == true) ? JSONSerialization.WritingOptions.prettyPrinted : JSONSerialization`
`93`	`93`	`.WritingOptions()`
`94`	`94`	`guard let jsonData = try? JSONSerialization.data(withJSONObject: self, options: options) else { return nil }`
`95`		`- return String(decoding: jsonData, as: UTF8.self)`
	`95`	`+ return String(data: jsonData, encoding: .utf8)`
`96`	`96`	`}`
`97`	`97`	`#endif`
`98`	`98`