🔧 Bump build

Only when using the self-updater, of course.

Also include a description that reflects this cleanup scenario.

PHP Monitor.xcodeproj/project.pbxproj

@@ -710,6 +710,9 @@
 		C4FACE83288F1F9700FC478F /* OnboardingWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FACE82288F1F9700FC478F /* OnboardingWindowController.swift */; };
 		C4FBFC532616485F00CDB8E1 /* PhpVersionDetectionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */; };
 		C4FC21B128391F8E00D368BB /* MainMenu+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F361602836BFD9003598CC /* MainMenu+Actions.swift */; };
+		C4FD87A529AB98720002D701 /* PhpConfigChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43FDBE829A932B0003D85EC /* PhpConfigChecker.swift */; };
+		C4FD87A629AB98730002D701 /* PhpConfigChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43FDBE829A932B0003D85EC /* PhpConfigChecker.swift */; };
+		C4FD87A729AB98730002D701 /* PhpConfigChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43FDBE829A932B0003D85EC /* PhpConfigChecker.swift */; };
 		C4FE011128084FC200D1DE6D /* SelectionVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FE011028084FC200D1DE6D /* SelectionVC.swift */; };
 		C4FE011228084FC200D1DE6D /* SelectionVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FE011028084FC200D1DE6D /* SelectionVC.swift */; };
 /* End PBXBuildFile section */
@@ -2221,6 +2224,7 @@
 				C471E84328F9BB650021E251 /* App.swift in Sources */,
 				C4E2E85E28FC282B003B070C /* TestableConfiguration.swift in Sources */,
 				C491997D29901DF7001F3A21 /* CaskFile.swift in Sources */,
+				C4FD87A629AB98730002D701 /* PhpConfigChecker.swift in Sources */,
 				C45E2A7529199248005C7CFD /* InternalSwitcherTest.swift in Sources */,
 				C471E84428F9BB650021E251 /* App+ActivationPolicy.swift in Sources */,
 				C471E84528F9BB650021E251 /* App+GlobalHotkey.swift in Sources */,
@@ -2370,6 +2374,7 @@
 				C471E89028F9BB8F0021E251 /* AlertableError.swift in Sources */,
 				C471E89128F9BB8F0021E251 /* Errors.swift in Sources */,
 				C471E89228F9BB8F0021E251 /* Alert.swift in Sources */,
+				C4FD87A529AB98720002D701 /* PhpConfigChecker.swift in Sources */,
 				C471E89328F9BB8F0021E251 /* Application.swift in Sources */,
 				C471E89428F9BB8F0021E251 /* LocalNotification.swift in Sources */,
 				C471E89528F9BB8F0021E251 /* MenuBarImageGenerator.swift in Sources */,
@@ -2618,6 +2623,7 @@
 				C4D936CB27E3EE4A00BD69FE /* DomainListCellProtocol.swift in Sources */,
 				C4B97B76275CF08C003F3378 /* AppDelegate+MenuOutlets.swift in Sources */,
 				C4F780CD25D80B75000DBC97 /* Alert.swift in Sources */,
+				C4FD87A729AB98730002D701 /* PhpConfigChecker.swift in Sources */,
 				C485706D28BF450900539B36 /* NSMenuItemExtension.swift in Sources */,
 				C481F79726164A78004FBCFF /* PrefsVC.swift in Sources */,
 				C495F5B028A42E080087F70A /* EnvironmentCheck.swift in Sources */,
@@ -2879,7 +2885,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1074;
+				CURRENT_PROJECT_VERSION = 1076;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -2909,7 +2915,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1074;
+				CURRENT_PROJECT_VERSION = 1076;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -3132,13 +3138,13 @@
 		C4975D0828CD190C00FFB4E8 /* Release.Dev */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconEA;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AppColor;
 				CODE_SIGN_ENTITLEMENTS = phpmon/phpmon.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1074;
+				CURRENT_PROJECT_VERSION = 1076;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -3243,13 +3249,13 @@
 		C4975D0B28CD193A00FFB4E8 /* Debug.Dev */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconEA;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AppColor;
 				CODE_SIGN_ENTITLEMENTS = phpmon/phpmon.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1074;
+				CURRENT_PROJECT_VERSION = 1076;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;

README.md

@@ -275,6 +275,8 @@ This problem is usually resolved by upgrading Valet and running `valet install`
 
 	composer global update
 	valet install
+ 
+If you are seeing a 502 (Bad Gateway) error after about 30 seconds or so, your request is likely timing out. You may need to solve a performance issue with your own code.
 
 </details>
 

phpmon/Assets.xcassets/AppIconEA.appiconset/Contents.json

@@ -1,68 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icon_16x16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "icon_16x16@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "icon_32x32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "icon_32x32@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "icon_128x128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "icon_128x128@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "icon_256x256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "icon_256x256@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "icon_512x512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "icon_512x512@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

phpmon/Common/Core/Paths.swift

@@ -86,6 +86,11 @@ public class Paths {
         return "\(shared.baseDir.rawValue)/etc"
     }
 
+    public static var caskroomPath: String {
+        return "\(shared.baseDir.rawValue)/Caskroom/"
+            + (App.identifier.contains(".dev") ? "phpmon-dev" : "phpmon")
+    }
+
     // MARK: - Flexible Binaries
     // (these can be in multiple locations, so we scan common places because)
     // (PHP Monitor will not use the user's own PATH)

phpmon/Domain/App/AppUpdater.swift

@@ -80,6 +80,7 @@ class AppUpdater {
             .withPrimary(
                 text: "updater.alerts.buttons.install".localized,
                 action: { vc in
+                    self.cleanupCaskroom()
                     self.prepareForDownload()
                     vc.close(with: .OK)
                 }
@@ -158,6 +159,20 @@ class AppUpdater {
         }
     }
 
+    private func cleanupCaskroom() {
+        let path = Paths.caskroomPath
+
+        if FileSystem.directoryExists(path) {
+            Log.info("Removing the Caskroom directory for PHP Monitor...")
+            do {
+                try FileSystem.remove(path)
+                Log.info("Removed the Caskroom directory at `\(path)`.")
+            } catch {
+                Log.err("Automatically removing the Caskroom directory at `\(path)` failed.")
+            }
+        }
+    }
+
     // MARK: - Checking if Self-Updater Worked
 
     public static func checkIfUpdateWasPerformed() {
@@ -172,7 +187,7 @@ class AppUpdater {
             }
 
             Log.info("The `upgrade.success` file was found! An update was installed. Cleaning up...")
-            try! FileSystem.remove("~/.config/phpmon/updater/upgrade.success")
+            try? FileSystem.remove("~/.config/phpmon/updater/upgrade.success")
         }
 
         // Cleanup the previous updater

phpmon/Domain/App/AppVersion.swift

@@ -15,7 +15,7 @@ class AppVersion: Comparable {
 
     init(version: String, build: String?, suffix: String? = nil) {
         self.version = version
-        self.build = Int(build ?? "0")
+        self.build = build == nil ? nil : Int(build!)
         self.suffix = suffix
     }
 

phpmon/Domain/Integrations/Homebrew/CaskFile.swift

@@ -40,6 +40,9 @@ struct CaskFile {
 
         let lines = string.split(separator: "\n")
             .filter { $0 != "" }
+            .map { line in
+                return line.trimmingCharacters(in: .whitespacesAndNewlines)
+            }
 
         if lines.count < 4 {
             Log.err("The CaskFile is <4 lines long, which is too short")

phpmon/Domain/Integrations/Homebrew/HomebrewDiagnostics.swift

@@ -32,6 +32,7 @@ class HomebrewDiagnostics {
      */
     public static var customCaskInstalled: Bool = {
         return installedTaps.contains("nicoverbruggen/cask")
+            && FileSystem.directoryExists(Paths.caskroomPath)
     }()
 
     /**

phpmon/Domain/Menu/MainMenu+Startup.swift

@@ -39,8 +39,8 @@ extension MainMenu {
 
         // Determine install method
         Log.info(HomebrewDiagnostics.customCaskInstalled
-            ? "[BREW] The app has probably been installed via Homebrew Cask."
-            : "[BREW] The app has probably been installed directly."
+            ? "[BREW] The app has been installed via Homebrew Cask."
+            : "[BREW] The app has been installed directly (optimal)."
         )
 
         Log.info(HomebrewDiagnostics.usesNginxFullFormula

phpmon/IAP/InternetAccessPolicy.plist

@@ -10,6 +10,22 @@
 	<string>https://github.com/nicoverbruggen/phpmon</string>
 	<key>Connections</key>
 	<array>
+		<dict>
+			<key>IsIncoming</key>
+			<false/>
+			<key>Host</key>
+			<string>github.com, api.github.com</string>
+			<key>NetworkProtocol</key>
+			<string>TCP</string>
+			<key>Port</key>
+			<string>443</string>
+			<key>Relevance</key>
+			<string>Essential</string>
+			<key>Purpose</key>
+			<string>PHP Monitor directly invokes Homebrew which contacts GitHub. This happens when PHP Monitor asks for more information about the PHP formula to determine which version of PHP you&apos;ve got running.</string>
+			<key>DenyConsequences</key>
+			<string>If you deny these connections, PHP Monitor might not be able to complete its preset set of instructions, causing version switching to fail.</string>
+		</dict>
 		<dict>
 			<key>IsIncoming</key>
 			<false/>
@@ -46,15 +62,15 @@
 			<key>IsIncoming</key>
 			<false/>
 			<key>Host</key>
-			<string>github.com, api.github.com</string>
+			<string>formulae.brew.sh</string>
 			<key>NetworkProtocol</key>
 			<string>TCP</string>
 			<key>Port</key>
-			<string>443</string>
+			<string>80, 443</string>
 			<key>Relevance</key>
 			<string>Essential</string>
 			<key>Purpose</key>
-			<string>PHP Monitor directly invokes Homebrew which contacts GitHub. This happens when PHP Monitor asks for more information about the PHP formula to determine which version of PHP you&apos;ve got running.</string>
+			<string>PHP Monitor directly invokes Homebrew which contacts the Homebrew API. This happens when PHP Monitor asks for more information about the PHP formula to determine which version of PHP you&apos;ve got running.</string>
 			<key>DenyConsequences</key>
 			<string>If you deny these connections, PHP Monitor might not be able to complete its preset set of instructions, causing version switching to fail.</string>
 		</dict>

phpmon/Localizable.strings

@@ -624,8 +624,8 @@ COMMON TROUBLESHOOTING TIPS
 
 "updater.alerts.newer_version_available.title" = "PHP Monitor v%@ is now available!";
 "updater.alerts.newer_version_available.subtitle" = "Keeping PHP Monitor up-to-date is highly recommended, since newer versions usually fix bugs and include fixes to support the latest versions of Valet and PHP.";
-"updater.installation_source.brew" = "The recommended method of installing updates to PHP Monitor is to simply press 'Install Update'.\n\n(You may also upgrade via the terminal by running `%@`, but this is not recommended.)";
-"updater.installation_source.direct" = "The recommended method of installing updates to PHP Monitor is to simply press 'Install Update'.";
+"updater.installation_source.brew" = "The recommended method of installing updates to PHP Monitor is to simply press “Install Update”.\n\nSince you used Homebrew to install the app, you can also upgrade via the terminal by running `%@`, but this is not recommended.\n\n(Please note that installing via this built-in updater will remove PHP Monitor from Homebrew's Caskroom directory, to prevent duplicate updates from being downloaded and causing potential issues later.)";
+"updater.installation_source.direct" = "The recommended method of installing updates to PHP Monitor is to simply press “Install Update”.";
 "updater.alerts.buttons.release_notes" = "View Release Notes";
 
 "updater.alerts.is_latest_version.title" = "PHP Monitor is up-to-date!";
@@ -661,8 +661,8 @@ COMMON TROUBLESHOOTING TIPS
 "warnings.arm_compatibility.title" = "You are running PHP Monitor using Rosetta on Apple Silicon, which means your PHP environment is also running via Rosetta.";
 "warnings.arm_compatibility.description" = "You appear to be running an ARM-compatible version of macOS, but you are currently running PHP Monitor using Rosetta. While this will work correctly, it is recommended that you use the native version of Homebrew.";
 
-"warnings.files_missing.title" = "Your PHP installation is lacking required configuration files";
-"warnings.files_missing.description" = "The following files normally exist on a functional system:
+"warnings.files_missing.title" = "Your PHP installation is missing important required configuration files.";
+"warnings.files_missing.description" = "The following key configuration files should exist after installing PHP:
 
 • %@
 

tests/Shared/TestableConfigurations.swift

@@ -138,7 +138,7 @@ class TestableConfigurations {
                     : .instant(ShellStrings.shared.brewServicesAsRoot),
                 "/opt/homebrew/bin/brew services info --all --json"
                     : .instant(ShellStrings.shared.brewServicesAsUser),
-                "curl -s --max-time 5 '\(Constants.Urls.StableBuildCaskFile.absoluteString)' | grep version"
+                "curl -s --max-time 10 '\(Constants.Urls.DevBuildCaskFile.absoluteString)'"
                     : .instant("version '5.6.2_976'"),
                 "/opt/homebrew/bin/brew unlink php"
                     : .delayed(0.2, "OK"),

tests/unit/Versions/ValetVersionExtractorTest.swift

@@ -37,10 +37,4 @@ class ValetVersionExtractorTest: XCTestCase {
 
         XCTAssertEqual(version.major, 3)
     }
-
-    func test_can_determine_valet_version() async {
-        let version = await valet("--version", sudo: false)
-        XCTAssert(version.contains("Laravel Valet 2") || version.contains("Laravel Valet 3"))
-    }
-
 }