Skip to content

Commit ba863a6

Browse files
millenomimillenomi
authored
Merge pull request #2292 from ikesyo/fix-dateformatter-symbolds-optionality
[DateFormatter] Fix symbols property optionality
2 parents 40244c8 + f6f64d0 commit ba863a6

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎Foundation/DateFormatter.swift

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ open class DateFormatter : Formatter {
221221

222222
/*@NSCopying*/ open var defaultDate: Date? { willSet { _reset() } }
223223

224-
internal var _eraSymbols: [String]! { willSet { _reset() } }
225-
open var eraSymbols: [String]! {
224+
internal var _eraSymbols: [String]? { willSet { _reset() } }
225+
open var eraSymbols: [String] {
226226
get {
227227
guard let symbols = _eraSymbols else {
228228
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterEraSymbols) as! NSArray
@@ -235,8 +235,8 @@ open class DateFormatter : Formatter {
235235
}
236236
}
237237

238-
internal var _monthSymbols: [String]! { willSet { _reset() } }
239-
open var monthSymbols: [String]! {
238+
internal var _monthSymbols: [String]? { willSet { _reset() } }
239+
open var monthSymbols: [String] {
240240
get {
241241
guard let symbols = _monthSymbols else {
242242
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterMonthSymbols) as! NSArray
@@ -249,8 +249,8 @@ open class DateFormatter : Formatter {
249249
}
250250
}
251251

252-
internal var _shortMonthSymbols: [String]! { willSet { _reset() } }
253-
open var shortMonthSymbols: [String]! {
252+
internal var _shortMonthSymbols: [String]? { willSet { _reset() } }
253+
open var shortMonthSymbols: [String] {
254254
get {
255255
guard let symbols = _shortMonthSymbols else {
256256
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterShortMonthSymbols) as! NSArray
@@ -264,8 +264,8 @@ open class DateFormatter : Formatter {
264264
}
265265

266266

267-
internal var _weekdaySymbols: [String]! { willSet { _reset() } }
268-
open var weekdaySymbols: [String]! {
267+
internal var _weekdaySymbols: [String]? { willSet { _reset() } }
268+
open var weekdaySymbols: [String] {
269269
get {
270270
guard let symbols = _weekdaySymbols else {
271271
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterWeekdaySymbols) as! NSArray
@@ -278,8 +278,8 @@ open class DateFormatter : Formatter {
278278
}
279279
}
280280

281-
internal var _shortWeekdaySymbols: [String]! { willSet { _reset() } }
282-
open var shortWeekdaySymbols: [String]! {
281+
internal var _shortWeekdaySymbols: [String]? { willSet { _reset() } }
282+
open var shortWeekdaySymbols: [String] {
283283
get {
284284
guard let symbols = _shortWeekdaySymbols else {
285285
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterShortWeekdaySymbols) as! NSArray
@@ -292,8 +292,8 @@ open class DateFormatter : Formatter {
292292
}
293293
}
294294

295-
internal var _amSymbol: String! { willSet { _reset() } }
296-
open var amSymbol: String! {
295+
internal var _amSymbol: String? { willSet { _reset() } }
296+
open var amSymbol: String {
297297
get {
298298
guard let symbol = _amSymbol else {
299299
return (CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterAMSymbol) as! NSString)._swiftObject
@@ -305,8 +305,8 @@ open class DateFormatter : Formatter {
305305
}
306306
}
307307

308-
internal var _pmSymbol: String! { willSet { _reset() } }
309-
open var pmSymbol: String! {
308+
internal var _pmSymbol: String? { willSet { _reset() } }
309+
open var pmSymbol: String {
310310
get {
311311
guard let symbol = _pmSymbol else {
312312
return (CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterPMSymbol) as! NSString)._swiftObject
@@ -318,8 +318,8 @@ open class DateFormatter : Formatter {
318318
}
319319
}
320320

321-
internal var _longEraSymbols: [String]! { willSet { _reset() } }
322-
open var longEraSymbols: [String]! {
321+
internal var _longEraSymbols: [String]? { willSet { _reset() } }
322+
open var longEraSymbols: [String] {
323323
get {
324324
guard let symbols = _longEraSymbols else {
325325
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterLongEraSymbols) as! NSArray
@@ -332,8 +332,8 @@ open class DateFormatter : Formatter {
332332
}
333333
}
334334

335-
internal var _veryShortMonthSymbols: [String]! { willSet { _reset() } }
336-
open var veryShortMonthSymbols: [String]! {
335+
internal var _veryShortMonthSymbols: [String]? { willSet { _reset() } }
336+
open var veryShortMonthSymbols: [String] {
337337
get {
338338
guard let symbols = _veryShortMonthSymbols else {
339339
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterVeryShortMonthSymbols) as! NSArray
@@ -346,8 +346,8 @@ open class DateFormatter : Formatter {
346346
}
347347
}
348348

349-
internal var _standaloneMonthSymbols: [String]! { willSet { _reset() } }
350-
open var standaloneMonthSymbols: [String]! {
349+
internal var _standaloneMonthSymbols: [String]? { willSet { _reset() } }
350+
open var standaloneMonthSymbols: [String] {
351351
get {
352352
guard let symbols = _standaloneMonthSymbols else {
353353
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterStandaloneMonthSymbols) as! NSArray
@@ -360,8 +360,8 @@ open class DateFormatter : Formatter {
360360
}
361361
}
362362

363-
internal var _shortStandaloneMonthSymbols: [String]! { willSet { _reset() } }
364-
open var shortStandaloneMonthSymbols: [String]! {
363+
internal var _shortStandaloneMonthSymbols: [String]? { willSet { _reset() } }
364+
open var shortStandaloneMonthSymbols: [String] {
365365
get {
366366
guard let symbols = _shortStandaloneMonthSymbols else {
367367
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterShortStandaloneMonthSymbols) as! NSArray
@@ -374,8 +374,8 @@ open class DateFormatter : Formatter {
374374
}
375375
}
376376

377-
internal var _veryShortStandaloneMonthSymbols: [String]! { willSet { _reset() } }
378-
open var veryShortStandaloneMonthSymbols: [String]! {
377+
internal var _veryShortStandaloneMonthSymbols: [String]? { willSet { _reset() } }
378+
open var veryShortStandaloneMonthSymbols: [String] {
379379
get {
380380
guard let symbols = _veryShortStandaloneMonthSymbols else {
381381
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterVeryShortStandaloneMonthSymbols) as! NSArray
@@ -388,8 +388,8 @@ open class DateFormatter : Formatter {
388388
}
389389
}
390390

391-
internal var _veryShortWeekdaySymbols: [String]! { willSet { _reset() } }
392-
open var veryShortWeekdaySymbols: [String]! {
391+
internal var _veryShortWeekdaySymbols: [String]? { willSet { _reset() } }
392+
open var veryShortWeekdaySymbols: [String] {
393393
get {
394394
guard let symbols = _veryShortWeekdaySymbols else {
395395
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterVeryShortWeekdaySymbols) as! NSArray
@@ -402,8 +402,8 @@ open class DateFormatter : Formatter {
402402
}
403403
}
404404

405-
internal var _standaloneWeekdaySymbols: [String]! { willSet { _reset() } }
406-
open var standaloneWeekdaySymbols: [String]! {
405+
internal var _standaloneWeekdaySymbols: [String]? { willSet { _reset() } }
406+
open var standaloneWeekdaySymbols: [String] {
407407
get {
408408
guard let symbols = _standaloneWeekdaySymbols else {
409409
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterStandaloneWeekdaySymbols) as! NSArray
@@ -416,8 +416,8 @@ open class DateFormatter : Formatter {
416416
}
417417
}
418418

419-
internal var _shortStandaloneWeekdaySymbols: [String]! { willSet { _reset() } }
420-
open var shortStandaloneWeekdaySymbols: [String]! {
419+
internal var _shortStandaloneWeekdaySymbols: [String]? { willSet { _reset() } }
420+
open var shortStandaloneWeekdaySymbols: [String] {
421421
get {
422422
guard let symbols = _shortStandaloneWeekdaySymbols else {
423423
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterShortStandaloneWeekdaySymbols) as! NSArray
@@ -430,8 +430,8 @@ open class DateFormatter : Formatter {
430430
}
431431
}
432432

433-
internal var _veryShortStandaloneWeekdaySymbols: [String]! { willSet { _reset() } }
434-
open var veryShortStandaloneWeekdaySymbols: [String]! {
433+
internal var _veryShortStandaloneWeekdaySymbols: [String]? { willSet { _reset() } }
434+
open var veryShortStandaloneWeekdaySymbols: [String] {
435435
get {
436436
guard let symbols = _veryShortStandaloneWeekdaySymbols else {
437437
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterVeryShortStandaloneWeekdaySymbols) as! NSArray
@@ -444,8 +444,8 @@ open class DateFormatter : Formatter {
444444
}
445445
}
446446

447-
internal var _quarterSymbols: [String]! { willSet { _reset() } }
448-
open var quarterSymbols: [String]! {
447+
internal var _quarterSymbols: [String]? { willSet { _reset() } }
448+
open var quarterSymbols: [String] {
449449
get {
450450
guard let symbols = _quarterSymbols else {
451451
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterQuarterSymbols) as! NSArray
@@ -458,8 +458,8 @@ open class DateFormatter : Formatter {
458458
}
459459
}
460460

461-
internal var _shortQuarterSymbols: [String]! { willSet { _reset() } }
462-
open var shortQuarterSymbols: [String]! {
461+
internal var _shortQuarterSymbols: [String]? { willSet { _reset() } }
462+
open var shortQuarterSymbols: [String] {
463463
get {
464464
guard let symbols = _shortQuarterSymbols else {
465465
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterShortQuarterSymbols) as! NSArray
@@ -472,8 +472,8 @@ open class DateFormatter : Formatter {
472472
}
473473
}
474474

475-
internal var _standaloneQuarterSymbols: [String]! { willSet { _reset() } }
476-
open var standaloneQuarterSymbols: [String]! {
475+
internal var _standaloneQuarterSymbols: [String]? { willSet { _reset() } }
476+
open var standaloneQuarterSymbols: [String] {
477477
get {
478478
guard let symbols = _standaloneQuarterSymbols else {
479479
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterStandaloneQuarterSymbols) as! NSArray
@@ -486,8 +486,8 @@ open class DateFormatter : Formatter {
486486
}
487487
}
488488

489-
internal var _shortStandaloneQuarterSymbols: [String]! { willSet { _reset() } }
490-
open var shortStandaloneQuarterSymbols: [String]! {
489+
internal var _shortStandaloneQuarterSymbols: [String]? { willSet { _reset() } }
490+
open var shortStandaloneQuarterSymbols: [String] {
491491
get {
492492
guard let symbols = _shortStandaloneQuarterSymbols else {
493493
let cfSymbols = CFDateFormatterCopyProperty(_cfObject, kCFDateFormatterShortStandaloneQuarterSymbols) as! NSArray

0 commit comments

Comments
 (0)