Merge branch 'quokkaKyu-master'

Alexey Naumov · Alexey Naumov · commit 94193d965a91 · 2024-09-26T18:14:52.000+06:00
diff --git a/CountriesSwiftUI/Persistence/CoreDataHelpers.swift b/CountriesSwiftUI/Persistence/CoreDataHelpers.swift
@@ -16,7 +16,7 @@ protocol ManagedEntity: NSFetchRequestResult { }
 extension ManagedEntity where Self: NSManagedObject {
     
     static var entityName: String {
-        let nameMO = String(describing: Self.self)
+        let nameMO = String(describing: self)
         let suffixIndex = nameMO.index(nameMO.endIndex, offsetBy: -2)
         return String(nameMO[..<suffixIndex])
     }
diff --git a/CountriesSwiftUI/System/PushNotificationsHandler.swift b/CountriesSwiftUI/System/PushNotificationsHandler.swift
@@ -10,7 +10,7 @@ import UserNotifications
 
 protocol PushNotificationsHandler { }
 
-class RealPushNotificationsHandler: NSObject, PushNotificationsHandler {
+final class RealPushNotificationsHandler: NSObject, PushNotificationsHandler {
     
     private let deepLinksHandler: DeepLinksHandler
     
diff --git a/CountriesSwiftUI/UI/Screens/CountriesList.swift b/CountriesSwiftUI/UI/Screens/CountriesList.swift
@@ -81,7 +81,7 @@ private extension CountriesList {
          Variable `@Environment(\.locale) var locale: Locale`
          from the view is not accessible when searching by name
          */
-        class Container {
+        final class Container {
             var locale: Locale = .backendDefault
         }
         let container: Container
diff --git a/CountriesSwiftUI/Utilities/LazyList.swift b/CountriesSwiftUI/Utilities/LazyList.swift
@@ -52,7 +52,7 @@ struct LazyList<T> {
 }
 
 private extension LazyList {
-    class Cache {
+    final private class Cache {
         
         private var elements = [Int: T]()
         
diff --git a/UnitTests/Interactors/UserPermissionsInteractorTests.swift b/UnitTests/Interactors/UserPermissionsInteractorTests.swift
@@ -10,7 +10,7 @@ import XCTest
 import Combine
 @testable import CountriesSwiftUI
 
-class UserPermissionsInteractorTests: XCTestCase {
+final class UserPermissionsInteractorTests: XCTestCase {
     
     var state = Store<AppState>(AppState())
     var sut: RealUserPermissionsInteractor!
diff --git a/UnitTests/Mocks/MockedInteractors.swift b/UnitTests/Mocks/MockedInteractors.swift
@@ -84,7 +84,7 @@ struct MockedImagesInteractor: Mock, ImagesInteractor {
 
 // MARK: - ImagesInteractor
 
-class MockedUserPermissionsInteractor: Mock, UserPermissionsInteractor {
+final class MockedUserPermissionsInteractor: Mock, UserPermissionsInteractor {
     
     enum Action: Equatable {
         case resolveStatus(Permission)
diff --git a/UnitTests/Repositories/PushTokenWebRepositoryTests.swift b/UnitTests/Repositories/PushTokenWebRepositoryTests.swift
@@ -10,7 +10,7 @@ import XCTest
 import Combine
 @testable import CountriesSwiftUI
 
-class PushTokenWebRepositoryTests: XCTestCase {
+final class PushTokenWebRepositoryTests: XCTestCase {
 
     private var sut: RealPushTokenWebRepository!
     private var cancelBag = CancelBag()
diff --git a/UnitTests/System/DeepLinksHandlerTests.swift b/UnitTests/System/DeepLinksHandlerTests.swift
@@ -9,7 +9,7 @@
 import XCTest
 @testable import CountriesSwiftUI
 
-class DeepLinksHandlerTests: XCTestCase {
+final class DeepLinksHandlerTests: XCTestCase {
 
     func test_noSideEffectOnInit() {
         let interactors: DIContainer.Interactors = .mocked()
diff --git a/UnitTests/System/PushNotificationsHandlerTests.swift b/UnitTests/System/PushNotificationsHandlerTests.swift
@@ -10,7 +10,7 @@ import XCTest
 import UserNotifications
 @testable import CountriesSwiftUI
 
-class PushNotificationsHandlerTests: XCTestCase {
+final class PushNotificationsHandlerTests: XCTestCase {
     
     var sut: RealPushNotificationsHandler!
 
diff --git a/UnitTests/Utilities/HelpersTests.swift b/UnitTests/Utilities/HelpersTests.swift
@@ -9,7 +9,7 @@
 import XCTest
 @testable import CountriesSwiftUI
 
-class HelpersTests: XCTestCase {
+final class HelpersTests: XCTestCase {
 
     func test_localized_knownLocale() {
         let sut = "Countries".localized(Locale(identifier: "fr"))

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ protocol ManagedEntity: NSFetchRequestResult { }`
`16`	`16`	`extension ManagedEntity where Self: NSManagedObject {`
`17`	`17`
`18`	`18`	`static var entityName: String {`
`19`		`- let nameMO = String(describing: Self.self)`
	`19`	`+ let nameMO = String(describing: self)`
`20`	`20`	`let suffixIndex = nameMO.index(nameMO.endIndex, offsetBy: -2)`
`21`	`21`	`return String(nameMO[..<suffixIndex])`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ private extension CountriesList {`
`81`	`81`	Variable `@Environment(\.locale) var locale: Locale`
`82`	`82`	`from the view is not accessible when searching by name`
`83`	`83`	`*/`
`84`		`- class Container {`
	`84`	`+ final class Container {`
`85`	`85`	`var locale: Locale = .backendDefault`
`86`	`86`	`}`
`87`	`87`	`let container: Container`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ struct LazyList<T> {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private extension LazyList {`
`55`		`- class Cache {`
	`55`	`+ final private class Cache {`
`56`	`56`
`57`	`57`	`private var elements = [Int: T]()`
`58`	`58`