@@ -51,8 +51,8 @@ + (void)handleTokenResponse:(NSURLResponse *)response body:(NSData *)body error:
5151 if (requestError)
5252 {
5353 // If this is an error that Stripe returned, let's handle it as a StripeDomain error
54- NSDictionary *jsonDictionary = NULL ;
55- if (body && (jsonDictionary = [self dictionaryFromJSONData: body error: NULL ]) && [jsonDictionary valueForKey: @" error" NULL )
54+ NSDictionary *jsonDictionary = nil ;
55+ if (body && (jsonDictionary = [self dictionaryFromJSONData: body error: nil ]) && [jsonDictionary valueForKey: @" error" nil )
5656 {
5757 handler (nil , [self errorFromStripeResponse: jsonDictionary]);
5858 }
@@ -65,7 +65,7 @@ + (void)handleTokenResponse:(NSURLResponse *)response body:(NSData *)body error:
6565 NSError *parseError;
6666 NSDictionary *jsonDictionary = [self dictionaryFromJSONData: body error: &parseError];
6767
68- if (jsonDictionary == NULL )
68+ if (jsonDictionary == nil )
6969 handler (nil , parseError);
7070 else if ([(NSHTTPURLResponse *)response statusCode ] == 200 )
7171 handler ([[STPToken alloc ] initWithAttributeDictionary: [self camelCasedResponseFromStripeResponse: jsonDictionary]], nil );
@@ -76,9 +76,9 @@ + (void)handleTokenResponse:(NSURLResponse *)response body:(NSData *)body error:
7676
7777+ (NSDictionary *)dictionaryFromJSONData : (NSData *)data error : (NSError **)outError
7878{
79- NSDictionary *jsonDictionary = [NSJSONSerialization JSONObjectWithData: data options: 0 error: NULL ];
79+ NSDictionary *jsonDictionary = [NSJSONSerialization JSONObjectWithData: data options: 0 error: nil ];
8080
81- if (jsonDictionary == NULL )
81+ if (jsonDictionary == nil )
8282 {
8383 NSDictionary *userInfoDict = @{ NSLocalizedDescriptionKey : STPUnexpectedError,
8484 STPErrorMessageKey : [NSString stringWithFormat: @" The response from Stripe failed to get parsed into valid JSON."
@@ -89,7 +89,7 @@ + (NSDictionary *)dictionaryFromJSONData:(NSData *)data error:(NSError **)outErr
8989 code: STPAPIError
9090 userInfo: userInfoDict];
9191 }
92- return NULL ;
92+ return nil ;
9393 }
9494 return jsonDictionary;
9595}
@@ -109,7 +109,7 @@ + (NSDictionary *)camelCasedResponseFromStripeResponse:(NSDictionary *)jsonDicti
109109
110110+ (NSString *)camelCaseFromUnderscoredString : (NSString *)string
111111{
112- if (string == NULL || [string isEqualToString: @" "
112+ if (string == nil || [string isEqualToString: @" "
113113 return @" "
114114
115115 NSMutableString *output = [NSMutableString string ];
@@ -207,12 +207,12 @@ + (NSError *)errorFromStripeResponse:(NSDictionary *)jsonDictionary
207207 NSString *type = [errorDictionary valueForKey: @" type"
208208 NSString *devMessage = [errorDictionary valueForKey: @" message"
209209 NSString *parameter = [errorDictionary valueForKey: @" param"
210- NSString *userMessage = NULL ;
211- NSString *cardErrorCode = NULL ;
210+ NSString *userMessage = nil ;
211+ NSString *cardErrorCode = nil ;
212212 NSInteger code = 0 ;
213213
214214 // There should always be a message and type for the error
215- if (devMessage == NULL || type == NULL )
215+ if (devMessage == nil || type == nil )
216216 {
217217 NSDictionary *userInfoDict = @{ NSLocalizedDescriptionKey : STPUnexpectedError,
218218 STPErrorMessageKey : [NSString stringWithFormat: @" Could not interpret the error response that was returned from Stripe."
@@ -315,10 +315,10 @@ + (void)setDefaultPublishableKey:(NSString *)publishableKey
315315
316316+ (void )createTokenWithCard : (STPCard *)card publishableKey : (NSString *)publishableKey operationQueue : (NSOperationQueue *)queue completion : (STPCompletionBlock)handler
317317{
318- if (card == NULL )
318+ if (card == nil )
319319 [NSException raise :@" RequiredParameter" format: @" 'card' is required to create a token"
320320
321- if (handler == NULL )
321+ if (handler == nil )
322322 [NSException raise :@" RequiredParameter" format: @" 'handler' is required to use the token that is created"
323323
324324 [self validateKey: publishableKey];
@@ -340,10 +340,10 @@ + (void)createTokenWithCard:(STPCard *)card publishableKey:(NSString *)publishab
340340
341341+ (void )requestTokenWithID : (NSString *)tokenId publishableKey : (NSString *)publishableKey operationQueue : (NSOperationQueue *)queue completion : (STPCompletionBlock)handler
342342{
343- if (tokenId == NULL )
343+ if (tokenId == nil )
344344 [NSException raise :@" RequiredParameter" format: @" 'tokenId' is required to retrieve a token"
345345
346- if (handler == NULL )
346+ if (handler == nil )
347347 [NSException raise :@" RequiredParameter" format: @" 'handler' is required to use the token that is requested"
348348
349349 [self validateKey: publishableKey];
0 commit comments