From 4f05055f76677709cf70f5d3212f58b78df7a789 Mon Sep 17 00:00:00 2001 From: Takeru Chuganji Date: Wed, 14 Oct 2015 18:16:58 +0900 Subject: [PATCH 1/2] add missing __nullable attributes --- AFNetworking/AFHTTPRequestOperationManager.h | 16 ++++++++-------- AFNetworking/AFHTTPSessionManager.h | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/AFNetworking/AFHTTPRequestOperationManager.h b/AFNetworking/AFHTTPRequestOperationManager.h index d2385edc97..a0ef064132 100644 --- a/AFNetworking/AFHTTPRequestOperationManager.h +++ b/AFNetworking/AFHTTPRequestOperationManager.h @@ -208,7 +208,7 @@ NS_ASSUME_NONNULL_BEGIN */ - (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSURLRequest *)request success:(nullable void (^)(AFHTTPRequestOperation *operation, id responseObject))success - failure:(nullable void (^)(AFHTTPRequestOperation *operation, NSError *error))failure; + failure:(nullable void (^)(AFHTTPRequestOperation * __nullable operation, NSError *error))failure; ///--------------------------- /// @name Making HTTP Requests @@ -227,7 +227,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable AFHTTPRequestOperation *)GET:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(AFHTTPRequestOperation *operation, id responseObject))success - failure:(nullable void (^)(AFHTTPRequestOperation *operation, NSError *error))failure; + failure:(nullable void (^)(AFHTTPRequestOperation * __nullable operation, NSError *error))failure; /** Creates and runs an `AFHTTPRequestOperation` with a `HEAD` request. @@ -242,7 +242,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable AFHTTPRequestOperation *)HEAD:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(AFHTTPRequestOperation *operation))success - failure:(nullable void (^)(AFHTTPRequestOperation *operation, NSError *error))failure; + failure:(nullable void (^)(AFHTTPRequestOperation * __nullable operation, NSError *error))failure; /** Creates and runs an `AFHTTPRequestOperation` with a `POST` request. @@ -257,7 +257,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable AFHTTPRequestOperation *)POST:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(AFHTTPRequestOperation *operation, id responseObject))success - failure:(nullable void (^)(AFHTTPRequestOperation *operation, NSError *error))failure; + failure:(nullable void (^)(AFHTTPRequestOperation * __nullable operation, NSError *error))failure; /** Creates and runs an `AFHTTPRequestOperation` with a multipart `POST` request. @@ -274,7 +274,7 @@ NS_ASSUME_NONNULL_BEGIN parameters:(nullable id)parameters constructingBodyWithBlock:(nullable void (^)(id formData))block success:(nullable void (^)(AFHTTPRequestOperation *operation, id responseObject))success - failure:(nullable void (^)(AFHTTPRequestOperation *operation, NSError *error))failure; + failure:(nullable void (^)(AFHTTPRequestOperation * __nullable operation, NSError *error))failure; /** Creates and runs an `AFHTTPRequestOperation` with a `PUT` request. @@ -289,7 +289,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable AFHTTPRequestOperation *)PUT:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(AFHTTPRequestOperation *operation, id responseObject))success - failure:(nullable void (^)(AFHTTPRequestOperation *operation, NSError *error))failure; + failure:(nullable void (^)(AFHTTPRequestOperation * __nullable operation, NSError *error))failure; /** Creates and runs an `AFHTTPRequestOperation` with a `PATCH` request. @@ -304,7 +304,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable AFHTTPRequestOperation *)PATCH:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(AFHTTPRequestOperation *operation, id responseObject))success - failure:(nullable void (^)(AFHTTPRequestOperation *operation, NSError *error))failure; + failure:(nullable void (^)(AFHTTPRequestOperation * __nullable operation, NSError *error))failure; /** Creates and runs an `AFHTTPRequestOperation` with a `DELETE` request. @@ -319,7 +319,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable AFHTTPRequestOperation *)DELETE:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(AFHTTPRequestOperation *operation, id responseObject))success - failure:(nullable void (^)(AFHTTPRequestOperation *operation, NSError *error))failure; + failure:(nullable void (^)(AFHTTPRequestOperation * __nullable operation, NSError *error))failure; @end diff --git a/AFNetworking/AFHTTPSessionManager.h b/AFNetworking/AFHTTPSessionManager.h index e516e6d661..04b087626f 100644 --- a/AFNetworking/AFHTTPSessionManager.h +++ b/AFNetworking/AFHTTPSessionManager.h @@ -152,7 +152,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable NSURLSessionDataTask *)GET:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(NSURLSessionDataTask *task, id responseObject))success - failure:(nullable void (^)(NSURLSessionDataTask *task, NSError *error))failure; + failure:(nullable void (^)(NSURLSessionDataTask * __nullable task, NSError *error))failure; /** Creates and runs an `NSURLSessionDataTask` with a `HEAD` request. @@ -167,7 +167,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable NSURLSessionDataTask *)HEAD:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(NSURLSessionDataTask *task))success - failure:(nullable void (^)(NSURLSessionDataTask *task, NSError *error))failure; + failure:(nullable void (^)(NSURLSessionDataTask * __nullable task, NSError *error))failure; /** Creates and runs an `NSURLSessionDataTask` with a `POST` request. @@ -182,7 +182,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable NSURLSessionDataTask *)POST:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(NSURLSessionDataTask *task, id responseObject))success - failure:(nullable void (^)(NSURLSessionDataTask *task, NSError *error))failure; + failure:(nullable void (^)(NSURLSessionDataTask * __nullable task, NSError *error))failure; /** Creates and runs an `NSURLSessionDataTask` with a multipart `POST` request. @@ -199,7 +199,7 @@ NS_ASSUME_NONNULL_BEGIN parameters:(nullable id)parameters constructingBodyWithBlock:(nullable void (^)(id formData))block success:(nullable void (^)(NSURLSessionDataTask *task, id responseObject))success - failure:(nullable void (^)(NSURLSessionDataTask *task, NSError *error))failure; + failure:(nullable void (^)(NSURLSessionDataTask * __nullable task, NSError *error))failure; /** Creates and runs an `NSURLSessionDataTask` with a `PUT` request. @@ -214,7 +214,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable NSURLSessionDataTask *)PUT:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(NSURLSessionDataTask *task, id responseObject))success - failure:(nullable void (^)(NSURLSessionDataTask *task, NSError *error))failure; + failure:(nullable void (^)(NSURLSessionDataTask * __nullable task, NSError *error))failure; /** Creates and runs an `NSURLSessionDataTask` with a `PATCH` request. @@ -229,7 +229,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable NSURLSessionDataTask *)PATCH:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(NSURLSessionDataTask *task, id responseObject))success - failure:(nullable void (^)(NSURLSessionDataTask *task, NSError *error))failure; + failure:(nullable void (^)(NSURLSessionDataTask * __nullable task, NSError *error))failure; /** Creates and runs an `NSURLSessionDataTask` with a `DELETE` request. @@ -244,7 +244,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable NSURLSessionDataTask *)DELETE:(NSString *)URLString parameters:(nullable id)parameters success:(nullable void (^)(NSURLSessionDataTask *task, id responseObject))success - failure:(nullable void (^)(NSURLSessionDataTask *task, NSError *error))failure; + failure:(nullable void (^)(NSURLSessionDataTask * __nullable task, NSError *error))failure; @end From a7d4998b37834858dd31c1dcee1ba184f0640868 Mon Sep 17 00:00:00 2001 From: Takeru Chuganji Date: Thu, 15 Oct 2015 23:28:07 +0900 Subject: [PATCH 2/2] fix nullablity --- AFNetworking/AFHTTPRequestOperationManager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AFNetworking/AFHTTPRequestOperationManager.h b/AFNetworking/AFHTTPRequestOperationManager.h index a0ef064132..26e041562a 100644 --- a/AFNetworking/AFHTTPRequestOperationManager.h +++ b/AFNetworking/AFHTTPRequestOperationManager.h @@ -208,7 +208,7 @@ NS_ASSUME_NONNULL_BEGIN */ - (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSURLRequest *)request success:(nullable void (^)(AFHTTPRequestOperation *operation, id responseObject))success - failure:(nullable void (^)(AFHTTPRequestOperation * __nullable operation, NSError *error))failure; + failure:(nullable void (^)(AFHTTPRequestOperation *operation, NSError *error))failure; ///--------------------------- /// @name Making HTTP Requests