🏗 Use @MainActor for BetterAlert

phpmon/Common/Helpers/LocalNotification.swift

@@ -10,7 +10,7 @@ import UserNotifications
 
 class LocalNotification {
 
-    public static func send(title: String, subtitle: String, preference: PreferenceName) {
+    @MainActor public static func send(title: String, subtitle: String, preference: PreferenceName) {
         if !Preferences.isEnabled(preference) {
             return
         }

phpmon/Domain/App/InterAppHandler.swift

@@ -56,6 +56,7 @@ class InterApp {
             if PhpEnv.shared.availablePhpVersions.contains(version) {
                 MainMenu.shared.switchToPhpVersion(version)
             } else {
+                DispatchQueue.main.async {
                     BetterAlert().withInformation(
                         title: "alert.php_switch_unavailable.title".localized,
                         subtitle: "alert.php_switch_unavailable.subtitle".localized(version)
@@ -63,6 +64,7 @@ class InterApp {
                         text: "alert.php_switch_unavailable.ok".localized
                     ).show()
                 }
+            }
         })
     ]}
 

phpmon/Domain/Integrations/Composer/ComposerWindow.swift

@@ -25,7 +25,9 @@ class ComposerWindow {
 
         Paths.shared.detectBinaryPaths()
         if Paths.composer == nil {
-            presentMissingAlert()
+            DispatchQueue.main.async {
+                self.presentMissingAlert()
+            }
             return
         }
 
@@ -116,7 +118,7 @@ class ComposerWindow {
 
     // MARK: Alert
 
-    private func presentMissingAlert() {
+    @MainActor private func presentMissingAlert() {
         BetterAlert()
             .withInformation(
                 title: "alert.composer_missing.title".localized,

phpmon/Domain/Menu/MainMenu+Actions.swift

@@ -53,7 +53,6 @@ extension MainMenu {
             Actions.restartPhpFpm()
             Actions.restartNginx()
         } success: {
-            DispatchQueue.main.async {
             LocalNotification.send(
                 title: "notification.services_restarted".localized,
                 subtitle: "notification.services_restarted_desc".localized,
@@ -61,13 +60,11 @@ extension MainMenu {
             )
         }
     }
-    }
 
     @objc func stopValetServices() {
         asyncExecution {
             Actions.stopValetServices()
         } success: {
-            DispatchQueue.main.async {
             LocalNotification.send(
                 title: "notification.services_stopped".localized,
                 subtitle: "notification.services_stopped_desc".localized,
@@ -75,7 +72,6 @@ extension MainMenu {
             )
         }
     }
-    }
 
     @objc func restartNginx() {
         asyncExecution {
@@ -155,7 +151,7 @@ extension MainMenu {
         }
     }
 
-    @objc func rollbackPreset() {
+    @MainActor @objc func rollbackPreset() {
         guard let preset = PresetHelper.rollbackPreset else {
             return
         }
@@ -180,7 +176,7 @@ extension MainMenu {
         }
     }
 
-    @objc func showPresetHelp() {
+    @MainActor @objc func showPresetHelp() {
         BetterAlert().withInformation(
             title: "preset_help_title".localized,
             subtitle: "preset_help_info".localized,

phpmon/Domain/Menu/MainMenu+Async.swift

@@ -36,8 +36,8 @@ extension MainMenu {
      */
     func asyncExecution(
         _ execute: @escaping () throws -> Void,
-        success: @escaping () -> Void = {},
+        success: @MainActor @escaping () -> Void = {},
-        failure: @escaping (Error) -> Void = { _ in },
+        failure: @MainActor @escaping (Error) -> Void = { _ in },
         behaviours: [AsyncBehaviour] = [
             .setsBusyUI,
             .reloadsPhpInstallation,

phpmon/Domain/Menu/MainMenu+FixMyValet.swift

@@ -11,7 +11,7 @@ import AppKit
 
 extension MainMenu {
 
-    @objc func fixMyValet() {
+    @MainActor @objc func fixMyValet() {
         let previousVersion = PhpEnv.phpInstall.version.short
 
         if !PhpEnv.shared.availablePhpVersions.contains(PhpEnv.brewPhpVersion) {
@@ -42,7 +42,7 @@ extension MainMenu {
         }
     }
 
-    private func presentAlertForMissingFormula() {
+    @MainActor private func presentAlertForMissingFormula() {
         BetterAlert()
             .withInformation(
                 title: "alert.php_formula_missing.title".localized,
@@ -52,7 +52,7 @@ extension MainMenu {
             .show()
     }
 
-    private func presentAlertForSameVersion() {
+    @MainActor private func presentAlertForSameVersion() {
         BetterAlert()
             .withInformation(
                 title: "alert.fix_my_valet_done.title".localized,
@@ -63,7 +63,7 @@ extension MainMenu {
             .show()
     }
 
-    private func presentAlertForDifferentVersion(version: String) {
+    @MainActor private func presentAlertForDifferentVersion(version: String) {
         BetterAlert()
             .withInformation(
                 title: "alert.fix_my_valet_done.title".localized,

phpmon/Domain/Menu/MainMenu+Switcher.swift

@@ -50,7 +50,7 @@ extension MainMenu {
         }
     }
 
-    private func suggestFixMyValet(failed version: String) {
+    @MainActor private func suggestFixMyValet(failed version: String) {
         let outcome = BetterAlert()
             .withInformation(
                 title: "alert.php_switch_failed.title".localized(version),
@@ -75,6 +75,7 @@ extension MainMenu {
     }
 
     private func notifyAboutVersionChange(to version: String) {
+        DispatchQueue.main.async {
             LocalNotification.send(
                 title: String(format: "notification.version_changed_title".localized, version),
                 subtitle: String(format: "notification.version_changed_desc".localized, version),
@@ -84,3 +85,4 @@ extension MainMenu {
             PhpEnv.phpInstall.notifyAboutBrokenPhpFpm()
         }
     }
+}

phpmon/Domain/Notice/BetterAlert.swift

@@ -102,14 +102,14 @@ class BetterAlert {
     /**
      Shows the modal and does not return anything.
      */
-    public func show() {
+    @MainActor public func show() {
         _ = self.runModal()
     }
 
     /**
      Shows the modal for a particular error.
      */
-    public static func show(for error: Error & AlertableError) {
+    @MainActor public static func show(for error: Error & AlertableError) {
         let key = error.getErrorMessageKey()
         return BetterAlert().withInformation(
             title: "\(key).title".localized,

phpmon/Domain/Presets/Preset.swift

@@ -107,13 +107,13 @@ struct Preset: Codable, Equatable {
 
             // Show the correct notification
             if wasRollback {
-                LocalNotification.send(
+                await LocalNotification.send(
                     title: "notification.preset_reverted_title".localized,
                     subtitle: "notification.preset_reverted_desc".localized,
                     preference: .notifyAboutPresets
                 )
             } else {
-                LocalNotification.send(
+                await LocalNotification.send(
                     title: "notification.preset_applied_title".localized,
                     subtitle: "notification.preset_applied_desc".localized(self.name),
                     preference: .notifyAboutPresets