🚀 Version 6.2.1

PHP Monitor.xcodeproj/project.pbxproj

@@ -3520,7 +3520,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1340;
+				CURRENT_PROJECT_VERSION = 1346;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -3533,7 +3533,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 6.2;
+				MARKETING_VERSION = 6.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3551,7 +3551,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1340;
+				CURRENT_PROJECT_VERSION = 1346;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -3564,7 +3564,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 6.2;
+				MARKETING_VERSION = 6.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3791,7 +3791,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1340;
+				CURRENT_PROJECT_VERSION = 1346;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -3804,7 +3804,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 6.2;
+				MARKETING_VERSION = 6.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME) DEV";
@@ -3907,7 +3907,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1340;
+				CURRENT_PROJECT_VERSION = 1346;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -3920,7 +3920,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 6.2;
+				MARKETING_VERSION = 6.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME) DEV";
@@ -4023,7 +4023,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1340;
+				CURRENT_PROJECT_VERSION = 1346;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -4036,7 +4036,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 6.2;
+				MARKETING_VERSION = 6.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME) EAP";
@@ -4204,7 +4204,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1340;
+				CURRENT_PROJECT_VERSION = 1346;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -4217,7 +4217,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 6.2;
+				MARKETING_VERSION = 6.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME) EAP";

phpmon/Common/Core/Constants.swift

@@ -20,10 +20,26 @@ struct Constants {
 
     /**
      * The PHP versions that are considered pre-release versions.
+     * Past a certain date, an experimental version "graduates"
+     * to a release version and is no longer marked as experimental.
      */
-    static let ExperimentalPhpVersions: Set = [
-        "8.3", "8.4"
-    ]
+    static var ExperimentalPhpVersions: Set<String> {
+        let releaseDates = [
+            "8.4": Date.fromString("2024-12-01"), // PLACEHOLDER DATE
+            "8.3": Date.fromString("2023-11-23") // OFFICIAL RELEASE
+        ]
+
+        return Set(releaseDates
+            .filter { (_: String, date: Date?) in
+                guard let date else {
+                    return false
+                }
+
+                return date > Date.now
+            }.map { (version: String, _: Date?) in
+                return version
+            })
+    }
 
     /**
      * The PHP versions supported by this application.
@@ -91,6 +107,8 @@ struct Constants {
             string: "https://raw.githubusercontent.com/nicoverbruggen/homebrew-cask/master/Casks/phpmon-dev.rb"
         )!
 
+        // EAP URLs
+
         static let EarlyAccessCaskFile = URL(
             string: "https://phpmon.app/builds/early-access/sponsors/phpmon-eap.rb"
         )!

phpmon/Common/Extensions/DateExtension.swift

@@ -15,4 +15,10 @@ extension Date {
         return dateFormatter.string(from: self)
     }
 
+    static func fromString(_ string: String) -> Date? {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd"
+        return dateFormatter.date(from: string)
+    }
+
 }

phpmon/Common/PHP/PHP Version/PhpEnvironments.swift

@@ -13,7 +13,7 @@ class PhpEnvironments {
     // MARK: - Initializer
 
     /**
-
+     Loads the currently active PHP installation upon startup. May be empty.
      */
     init() {
         self.currentInstall = ActivePhpInstallation.load()
@@ -49,12 +49,10 @@ class PhpEnvironments {
     static let shared = PhpEnvironments()
 
     /** Whether the switcher is busy performing any actions. */
-    var isBusy: Bool = false {
+    @MainActor var isBusy: Bool = false {
         didSet {
-            Task { @MainActor in
-                MainMenu.shared.setBusyImage()
-                MainMenu.shared.rebuild()
-            }
+            MainMenu.shared.refreshIcon()
+            MainMenu.shared.rebuild()
         }
     }
 

phpmon/Common/PHP/PhpExtension.swift

@@ -67,7 +67,7 @@ class PhpExtension {
 
         self.name = String(fullPath.split(separator: "/").last!) // take last segment
 
-        self.enabled = !line.contains(";")
+        self.enabled = !line.starts(with: ";")
         self.file = file
     }
 
@@ -76,22 +76,22 @@ class PhpExtension {
      You may need to restart the other services in order for this change to apply.
      */
     func toggle() async {
-        let newLine = enabled
+        let newLine = !line.starts(with: ";")
             // DISABLED: Commented out line
             ? "; \(line)"
             // ENABLED: Line where the comment delimiter (;) is removed
             : line.replacingOccurrences(of: "; ", with: "")
 
         await sed(file: file, original: line, replacement: newLine)
 
-        enabled.toggle()
+        self.enabled = !newLine.starts(with: ";")
+        self.line = newLine
 
         if !isRunningTests {
             Task { @MainActor in
                 MainMenu.shared.rebuild()
             }
         }
-
     }
 
     // MARK: - Static Methods

phpmon/Domain/Integrations/Composer/ComposerWindow.swift

@@ -28,8 +28,6 @@ import Foundation
         }
 
         PhpEnvironments.shared.isBusy = true
-        MainMenu.shared.setBusyImage()
-        MainMenu.shared.rebuild()
 
         window = TerminalProgressWindowController.display(
             title: "alert.composer_progress.title".localized,
@@ -106,14 +104,11 @@ import Foundation
 
     private func removeBusyStatus() {
         PhpEnvironments.shared.isBusy = false
-        Task { @MainActor in
-            MainMenu.shared.updatePhpVersionInStatusBar()
-        }
     }
 
     // MARK: Alert
 
-    @MainActor private func presentMissingAlert() {
+    private func presentMissingAlert() {
         BetterAlert()
             .withInformation(
                 title: "alert.composer_missing.title".localized,

phpmon/Domain/Integrations/Homebrew/Brew.swift

@@ -45,7 +45,8 @@ class Brew {
 
     /// Each formula for each PHP version that can be installed.
     public static let phpVersionFormulae = [
-        "8.3": "shivammathur/php/[email protected]",
+        "8.4": "shivammathur/php/[email protected]",
+        "8.3": "shivammathur/php/[email protected]", // TODO: when [email protected] lands in stable, update this
         "8.2": "[email protected]",
         "8.1": "[email protected]",
         "8.0": "[email protected]",

phpmon/Domain/Menu/MainMenu+Actions.swift

@@ -283,7 +283,6 @@ extension MainMenu {
             return
         }
 
-        setBusyImage()
         PhpEnvironments.shared.isBusy = true
         PhpEnvironments.shared.delegate = self
         PhpEnvironments.shared.delegate?.switcherDidStartSwitching(to: version)
@@ -298,7 +297,6 @@ extension MainMenu {
     }
 
     @objc func switchToPhpVersion(_ version: String) {
-        setBusyImage()
         PhpEnvironments.shared.isBusy = true
         PhpEnvironments.shared.delegate = self
         PhpEnvironments.shared.delegate?.switcherDidStartSwitching(to: version)
@@ -325,7 +323,6 @@ extension MainMenu {
      */
     func switchToPhp(_ version: String) async {
         Task { @MainActor [self] in
-            setBusyImage()
             PhpEnvironments.shared.isBusy = true
             PhpEnvironments.shared.delegate = self
             PhpEnvironments.shared.delegate?.switcherDidStartSwitching(to: version)

phpmon/Domain/Menu/MainMenu+Async.swift

@@ -45,21 +45,16 @@ extension MainMenu {
             .broadcastServicesUpdate
         ]
     ) {
-        if behaviours.contains(.reloadsPhpInstallation) {
+        if behaviours.contains(.reloadsPhpInstallation) || behaviours.contains(.setsBusyUI) {
             PhpEnvironments.shared.isBusy = true
         }
 
-        if behaviours.contains(.setsBusyUI) {
-            setBusyImage()
-        }
-
         Task(priority: .userInitiated) { [unowned self] in
             var error: Error?
 
-            do { try execute() } catch let e { error = e }
-
-            if behaviours.contains(.setsBusyUI) {
-                PhpEnvironments.shared.isBusy = false
+            do { try execute() } catch let e {
+                error = e
+                Log.err(e)
             }
 
             Task { @MainActor [self, error] in
@@ -69,14 +64,16 @@ extension MainMenu {
 
                 if behaviours.contains(.updatesMenuBarContents) {
                     updatePhpVersionInStatusBar()
-                } else if behaviours.contains(.setsBusyUI) {
-                    refreshIcon()
                 }
 
                 if behaviours.contains(.broadcastServicesUpdate) {
                     Task { await ServicesManager.shared.reloadServicesStatus() }
                 }
 
+                if behaviours.contains(.setsBusyUI) {
+                    PhpEnvironments.shared.isBusy = false
+                }
+
                 if error != nil {
                     return failure(error!)
                 }

phpmon/Domain/Menu/MainMenu+Startup.swift

@@ -105,6 +105,9 @@ extension MainMenu {
             Valet.shared.notifyAboutUnsupportedTLD()
         }
 
+        // Keep track of which PHP versions are currently about to release
+        Log.info("Experimental PHP versions: \(Constants.ExperimentalPhpVersions)")
+
         // Find out which services are active
         Log.info("The services manager knows about \(ServicesManager.shared.services.count) services.")
 

phpmon/Domain/Menu/MainMenu+Switcher.swift

@@ -16,7 +16,9 @@ extension MainMenu {
 
     nonisolated func switcherDidCompleteSwitch(to version: String) {
         // Mark as no longer busy
-        PhpEnvironments.shared.isBusy = false
+        Task { @MainActor in
+            PhpEnvironments.shared.isBusy = false
+        }
 
         Task { // Things to do after reloading domain list data
             if Valet.installed {

phpmon/Domain/Menu/MainMenu.swift

@@ -87,6 +87,7 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate, PhpSwitcherDelegate
     }
 
     /** Updates the icon (refresh icon) and rebuilds the menu. */
+    @available(*, deprecated, message: "Use the busy status instead")
     @objc func updatePhpVersionInStatusBar() {
         refreshIcon()
         rebuild()
@@ -139,7 +140,7 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate, PhpSwitcherDelegate
     @objc func reloadPhpMonitorMenuInBackground() {
         asyncExecution({
             // This automatically reloads the menu
-            Log.info("Reloading information about the PHP installation (in the background)...")
+            Log.perf("Reloading information about the PHP installation (in the background)...")
         }, behaviours: [
             .setsBusyUI,
             .reloadsPhpInstallation,
@@ -150,10 +151,13 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate, PhpSwitcherDelegate
 
     /** Refreshes the icon with the PHP version. */
     @objc func refreshIcon() {
+
         Task { @MainActor [self] in
             if PhpEnvironments.shared.isBusy {
+                Log.perf("Refreshing icon: currently busy")
                 setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
             } else {
+                Log.perf("Refreshing icon: no longer busy")
                 if Preferences.preferences[.shouldDisplayDynamicIcon] as! Bool == false {
                     // Static icon has been requested
                     setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIconStatic"))!)
@@ -172,13 +176,6 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate, PhpSwitcherDelegate
         }
     }
 
-    /** Updates the icon to be displayed as busy. */
-    @objc func setBusyImage() {
-        Task { @MainActor [self] in
-            setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
-        }
-    }
-
     // MARK: - Menu Item Functionality
 
     @objc func openAbout() {