🚀 Version 6.1.0

README.md

@@ -22,7 +22,7 @@ You can also add new domains as links, isolate sites, manage various services, a
 PHP Monitor is a universal application that runs natively on Apple Silicon **and** Intel-based Macs.
 
 * Your user account can administer your computer (required for some functionality, e.g. certificate generation)
-* macOS 12.4 or later (Monterey and Ventura are supported)
+* macOS 12.4 or later (Monterey, Ventura and Sonoma are supported)
 * Homebrew is installed in the default location (`/usr/local/homebrew` or `/opt/homebrew`)
 * Homebrew `php` formula is installed
 * Optional but recommended: Laravel Valet

SECURITY.md

@@ -6,15 +6,16 @@ Generally speaking, only the latest version of **PHP Monitor** is supported, exc
 
 | Version | Apple Silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Recommended Valet Version |
 | ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
-| 6.0      | ✅ Universal binary | ✅ Yes | Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4 | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
+| 6.1      | ✅ Universal binary | ✅ Yes | Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0) | macOS 12.4 | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
 
 ## Legacy versions
 
 These versions of PHP Monitor are no longer supported, but if you’re using an older computer with an older version of Homebrew, Valet or macOS, you might want to use one of these versions.
 
 | Version | Apple Silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Minimum Required Valet Version |
 | ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
-| 5.8       | ✅ Universal binary | ✅ Yes | Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4 | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
+| 6.0      | ✅ Universal binary | ❌ | Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4 | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
+| 5.8       | ✅ Universal binary | ❌ | Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4 | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
 | 5.7       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0)<br/>Ventura (13.0) | macOS 11+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
 | 5.6       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0)<br/>Ventura (13.0) | macOS 11+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x) | 3.0 recommended<br/> 2.16.2 minimum |
 | 4.1       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0) | macOS 11+ | PHP 5.6—PHP 8.2 | 2.16.2 |

phpmon/Common/Core/Constants.swift

@@ -18,14 +18,23 @@ struct Constants {
      */
     static let MinimumRecommendedValetVersion = "2.16.2"
 
+    /**
+     * The PHP versions that are considered pre-release versions.
+     */
+    static let ExperimentalPhpVersions: Set = [
+        "8.3", "8.4"
+    ]
+
     /**
      * The PHP versions supported by this application.
      * Any other PHP versions are considered invalid.
      */
     static let DetectedPhpVersions: Set = [
         "5.6",
         "7.0", "7.1", "7.2", "7.3", "7.4",
-        "8.0", "8.1", "8.2", "8.3"
+        "8.0", "8.1", "8.2",
+        "8.3",
+        "8.4"
     ]
 
     /**
@@ -42,13 +51,13 @@ struct Constants {
         [
             "7.0", "7.1", "7.2", "7.3", "7.4",
             "8.0", "8.1", "8.2",
-            "8.3" // dev
+            "8.3", "8.4" // dev
         ],
         4: // Valet v4 dropped support for v7.0
         [
             "7.1", "7.2", "7.3", "7.4",
             "8.0", "8.1", "8.2",
-            "8.3" // dev
+            "8.3", "8.4" // dev
         ]
     ]
 

phpmon/Common/Core/Paths.swift

@@ -31,7 +31,10 @@ public class Paths {
         }
 
         userName = identity()
-        Log.info("The current username is `\(userName)`.")
+
+        if !isRunningSwiftUIPreview {
+            Log.info("The current username is `\(userName)`.")
+        }
     }
 
     public func detectBinaryPaths() {

phpmon/Common/Extensions/StringExtension.swift

@@ -32,13 +32,22 @@ struct Localization {
 
 extension String {
     var localized: String {
+        let string = NSLocalizedString(self, tableName: nil, bundle: Localization.bundle, value: "", comment: "")
+
+        // Fallback to English translation if the localized value is equal to the key (should not happen)
+        if string == self {
+            guard let path = Localization.bundle.path(forResource: "en", ofType: "lproj"),
+                let bundle = Bundle(path: path)
+            else { return self }
+            return NSLocalizedString(self, bundle: bundle, comment: "")
+        }
+
+        // Ensure that on more recent versions of macOS, "Preferences" is replaced with "Settings"
         if #available(macOS 13, *) {
-            return NSLocalizedString(
-                self, tableName: nil, bundle: Localization.bundle, value: "", comment: ""
-            ).replacingOccurrences(of: "Preferences", with: "Settings")
+            return string.replacingOccurrences(of: "Preferences", with: "Settings")
         }
 
-        return NSLocalizedString(self, tableName: nil, bundle: Localization.bundle, value: "", comment: "")
+        return string
     }
 
     var localizedForSwiftUI: LocalizedStringKey {
@@ -131,4 +140,10 @@ extension String {
             return ""
         }
     }
+
+    var isNumber: Bool {
+        return self.range(
+            of: "^[0-9]*$", // 1
+            options: .regularExpression) != nil
+    }
 }

phpmon/Common/Testables/TestableConfiguration.swift

@@ -56,6 +56,8 @@ public struct TestableConfiguration: Codable {
         self.filesystem = self.filesystem.merging([
             "/opt/homebrew/opt/php@\(version.short)/bin/php"
                 : .fake(.symlink, "/opt/homebrew/Cellar/php/\(version.long)/bin/php"),
+            "/opt/homebrew/opt/php@\(version.short)/bin/php-config"
+                : .fake(.symlink, "/opt/homebrew/Cellar/php/\(version.long)/bin/php-config"),
             "/opt/homebrew/Cellar/php/\(version.long)/bin/php"
                 : .fake(.binary),
             "/opt/homebrew/Cellar/php/\(version.long)/bin/php-config"
@@ -70,6 +72,9 @@ public struct TestableConfiguration: Codable {
                 : .fake(.text)
         ]) { (_, new) in new }
 
+        self.commandOutput["/opt/homebrew/opt/php@\(version.short)/bin/php-config --version"]
+            = version.long
+
         if primary {
             self.shellOutput["ls /opt/homebrew/opt | grep php"]
                 = .instant("php")
@@ -80,20 +85,21 @@ public struct TestableConfiguration: Codable {
             self.filesystem["/opt/homebrew/bin/php"]
                 = .fake(.symlink, "/opt/homebrew/Cellar/php/\(version.long)/bin/php")
             self.filesystem["/opt/homebrew/bin/php-config"]
-                = .fake(.symlink, "/opt/homebrew/Cellar/php/\(version.long)/bin/php-config")
+                = .fake(.symlink, "/opt/homebrew/Cellar/php/\(version.short)/bin/php-config")
             self.commandOutput["/opt/homebrew/bin/php-config --version"]
                 = version.long
             self.commandOutput["/opt/homebrew/bin/php -r echo php_ini_scanned_files();"] =
                 """
                 /opt/homebrew/etc/php/\(version.short)/conf.d/php-memory-limits.ini,
                 """
         } else {
+
             self.shellOutput["ls /opt/homebrew/opt | grep php@"] =
-            BatchFakeShellOutput.instant(
-                self.secondaryPhpVersions
-                    .map { "php@\($0.short)" }
-                    .joined(separator: "\n")
-            )
+                BatchFakeShellOutput.instant(
+                    self.secondaryPhpVersions
+                        .map { "php@\($0.short)" }
+                        .joined(separator: "\n")
+                )
         }
     }
 

phpmon/Domain/App/App.swift

@@ -75,10 +75,10 @@ class App {
     var onboardingWindowController: OnboardingWindowController?
 
     /** The window controller of the warnings window. */
-    var warningsWindowController: WarningsWindowController?
+    var phpDoctorWindowController: PhpDoctorWindowController?
 
     /** The window controller of the warnings window. */
-    var versionManagerWindowController: PhpVersionManagerWindowController?
+    var phpVersionManagerWindowController: PhpVersionManagerWindowController?
 
     /** List of detected (installed) applications that PHP Monitor can work with. */
     var detectedApplications: [Application] = []

phpmon/Domain/App/AppDelegate.swift

@@ -88,10 +88,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
             Log.info("Extra CLI mode is on (`~/.config/phpmon/verbose` exists).")
         }
 
-        Log.separator(as: .info)
-        Log.info("PHP MONITOR by Nico Verbruggen")
-        Log.info("Version \(App.version)")
-        Log.separator(as: .info)
+        if !isRunningSwiftUIPreview {
+            Log.separator(as: .info)
+            Log.info("PHP MONITOR by Nico Verbruggen")
+            Log.info("Version \(App.version)")
+            Log.separator(as: .info)
+        }
 
         self.state = App.shared
         self.menu = MainMenu.shared
@@ -118,6 +120,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
      startup procedure.
      */
     func applicationDidFinishLaunching(_ aNotification: Notification) {
+        // Prevent previews from kicking off a costly boot
+        if isRunningSwiftUIPreview {
+            return
+        }
+
         // Make sure notifications will work
         setupNotifications()
 

phpmon/Domain/App/Base.lproj/Main.storyboard

@@ -973,7 +973,7 @@ Gw
                                                         </tableCellView>
                                                     </prototypeCellViews>
                                                 </tableColumn>
-                                                <tableColumn identifier="KIND" width="36" minWidth="36" maxWidth="36" id="7EV-ZL-92u">
+                                                <tableColumn identifier="KIND" width="50" minWidth="50" maxWidth="120" id="7EV-ZL-92u">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Kind">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -987,11 +987,11 @@ Gw
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView identifier="domainListKindCell" wantsLayer="YES" id="AhT-xR-16a" customClass="DomainListKindCell" customModule="PHP_Monitor" customModuleProvider="target">
-                                                            <rect key="frame" x="403" y="0.0" width="36" height="54"/>
+                                                            <rect key="frame" x="403" y="0.0" width="48" height="54"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sYR-vb-OW1">
-                                                                    <rect key="frame" x="9" y="18" width="18" height="18"/>
+                                                                    <rect key="frame" x="15" y="18" width="18" height="18"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="18" id="XcB-uw-szU"/>
                                                                         <constraint firstAttribute="height" constant="18" id="bGN-Vh-Sh0"/>
@@ -1024,7 +1024,7 @@ Gw
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView identifier="domainListTypeCell" wantsLayer="YES" id="ntU-Rl-ciP" customClass="DomainListTypeCell" customModule="PHP_Monitor" customModuleProvider="target">
-                                                            <rect key="frame" x="456" y="0.0" width="97" height="54"/>
+                                                            <rect key="frame" x="468" y="0.0" width="97" height="54"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ljl-8B-key">

phpmon/Domain/App/Services/ServicesManager.swift

@@ -46,22 +46,22 @@ class ServicesManager: ObservableObject {
 
     public var statusMessage: String {
         if self.services.isEmpty || !self.firstRunComplete {
-            return "Loading..."
+            return "phpman.services.loading".localized
         }
 
         let statuses = self.services[0...2].map { $0.status }
 
         if statuses.contains(.missing) {
-            return "A key service is not installed."
+            return "phpman.services.not_installed".localized
         }
         if statuses.contains(.error) {
-            return "A key service is reporting an error state."
+            return "phpman.services.error".localized
         }
         if statuses.contains(.inactive) {
-            return "A key service is not running."
+            return "phpman.services.inactive".localized
         }
 
-        return "All Valet services are OK."
+        return "phpman.services.all_ok".localized
     }
 
     public var statusColor: Color {

phpmon/Domain/Integrations/Homebrew/Brew.swift

@@ -45,6 +45,7 @@ class Brew {
 
     /// Each formula for each PHP version that can be installed.
     public static let phpVersionFormulae = [
+        "8.3": "shivammathur/php/[email protected]",
         "8.2": "[email protected]",
         "8.1": "[email protected]",
         "8.0": "[email protected]",

phpmon/Domain/Integrations/Homebrew/BrewFormula.swift

@@ -21,11 +21,28 @@ struct BrewFormula {
     /// The upgrade that is currently available, if it exists.
     let upgradeVersion: String?
 
+    /// Whether this formula is a stable version of PHP.
+    let prerelease: Bool
+
     /// Whether the formula is currently installed.
     var isInstalled: Bool {
         return installedVersion != nil
     }
 
+    init(
+        name: String,
+        displayName: String,
+        installedVersion: String?,
+        upgradeVersion: String?,
+        prerelease: Bool = false
+    ) {
+        self.name = name
+        self.displayName = displayName
+        self.installedVersion = installedVersion
+        self.upgradeVersion = upgradeVersion
+        self.prerelease = prerelease
+    }
+
     /// Whether the formula can be upgraded.
     var hasUpgrade: Bool {
         return upgradeVersion != nil

phpmon/Domain/Integrations/Homebrew/BrewFormulaeHandler.swift

@@ -44,6 +44,7 @@ class BrewFormulaeHandler: HandlesBrewFormulae {
 
         return Brew.phpVersionFormulae.map { (version, formula) in
             let fullVersion = PhpEnvironments.shared.cachedPhpInstallations[version]?.versionNumber.text
+
             var upgradeVersion: String?
 
             if let version = fullVersion {
@@ -56,7 +57,8 @@ class BrewFormulaeHandler: HandlesBrewFormulae {
                 name: formula,
                 displayName: "PHP \(version)",
                 installedVersion: fullVersion,
-                upgradeVersion: upgradeVersion
+                upgradeVersion: upgradeVersion,
+                prerelease: Constants.ExperimentalPhpVersions.contains(version)
             )
         }.sorted { $0.displayName > $1.displayName }
     }

phpmon/Domain/Integrations/Valet/Valet.swift

@@ -233,8 +233,14 @@ class Valet {
             )
 
         if let defaultPath = Valet.shared.config.defaultSite,
-           let site = ValetScanner.active.resolveSite(path: defaultPath) {
-            sites.insert(site, at: 0)
+           let defaultSite = ValetScanner.active.resolveSite(path: defaultPath) {
+            // Only insert the default site if it isn't already included in the list
+            if !sites.contains(where: { site in
+                site.absolutePath == defaultSite.absolutePath
+                && site.name == defaultSite.name
+            }) {
+                sites.insert(defaultSite, at: 0)
+            }
         }
 
         Log.info("\(sites.count) sites & \(proxies.count) proxies have been scanned.")

phpmon/Domain/Menu/MainMenu.swift

@@ -203,7 +203,7 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate, PhpSwitcherDelegate
     }
 
     @objc func openWarnings() {
-        WarningsWindowController.show()
+        PhpDoctorWindowController.show()
     }
 
     @objc func openDomainList() {

phpmon/Domain/Preferences/PreferencesWindowController.swift

@@ -83,22 +83,22 @@ class PreferencesWindowController: PMWindowController {
         return [
             PrefTabView(
                 viewController: GeneralPreferencesVC.fromStoryboard(),
-                label: "General",
+                label: "prefs.tabs.general".localized,
                 icon: "gearshape"
             ),
             PrefTabView(
                 viewController: AppearancePreferencesVC.fromStoryboard(),
-                label: "Appearance",
+                label: "prefs.tabs.appearance".localized,
                 icon: "paintbrush"
             ),
             PrefTabView(
                 viewController: MenuStructurePreferencesVC.fromStoryboard(),
-                label: "Visibility",
+                label: "prefs.tabs.visibility".localized,
                 icon: "eye"
             ),
             PrefTabView(
                 viewController: NotificationPreferencesVC.fromStoryboard(),
-                label: "Notifications",
+                label: "prefs.tabs.notifications".localized,
                 icon: "bell.badge"
             )
         ]