🚀 Version 25.11.1

Author: nicoverbruggen

PHP Monitor.xcodeproj/project.pbxproj

@@ -3960,7 +3960,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1715;
+				CURRENT_PROJECT_VERSION = 1735;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				ENABLE_APP_SANDBOX = NO;
@@ -3979,7 +3979,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
-				MARKETING_VERSION = 25.11;
+				MARKETING_VERSION = 25.11.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4004,7 +4004,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1715;
+				CURRENT_PROJECT_VERSION = 1735;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				ENABLE_APP_SANDBOX = NO;
@@ -4023,7 +4023,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
-				MARKETING_VERSION = 25.11;
+				MARKETING_VERSION = 25.11.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4186,7 +4186,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1715;
+				CURRENT_PROJECT_VERSION = 1735;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				ENABLE_APP_SANDBOX = NO;
@@ -4205,7 +4205,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
-				MARKETING_VERSION = 25.11;
+				MARKETING_VERSION = 25.11.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME) EAP";
@@ -4379,7 +4379,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1715;
+				CURRENT_PROJECT_VERSION = 1735;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				ENABLE_APP_SANDBOX = NO;
@@ -4398,7 +4398,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
-				MARKETING_VERSION = 25.11;
+				MARKETING_VERSION = 25.11.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME) EAP";

phpmon/Common/Extensions/StringExtension.swift

@@ -164,4 +164,10 @@ extension String {
             of: "^[0-9]*$", // 1
             options: .regularExpression) != nil
     }
+
+    // MARK: - Helpers
+
+    var withDisplayName: String {
+        return self.replacing("PHP Monitor", with: App.displayName)
+    }
 }

phpmon/Common/Filesystem/RealFileSystem.swift

@@ -10,6 +10,11 @@ import Foundation
 
 extension String {
     var replacingTildeWithHomeDirectory: String {
+        // Skip replacement if not necessary
+        if !self.contains("~") {
+            return self
+        }
+
         // Try and check if there's a shared container
         if let paths = App.shared.container.paths {
             return self.replacing("~", with: paths.homePath)

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

@@ -26,7 +26,16 @@ class PhpEnvironments {
      If invalid, this will prevent PHP Monitor from starting correctly.
      */
     func getHomebrewInformation() async {
-        let brewPhpAlias = await container.shell.pipe("\(container.paths.brew) info php --json").out
+        // Let's see which formula we need to check
+        var formulaToLoad = "php"
+
+        // Depending on whether the `shivammathur/php` tap is installed, this command will vary
+        if BrewDiagnostics.shared.installedTaps.contains("shivammathur/php") {
+            formulaToLoad = "shivammathur/php/php"
+        }
+
+        // Let's check the alias by using `brew info`
+        let brewPhpAlias = await container.shell.pipe("\(container.paths.brew) info \(formulaToLoad) --json").out
 
         // Remove any non-JSON output (progress indicators, etc.) before the actual JSON array
         // This is a workaround for https://github.com/homebrew/brew/issues/20978
@@ -75,7 +84,7 @@ class PhpEnvironments {
             if let version = try? VersionNumber.parse(longVersionString) {
                 PhpEnvironments.brewPhpAlias = version.short
                 if version.short != homebrewPackage.version {
-                    Log.info("[BREW] An older version of `php` is actually installed (\(version.short)).")
+                    Log.info("[BREW] An older or newer version of `php` is actually installed (\(version.short)).")
                 }
             } else {
                 Log.warn("Could not determine the actual version of the php binary; assuming Homebrew is correct.")

phpmon/Domain/App/App.swift

@@ -17,6 +17,11 @@ class App {
     /** Use to determine whether a loaded testable configuration is being used. */
     static var hasLoadedTestableConfiguration: Bool = false
 
+    /** The display name of the app, as declared in Info.plist. */
+    static var displayName: String {
+        return Bundle.main.infoDictionary?["CFBundleName"] as! String
+    }
+
     /** Retrieve the version number from the main info dictionary, Info.plist. */
     static var version: String {
         let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String

phpmon/Domain/App/Startup.swift

@@ -147,17 +147,33 @@ class Startup {
                 descriptionText: "startup.errors.dyld_library.desc".localized
             ),
             // =================================================================================
-            // Make sure we can get valid output from Homebrew's info command.
+            // Make sure we can get valid output from Homebrew's `info` command.
             // =================================================================================
             EnvironmentCheck(
                 command: { container in
+                    // first, verify the taps
+                    await BrewDiagnostics.shared.loadInstalledTaps()
+                    // then, check the Homebrew information
                     await container.phpEnvs.getHomebrewInformation()
                     return container.phpEnvs.homebrewPackage == nil
                 },
                 name: "`brew info php --json` could parse valid JSON",
                 titleText: "startup.errors.php_brew_info_invalid.title".localized,
                 subtitleText: "startup.errors.php_brew_info_invalid.subtitle".localized,
                 descriptionText: "startup.errors.php_brew_info_invalid.desc".localized
+            ),
+            // =================================================================================
+            // Make sure we can determine the PHP alias.
+            // =================================================================================
+            EnvironmentCheck(
+                command: { container in
+                    await container.phpEnvs.determinePhpAlias()
+                    return PhpEnvironments.brewPhpAlias == nil
+                },
+                name: "`brew` alias is not nil and valid",
+                titleText: "startup.errors.could_not_determine_alias.title".localized,
+                subtitleText: "startup.errors.could_not_determine_alias.subtitle".localized,
+                descriptionText: "startup.errors.could_not_determine_alias.desc".localized
             )
         ]),
         EnvironmentCheckGroup(name: "valet", condition: { return Valet.installed }, checks: [

phpmon/Domain/Integrations/Homebrew/BrewDiagnostics.swift

@@ -120,19 +120,6 @@ class BrewDiagnostics {
         }
     }
 
-    /**
-     It is possible to have the `shivammathur/php` tap installed, and for the core homebrew information to be outdated.
-     This will then result in two different aliases claiming to point to the same formula (`php`).
-     This will break all linking functionality in PHP Monitor, and the user needs to be informed of this.
-
-     This check only needs to be performed if the `shivammathur/php` tap is active.
-     */
-    public func checkForCaskConflict() async {
-        if await hasAliasConflict() {
-            presentAlertAboutConflict()
-        }
-    }
-
     /**
      It is possible to upgrade PHP, but forget running `valet install`.
      This results in a scenario where a rogue www.conf file exists.
@@ -175,69 +162,6 @@ class BrewDiagnostics {
         }
     }
 
-    /**
-     Check if the alias conflict as documented in `checkForCaskConflict` actually occurred.
-     */
-    private func hasAliasConflict() async -> Bool {
-        let tapAlias = await container.shell.pipe("brew info shivammathur/php/php --json").out
-
-        if tapAlias.contains("brew tap shivammathur/php") || tapAlias.contains("Error") || tapAlias.isEmpty {
-            Log.info("The user does not appear to have tapped: shivammathur/php")
-            return false
-        } else {
-            Log.info("The user DOES have the following tapped: shivammathur/php")
-            Log.info("Checking for `php` formula conflicts...")
-
-            let tapPhp = try! JSONDecoder().decode(
-                [HomebrewPackage].self,
-                from: tapAlias.data(using: .utf8)!
-            ).first!
-
-            guard let tapPhpVersion = tapPhp.version else {
-                Log.warn("The `php` formula could not be determined.")
-                return false
-            }
-
-            if PhpEnvironments.brewPhpAlias != nil && tapPhp.version != PhpEnvironments.brewPhpAlias {
-                Log.warn("The `php` formula alias seems to be the different between the tap and core. "
-                         + "This could be a problem!")
-                Log.info("Determining whether both of these versions are installed...")
-
-                let availablePhpVersions = container.phpEnvs.availablePhpVersions
-
-                let bothInstalled = availablePhpVersions.contains(tapPhpVersion)
-                    && availablePhpVersions.contains(PhpEnvironments.brewPhpAlias!)
-
-                if bothInstalled {
-                    Log.warn("Both conflicting aliases seem to be installed, warning the user!")
-                } else {
-                    Log.info("Conflicting aliases are not both installed, seems fine!")
-                }
-
-                return bothInstalled
-            }
-
-            Log.info("All seems to be OK. No conflicts, both are PHP \(tapPhpVersion).")
-
-            return false
-        }
-    }
-
-    /**
-     Show this alert in case the tapped Cask does cause issues because of the conflict.
-     */
-    private func presentAlertAboutConflict() {
-        Task { @MainActor in
-            NVAlert()
-                .withInformation(
-                    title: "alert.php_alias_conflict.title".localized,
-                    subtitle: "alert.php_alias_conflict.info".localized
-                )
-                .withPrimary(text: "generic.ok".localized)
-                .show()
-        }
-    }
-
     /**
      In order to see if we support the --json syntax, we'll query nginx.
      If the JSON response cannot be parsed, Homebrew is probably out of date.

phpmon/Domain/Menu/MainMenu+Startup.swift

@@ -33,7 +33,7 @@ extension MainMenu {
         // Load additional preferences
         await container.preferences.loadCustomPreferences()
 
-        // Determine what the `php` formula is aliased to
+        // Determine what the `php` formula is aliased to (again)
         await container.phpEnvs.determinePhpAlias()
 
         // Make sure that broken symlinks are removed ASAP
@@ -53,15 +53,11 @@ extension MainMenu {
         // Validate the Homebrew version (determines install/upgrade functionality)
         await Brew.shared.determineVersion()
 
-        // Actually detect the PHP versions
-        await container.phpEnvs.reloadPhpVersions()
-
-        // Verify third party taps
-        // The missing tap(s) will be actionable later
+        // Verify third party taps (will display as warning)
         await BrewDiagnostics.shared.verifyThirdPartyTaps()
 
-        // Check for an alias conflict
-        await BrewDiagnostics.shared.checkForCaskConflict()
+        // Actually detect the PHP versions
+        await container.phpEnvs.reloadPhpVersions()
 
         // Set up the filesystem watcher for the Homebrew binaries
         App.shared.prepareHomebrewWatchers()

phpmon/Domain/Menu/StatusMenu+Items.swift

@@ -127,9 +127,9 @@ extension StatusMenu {
     @MainActor func addCoreMenuItems() {
         addItems([
             NSMenuItem.separator(),
-            NSMenuItem(title: "mi_about".localized,
+            NSMenuItem(title: "mi_about".localized.withDisplayName,
                        action: #selector(MainMenu.openAbout)),
-            NSMenuItem(title: "mi_quit".localized,
+            NSMenuItem(title: "mi_quit".localized.withDisplayName,
                        action: #selector(MainMenu.terminateApp), keyEquivalent: "q")
         ])
     }

phpmon/Modules/Domain List/UI/DomainListVC+Window.swift

@@ -21,7 +21,7 @@ extension DomainListVC {
         guard let window = windowController.window else { return }
 
         window.title = "domain_list.title".localized
-        window.subtitle = "domain_list.subtitle".localized
+        window.subtitle = ""
         window.delegate = delegate ?? windowController
         window.styleMask = [.titled, .closable, .resizable, .miniaturizable]
         window.minSize = NSSize(width: 550, height: 200)