2
0
Эх сурвалжийг харах

Swapped parameter order of custom URLRequest initializer to match other APIs.

Christian Noon 9 жил өмнө
parent
commit
a6b3bb60b0

+ 2 - 2
Source/Alamofire.swift

@@ -75,12 +75,12 @@ extension URLRequest: URLRequestConvertible {
 extension URLRequest {
     /// Creates an instance with the specified `method`, `urlString` and `headers`.
     ///
-    /// - parameter method:    The HTTP method.
     /// - parameter urlString: The URL string.
+    /// - parameter method:    The HTTP method.
     /// - parameter headers:   The HTTP headers. `nil` by default.
     ///
     /// - returns: The new `URLRequest` instance.
-    public init(method: HTTPMethod, urlString: URLStringConvertible, headers: [String: String]? = nil) {
+    public init(urlString: URLStringConvertible, method: HTTPMethod, headers: [String: String]? = nil) {
         self.init(url: URL(string: urlString.urlString)!)
 
         if let request = urlString as? URLRequest { self = request }

+ 6 - 6
Source/SessionManager.swift

@@ -229,7 +229,7 @@ open class SessionManager {
         headers: [String: String]? = nil)
         -> Request
     {
-        let urlRequest = URLRequest(method: method, urlString: urlString, headers: headers)
+        let urlRequest = URLRequest(urlString: urlString, method: method, headers: headers)
         let encodedURLRequest = encoding.encode(urlRequest, parameters: parameters).0
 
         return request(encodedURLRequest)
@@ -283,7 +283,7 @@ open class SessionManager {
         headers: [String: String]? = nil)
         -> Request
     {
-        let urlRequest = URLRequest(method: method, urlString: urlString, headers: headers)
+        let urlRequest = URLRequest(urlString: urlString, method: method, headers: headers)
         let encodedURLRequest = encoding.encode(urlRequest, parameters: parameters).0
 
         return download(encodedURLRequest, to: destination)
@@ -384,7 +384,7 @@ open class SessionManager {
         headers: [String: String]? = nil)
         -> Request
     {
-        let urlRequest = URLRequest(method: method, urlString: urlString, headers: headers)
+        let urlRequest = URLRequest(urlString: urlString, method: method, headers: headers)
         return upload(fileURL, with: urlRequest)
     }
 
@@ -421,7 +421,7 @@ open class SessionManager {
         headers: [String: String]? = nil)
         -> Request
     {
-        let urlRequest = URLRequest(method: method, urlString: urlString, headers: headers)
+        let urlRequest = URLRequest(urlString: urlString, method: method, headers: headers)
         return upload(data, with: urlRequest)
     }
 
@@ -458,7 +458,7 @@ open class SessionManager {
         headers: [String: String]? = nil)
         -> Request
     {
-        let urlRequest = URLRequest(method: method, urlString: urlString, headers: headers)
+        let urlRequest = URLRequest(urlString: urlString, method: method, headers: headers)
         return upload(stream, with: urlRequest)
     }
 
@@ -510,7 +510,7 @@ open class SessionManager {
         headers: [String: String]? = nil,
         encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?)
     {
-        let urlRequest = URLRequest(method: method, urlString: urlString, headers: headers)
+        let urlRequest = URLRequest(urlString: urlString, method: method, headers: headers)
 
         return upload(
             multipartFormData: multipartFormData,