From b7cad3af629224ffc1c75cf6694e050ca6d7a5cc Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Sat, 30 Mar 2024 17:39:30 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Fix=20Swift=205.10=20concurrency?=
 =?UTF-8?q?=20warnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 phpmon/Domain/App/AppDelegate.swift       |  9 +--------
 phpmon/Domain/Menu/StatusMenu+Items.swift | 12 ++++++------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/phpmon/Domain/App/AppDelegate.swift b/phpmon/Domain/App/AppDelegate.swift
index 5755588..e222c66 100644
--- a/phpmon/Domain/App/AppDelegate.swift
+++ b/phpmon/Domain/App/AppDelegate.swift
@@ -23,12 +23,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
      */
     let state: App
 
-    /**
-     The MainMenu singleton is responsible for rendering the
-     menu bar item and its menu, as well as its actions.
-     */
-    let menu: MainMenu
-
     /**
      The paths singleton that determines where Homebrew is installed,
      and where to look for binaries.
@@ -96,7 +90,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
         }
 
         self.state = App.shared
-        self.menu = MainMenu.shared
         self.paths = Paths.shared
         self.valet = Valet.shared
         self.brew = Brew.shared
@@ -132,7 +125,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
         setupNotifications()
 
         Task { // Make sure the menu performs its initial checks
-            await menu.startup()
+            await MainMenu.shared.startup()
         }
     }
 
diff --git a/phpmon/Domain/Menu/StatusMenu+Items.swift b/phpmon/Domain/Menu/StatusMenu+Items.swift
index c10267a..85b29b6 100644
--- a/phpmon/Domain/Menu/StatusMenu+Items.swift
+++ b/phpmon/Domain/Menu/StatusMenu+Items.swift
@@ -242,7 +242,7 @@ extension StatusMenu {
         addLoadedPresets()
     }
 
-    private func addEmptyPresetHelp() {
+    @MainActor private func addEmptyPresetHelp() {
         addItem(NSMenuItem(title: "mi_presets_title".localized, submenu: [
             NSMenuItem(title: "mi_no_presets".localized),
             NSMenuItem.separator(),
@@ -251,7 +251,7 @@ extension StatusMenu {
         ], target: MainMenu.shared))
     }
 
-    private func addLoadedPresets() {
+    @MainActor private func addLoadedPresets() {
         addItem(NSMenuItem(title: "mi_presets_title".localized, submenu: [
             NSMenuItem.separator(),
             HeaderView.asMenuItem(text: "mi_apply_presets_title".localized)
@@ -266,7 +266,7 @@ extension StatusMenu {
 
     // MARK: - Xdebug
 
-    func addXdebugMenuItem() {
+    @MainActor func addXdebugMenuItem() {
         if !Xdebug.enabled {
             addItem(NSMenuItem.separator())
             return
@@ -286,7 +286,7 @@ extension StatusMenu {
 
     // MARK: - PHP Doctor
 
-    func addPhpDoctorMenuItem() {
+    @MainActor func addPhpDoctorMenuItem() {
         if !Preferences.isEnabled(.showPhpDoctorSuggestions) ||
             !WarningManager.shared.hasWarnings() {
             return
@@ -302,7 +302,7 @@ extension StatusMenu {
 
     // MARK: - First Aid & Services
 
-    func addFirstAidAndServicesMenuItems() {
+    @MainActor func addFirstAidAndServicesMenuItems() {
         let services = NSMenuItem(title: "mi_other".localized)
 
         var items: [NSMenuItem] = [
@@ -359,7 +359,7 @@ extension StatusMenu {
 
     // MARK: - Other helper methods to generate menu items
 
-    func addExtensionItem(_ phpExtension: PhpExtension, _ shortcutKey: Int) {
+    @MainActor func addExtensionItem(_ phpExtension: PhpExtension, _ shortcutKey: Int) {
         let keyEquivalent = shortcutKey < 9 ? "\(shortcutKey)" : ""
 
         let menuItem = ExtensionMenuItem(