🚀 Version 7.0

This commit introduces a new diagnostics feature which is executed
when the app boots. When the app boots, the integrity of the PHP
symlinks are checked to ensure that all symlinks correctly link to
a valid PHP version. If any links to an incorrect PHP version,
then those outdated or incorrect symlinks will be removed.

For example, if `php@8.2` links to `../Cellar/php/8.3.0` then that is
an obvious reason for that symlink to be purged because it links to
the incorrect version. (This example behaviour has been noted in #270.)

This occurs prior to the rest of the startup process, so this way
no incorrect PHP versions can pop up in the version switcher, and
no incorrect PHP version is reported as being installed when
managing installed PHP versions.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Something going wrong? File a bug report!
-title: ''
-labels: bug
-assignees: nicoverbruggen
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Required information**
- - Did you consult the FAQ in the README? [yes/no]
- - Did you try "Fix My Valet"? [yes/no]
- - OS: [e.g. macOS Monterey]
- - PHP Monitor version [e.g. v5.0.1]
-
-**Additional log**
-You can help me figure out even more information by sending me your verbose log for your latest session of PHP Monitor. Logging is disabled by default. 
-
-You can start extra verbose logging by running: `touch ~/.config/phpmon/verbose` and restarting PHP Monitor. You can find the latest log in: `~/.config/phpmon/last_session.log`. Please attach it here!
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,62 @@
+name: 🐞 Bug report
+description: Something going wrong? File a bug report!
+title: "[Bug] <title>"
+labels: [bug]
+assignees: nicoverbruggen
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered.
+    options:
+    - label: I have searched the existing issues
+      required: true
+- type: textarea
+  attributes:
+    label: Current Behavior
+    description: A concise description of what you're experiencing.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: A concise description of what you expected to happen.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Steps To Reproduce
+    description: Steps to reproduce the behavior.
+    placeholder: |
+      1. Open this menu...
+      2. Click here...
+      3. Scroll to...
+      4. See error...
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Environment
+    description: |
+      examples:
+        - **macOS**: (e.g. Ventura 13.3)
+        - **Valet**: (e.g. 4.0)
+        - **PHP Monitor**: (e.g. 5.8)
+    value: |
+        - macOS:
+        - Valet:
+        - PHP Monitor:
+    render: markdown
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Do you have a log file (or a screenshot) or any additional information?
+    description: |
+      You can start extra verbose logging by running: `touch ~/.config/phpmon/verbose` and restarting PHP Monitor. 
+
+      You can find the latest log in: `~/.config/phpmon/last_session.log`. Please attach it here!
+
+      (You can attach images or log files by clicking this area to highlight it and then dragging files in.)
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,22 +0,0 @@
----
-name: Feature request
-about: Suggest an enhancement.
-title: ''
-labels: enhancement
-assignees: nicoverbruggen
-
----
-
-_Enhancement requests that are not immediately approved will be moved to a discussion instead._
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,31 @@
+name: 😎 Feature request
+description: Do you have a great idea for an enhancement that could improve PHP Monitor?
+title: "[Feature] <title>"
+labels: [enhancement]
+assignees: nicoverbruggen
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered. Please make sure you've checked the discussions tab as well. Enhancement requests that are not immediately approved will be moved to a discussion instead, so you will find some there.
+    options:
+    - label: I have searched the existing issues and discussions
+      required: true
+- type: textarea
+  attributes:
+    label: Is this feature request related to a problem?
+    description: "A clear and concise description of what the problem is. For example: 'I am always frustrated when...'"
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like to see
+    description: What would be a user-friendly way of resolving this particular issue?
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Additional information or context
+    description: Add any other context or screenshots about the feature request here.
+  validations:
+    required: false

.gitignore

@@ -2,5 +2,5 @@ phpmon.xcodeproj/project.xcworkspace
 phpmon.xcodeproj/xcuserdata
 PHP Monitor.xcodeproj/project.xcworkspace
 PHP Monitor.xcodeproj/xcuserdata
-phpmon-updater/PHP Monitor Self-Updater.app
-.DS_Store
+phpmon-updater/PHP Monitor Self-Updater.app/
+.DS_Store

DEVELOPER.md

@@ -28,15 +28,22 @@ defaults delete com.nicoverbruggen.phpmon && killall cfprefsd
 
 <img src="./docs/build.png" width="404px" alt="build button in Xcode"/>
 
+### PHP Monitor
+
 If you'd like to build PHP Monitor yourself, you need:
 
 * Xcode (usually the latest version)
+* *PHP Monitor Self-Updater.app* in the `phpmon-updater` directory (You can build it yourself, it is included as a target OR copy the signed app so it is included w/ PHP Monitor)
 * The contents of this repository
 
-Once you have downloaded this repository, open `PHP Monitor.xcodeproj`, and you should be able to immediately build the app for your system by pressing Cmd-R. This will create a debug build. (If Xcode complains about code signing, you can turn it off.)
+Once you have downloaded this repository, open `PHP Monitor.xcodeproj`, and you should be able to build the app for your system by pressing Cmd-R. This will create a debug build. (If Xcode complains about code signing, you can turn it off.)
 
 If you'd like to create a production build, choose "Any Mac" as the target and select Product > Archive.
 
+### PHP Monitor Updater
+
+Select the separate target and build. You can then copy the product to the `phpmon-updater` directory. The binary will be re-signed when distributing the main build.
+
 ## 🚀 Release procedure
 
 1. Merge into `main`

PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -97,6 +97,10 @@
             argument = "--configuration:~/.phpmon_fconf_working.json"
             isEnabled = "NO">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--configuration:~/.phpmon_fconf_working_no_valet.json"
+            isEnabled = "NO">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "--configuration:~/.phpmon_fconf_broken.json"
             isEnabled = "NO">

PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor EAP.xcscheme

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C41C1B3222B0097F00E7CF16"
+               BuildableName = "PHP Monitor.app"
+               BlueprintName = "PHP Monitor"
+               ReferencedContainer = "container:PHP Monitor.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug.EA"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C4F7807825D7F84B000DBC97"
+               BuildableName = "Unit Tests.xctest"
+               BlueprintName = "Unit Tests"
+               ReferencedContainer = "container:PHP Monitor.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C471E7BB28F9B90F0021E251"
+               BuildableName = "UI Tests.xctest"
+               BlueprintName = "UI Tests"
+               ReferencedContainer = "container:PHP Monitor.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C471E7AC28F9B4940021E251"
+               BuildableName = "Feature Tests.xctest"
+               BlueprintName = "Feature Tests"
+               ReferencedContainer = "container:PHP Monitor.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug.EA"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C41C1B3222B0097F00E7CF16"
+            BuildableName = "PHP Monitor.app"
+            BlueprintName = "PHP Monitor"
+            ReferencedContainer = "container:PHP Monitor.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "--v"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--cli"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--configuration:~/.phpmon_fconf_working.json"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--configuration:~/.phpmon_fconf_working_no_valet.json"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--configuration:~/.phpmon_fconf_broken.json"
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "EXTREME_DOCTOR_MODE"
+            value = ""
+            isEnabled = "NO">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "PAINT_PHPMON_SWIFTUI_VIEWS"
+            value = ""
+            isEnabled = "NO">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release.EA"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C41C1B3222B0097F00E7CF16"
+            BuildableName = "PHP Monitor.app"
+            BlueprintName = "PHP Monitor"
+            ReferencedContainer = "container:PHP Monitor.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug.EA">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release.EA"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor Self-Updater.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C406A5EF298AD2CE00B5B85A"
+               BuildableName = "PHP Monitor Self-Updater.app"
+               BlueprintName = "PHP Monitor Self-Updater"
+               ReferencedContainer = "container:PHP Monitor.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C406A5EF298AD2CE00B5B85A"
+            BuildableName = "PHP Monitor Self-Updater.app"
+            BlueprintName = "PHP Monitor Self-Updater"
+            ReferencedContainer = "container:PHP Monitor.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C406A5EF298AD2CE00B5B85A"
+            BuildableName = "PHP Monitor Self-Updater.app"
+            BlueprintName = "PHP Monitor Self-Updater"
+            ReferencedContainer = "container:PHP Monitor.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

PHP Monitor.xcodeproj/xcshareddata/xcschemes/Unit Tests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

README.md

@@ -3,17 +3,15 @@
 
 <p align="center"><img src="./docs/logo.png" alt="PHP Monitor Logo" width="500px" /></p>
 
-**PHP Monitor** (or *phpmon*) is a lightweight macOS utility app that runs on your Mac and displays the active PHP version in your status bar. It's tightly integrated with [Laravel Valet](https://github.com/laravel/valet), so <u>you need to have it set up before you can use this app</u> (consult the FAQ below with info about how to set up your environment).
+**PHP Monitor** (or *phpmon*) is a lightweight macOS utility app that runs on your Mac and displays the active PHP version in your status bar. It's tightly integrated with [Laravel Valet](https://github.com/laravel/valet), so <u>you need to have it set up if you want to use all of the functionality of the app</u> (consult the FAQ below with info about how to set up your environment).
 
-<img src="./docs/screenshot.jpg#gh-light-mode-only" width="1280px" alt="phpmon screenshot (menu bar app)"/>
-<img src="./docs/screenshot-dark.jpg#gh-dark-mode-only" width="1280px" alt="phpmon screenshot (menu bar app)"/>
+<img src="./docs/screenshot.jpg" width="1280px" alt="phpmon screenshot (menu bar app)"/>
 
 <small><i>Screenshot: Showing the key functionality of PHP Monitor.</i></small>
 
 It's super convenient to switch between different versions of PHP. You'll even get notifications (only if you choose to opt-in, of course)!
 
-<img src="./docs/notification.png#gh-light-mode-only" width="370px" alt="phpmon screenshot (notification)"/>
-<img src="./docs/notification-dark.png#gh-dark-mode-only" width="370px" alt="phpmon screenshot (notification)"/>
+<img src="./docs/notification.png" width="370px" alt="phpmon screenshot (notification)"/>
 
 PHP Monitor also gives you quick access to various useful functionality (like accessing configuration files, restarting services, and more).
 
@@ -24,18 +22,18 @@ 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)
-* Homebrew is installed in `/usr/local/homebrew` or `/opt/homebrew`
+* 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
-* Laravel Valet (works with Valet v2, v3 and v4)
+* Optional but recommended: Laravel Valet
 
-_You may need to update your Valet installation to keep everything working if a major version update of PHP has been released. You can do this by running `composer global update && valet install`. Some features are not supported when running Valet 2._
+_Starting with PHP Monitor 6.0, you do not need to have Laravel Valet installed for PHP Monitor to work. To get access to all features of PHP Monitor however, installing Valet is **recommended**._
 
 For more information, please see [SECURITY.md](./SECURITY.md) to find out which version of the app is currently supported.
 
 ## 🚀 How to install
 
-Again, make sure you have **[Laravel Valet](https://laravel.com/docs/master/valet)** installed first:
+Again, if you want to have access to *all features* of PHP Monitor, I recommend installing **[Laravel Valet](https://laravel.com/docs/master/valet)** first:
 
 ```sh
 composer global require laravel/valet
@@ -43,13 +41,17 @@ valet install
 valet trust
 ```
 
-#### Manual installation (first time only)
+Currently, PHP Monitor is compatible with Laravel Valet v2, v3 and v4. Each of these versions of Valet support slightly different PHP versions, which is why legacy versions remain supported. Please note that some features are not available in older versions of Valet, like site isolation.
+
+#### Manual installation (recommended, first time only)
 
 Once that's done, you can [download the latest release](https://github.com/nicoverbruggen/phpmon/releases/latest), unzip it and place it in `/Applications`.
 
 #### Installation via Homebrew
 
-If you prefer to install the app via Homebrew, you can also do this:
+*Prior to version 5.8, this was the recommended way of installing PHP Monitor.*
+
+If you prefer to install the app via Homebrew, you can also run the following:
 
 ```sh
 brew tap nicoverbruggen/homebrew-cask
@@ -58,9 +60,11 @@ brew install --cask phpmon
 
 ## ⬆️ How to update
 
-The recommended method of updating your app to the latest version is to use **the built-in updater**.
+The recommended method of updating the app to the latest version is to use **the built-in updater**.
 
-If that doesn't work or you prefer Homebrew, you can also upgrade via those methods.
+If you have a very slow internet connection, the updater may report that the download has timed out. In that case, you may wish to manually update by [downloading the latest release](https://github.com/nicoverbruggen/phpmon/releases/latest) and placing the app in `/Applications`.
+
+(You may also use Homebrew to update PHP Monitor, but this will require you to approve the app every time an update is installed. If you use the built-in updater, this won't be necessary.)
 
 ## ⚡️ Launchers (Alfred, Raycast)
 
@@ -78,6 +82,12 @@ I wanted to be able to **see at a glance** which version of PHP was linked, and
 
 Initially, I had an Alfred workflow for this — but it has now been replaced with this utility, which also does a good job at displaying additional information at a glance, like the current PHP version, memory limits, and more.
 
+## 🐘 Why not use Laravel Herd?
+
+If you don't need to customize your local PHP setup and just want an easy and ready-to-go environment to start coding, [Laravel Herd](https://herd.laravel.com) is probably more than sufficient for many use cases. 
+
+If you need more customization and flexibility I encourage you to consider PHP Monitor in combination with Laravel Valet or some other solution like Docker (with Laravel Sail, for example).
+
 ## 🤬 The app won't start?!
 
 PHP Monitor performs some integrity checks to ensure a good experience when using the app. You'll get a message telling you that PHP Monitor won't work correctly in a variety of scenarios.
@@ -100,48 +110,47 @@ All stable and supported PHP versions are also supported by PHP Monitor. However
 > **Note**
 > If you have versions of PHP installed that can be detected by PHP Monitor but is *not* supported by the currently active version of Valet, you will be alerted by an item in the menu with an exclamation mark emoji. (⚠️)
 
-Backports are available via [this tap](https://github.com/shivammathur/homebrew-php). For more information about those backports, please see the next FAQ entry.
+Backports that are installable via PHP Monitor's **PHP Version Manager** functionality are subject to availability via [this tap](https://github.com/shivammathur/homebrew-php).
+
+PHP extensions that are installable via PHP Monitor's **PHP Extension Manager** functionality are subject to availability via [this tap](https://github.com/shivammathur/homebrew-extensions).
 
 For maximum compatibility with older PHP versions, you may wish to keep using Valet 2 or 3. For more information, please see [SECURITY.md](./SECURITY.md) to find out which versions of PHP are supported with different versions of Valet.
-
 </details>
 
 <details>
 <summary><strong>How do I install additional versions of PHP, including legacy versions?</strong></summary>
 
-Assuming you have installed the `php` formula, the latest stable version of PHP is installed. At the time of writing, this is PHP 8.2.
+Assuming you have installed the `php` formula, the latest stable version of PHP is installed. At the time of writing, this is PHP 8.3.
 
-You can install other supported versions of PHP out of the box, so `php@8.0` and `php@8.1` at the time of writing.
+You can install other supported versions of PHP via PHP Monitor's **PHP Version Manager**. (You can manually install or upgrade PHP versions too, but this is not recommended.)
 
-If you wish to install older (officially unsupported) versions of PHP for local use, you can do so by using [Shivam Mathur's tap](https://github.com/shivammathur/homebrew-php):
+Please keep in mind that installing or updating PHP versions, even when done via PHP Monitor's **PHP Version Manager**, may cause other required formula dependencies (required software needed to keep those PHP versions functional) to be upgraded. It might not be very transparent when this happens, but this is likely the cause if installing a PHP version takes longer than expected: usually other dependencies are also being installed.
 
-```sh
-brew tap shivammathur/php
-```
+Additionally, upgrading one specific version of PHP may also cause other installed versions of PHP to *also* be updated in one go, if the dependencies for that one version also apply to the other (newer) version(s) of PHP. It's a bit tricky to manage PHP versions via Homebrew, and even PHP Monitor may encounter some difficulties. 
 
-You may find that this tap is already in use: if you've used Valet before, it automatically uses this tap for legacy versions of PHP.
+If you encounter a strange scenario or a malfunction, please open an issue on the issue tracker and get in touch. I'd like to keep enhancing this process to make it as foolproof as possible.
 
-```sh
-brew install shivammathur/php/php@7.4
-brew install shivammathur/php/php@7.3
-brew install shivammathur/php/php@7.2
-brew install shivammathur/php/php@7.1
-brew install shivammathur/php/php@7.0
-```
-
-**Always make sure to restart PHP Monitor after installing or upgrading PHP versions!**
-
-> *Note*: Using this tap may cause [temporary alias conflicts](https://github.com/nicoverbruggen/phpmon/issues/54#issuecomment-979789724) while the core tap alias and the tap's alias refer to a different version of PHP, but this is generally speaking a minor inconvenience, since this normally only applies when a new PHP version releases.
+> *Note*: Using PHP Monitor when managing PHP versions may cause [temporary alias conflicts](https://github.com/nicoverbruggen/phpmon/issues/54#issuecomment-979789724) while the core tap alias and the tap's alias refer to a different version of PHP, but this is generally speaking a minor inconvenience, since this normally only applies when a new PHP version releases.
 </details>
 
 <details>
 <summary><strong>I want PHP Monitor to start up when I boot my Mac!</strong></summary>
 
-You can do this by dragging *PHP Monitor.app* into the **Login Items** section in **System Preferences > Users & Groups** for your account.
+If you are running macOS Ventura or newer, there's an option in the Settings menu that you can select: "Start PHP Monitor at login".
+
+If you are on an older version of macOS, you can do this by dragging *PHP Monitor.app* into the **Login Items** section in **System Preferences > Users & Groups** for your account.
 
 Super convenient!
 </details>
 
+<details>
+<summary><strong>What features are unavailable in Standalone Mode?</strong></summary>
+
+The services manager is disabled, and all other obvious Laravel Valet integrations (configuration finder, domains list, Fix My Valet) are also disabled.
+
+(Most other features remain available.)
+</details>
+
 <details>
 <summary><strong>I want to set up PHP Monitor from scratch! I don't have Homebrew installed either, where do I begin?</strong></summary>
 
@@ -168,7 +177,7 @@ If you're on an Apple Silicon-based Mac, you'll need to add:
 and add the following to your `.zshrc` file, but add this BEFORE the homebrew PATH additions:
 
     export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH
-    
+
 If you're adding `composer` and Homebrew binaries, ensure that Homebrew binaries are preferred by adding these to the path last. On my system, that looks like this:
 
     export PATH=$HOME/bin:/usr/local/bin:$PATH
@@ -187,8 +196,12 @@ Make sure PHP is linked correctly:
 
 should return: `/usr/local/bin/php` (or `/opt/homebrew/bin/php` if you are on Apple Silicon)
 
+**If you don't need Laravel Valet, you can stop here. PHP Monitor will work like this in Standalone Mode.**
+
+If you'd like to have Valet as well, continue and install Valet with Composer, like this.
+
     composer global require laravel/valet
-    
+
 For optimal results, you should lock your PHP platform for global dependencies to the oldest version of PHP you intend to run. If that version is PHP 7.0, your `~/.composer/composer.json` file could look like this (please adjust the version accordingly!):
 
 ```
@@ -207,18 +220,13 @@ For optimal results, you should lock your PHP platform for global dependencies t
 Run `composer global update` again. This ensures that when you switch to a different global PHP version, [Valet won't break](https://github.com/nicoverbruggen/phpmon/issues/178). If it does, PHP Monitor will let you know what you can do about this.
 
 Then, install Valet:
-    
+
     valet install
 
 This should install `dnsmasq` and set up Valet. Great, almost there!
 
     valet trust
 
-You can now install PHP Monitor, if you haven't already:
-
-    brew tap nicoverbruggen/homebrew-cask
-	brew install --cask phpmon
-
 Finally, run PHP Monitor. Since the app is notarized and signed with a developer ID, it should work. You will need to approve the initial launch of the app, but you should be ready to go now.
 </details>
 
@@ -227,13 +235,17 @@ Finally, run PHP Monitor. Since the app is notarized and signed with a developer
 
 PHP Monitor will check if an update is available every time you start the app.
 
-You can disable this behaviour by going to Preferences (via the PHP Monitor icon in the menu bar) and unchecking "Automatically check for updates". You can always check for updates manually.
+You can disable this behaviour by going to Preferences (via the PHP Monitor icon in the menu bar) and unchecking "Automatically check for updates". (You can always check for updates manually.)
 
 </details>
 
 <details>
 <summary><strong>I have PHP Monitor installed, and it works. I want to upgrade my PHP installations to the latest version, what's the best way to do this?</strong></summary>
 
+The easiest way is to simply use the built-in **PHP Version Manager**, which will allow you to upgrade your PHP versions with one click.
+
+If you want to do this manually, you can follow the instructions below.
+
 It's easy to make a mistake here, and end up with an unlinked version of PHP or have versions missing from PHP Monitor.
 
 Here's what I usually do:
@@ -263,7 +275,7 @@ This should resolve the issue! If that does not fix the issue, run `brew link ph
 
 	brew install php
 	brew link php --force
-	
+
 </details>
 
 <details>
@@ -318,12 +330,14 @@ Make sure you have at least **Valet 3.0** installed, since support for isolation
 <details>
 <summary><strong>One of the limits (memory limit, max POST size, max upload size) shows an exclamation mark!</strong></summary>
 
-The value you provided in your INI file is invalid. If that is the case, PHP will attempt to parse your value as bytes, which is usually unintended. (`1GB` will resolve to merely a few bytes, and all of your applications will run out of memory!)
+The value you provided in your `.ini` file is invalid. If that is the case, PHP will attempt to parse your value as bytes, which is usually unintended. (`1GB` will resolve to merely a few bytes, and all of your applications will run out of memory!)
 
 You must a provide a value like so: `1024K`, `256M`, `1G`. Alternatively, `-1` is also allowed, or just an integer (which will result in N amount of bytes being the limit).
 
 **Example**: Trying to use `1GB` as the memory limit, for example, will result in this exclamation mark. The correct way to set a 1GB limit is by using `1G` as the value. (Note: The displayed value will append `B` for clarity, so if you set `1G`, the value reported by PHP Monitor will be 1 GB.)
 
+(If you are using Valet, you can adjust these limits in the `.conf.d/php-memory-limits.ini` file. Otherwise, you may need to adjust `php.ini`.)
+
 </details>
 
 <details>
@@ -412,6 +426,9 @@ You can omit the `php` key in the preset if you do not wish for the preset to sw
 <details>
 <summary><strong>How do I ensure additional Homebrew services are shown in the app?</strong></summary>
 
+> **Info**
+> Homebrew services aren't displayed if you are using Valet in Standalone Mode.
+
 You must set these services up in a JSON file, located in `~/.config/phpmon/config.json`. 
 
 You can specify custom services in the configuration file for Homebrew services that run as your own user (not root). 
@@ -592,9 +609,9 @@ Thank you very much for your contributions, kind words and support.
 
 ### Loading info about PHP in the background
 
-This utility runs `php-config --version` in the background periodically. It also checks your `.ini` files for extensions and loads more information about your limits (memory limit, POST limit, upload limit). 
+This app runs `php-config --version` in the background periodically, usually whenever your Homebrew configuration is modified. A filesystem watcher is used to determine if anything changes in your Homebrew's `bin` directory. 
 
-In order to save power, this only happens once every 60 seconds.
+PHP Monitor also checks your `.ini` files for extensions and loads more information about your limits (memory limit, POST limit, upload limit). See also the section on *Config change detection* below.
 
 ### Switching PHP versions
 
@@ -602,7 +619,7 @@ This utility will detect which PHP versions you have installed via Homebrew, and
 
 The switcher will disable all PHP-FPM services not belonging to the version you wish to use, and link the desired version of PHP. Then, it'll restart your desired PHP version's FPM process. This all happens in parallel, so this should be a bit faster than Valet’s switcher.
 
-If you're using Valet 3, versions of PHP-FPM required to keep isolated sites up and running will also be started or stopped as needed.
+If you're using Valet 3 or newer, versions of PHP-FPM required to keep isolated sites up and running will also be started or stopped as needed.
 
 ### Config change detection
 

SECURITY.md

@@ -6,9 +6,7 @@ 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 |
 | ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
-| 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 |
-
-(*) Preliminary listing. Valet 4 hasn't been released yet and the versions of PHP Valet can work with might still change.
+| 6.2      | ✅ 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
 
@@ -16,8 +14,11 @@ These versions of PHP Monitor are no longer supported, but if you’re using an
 
 | Version | Apple Silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Minimum Required Valet Version |
 | ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
-| 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) | 3.0 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 |
+| 6.1      | ✅ Universal binary | ❌ | 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 |
+| 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 |
 | 4.0       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 | 2.13 |
 | 3.5       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 | 2.13 |

phpmon-updater/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

phpmon-updater/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "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-updater/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

phpmon-updater/LaunchControl.swift

@@ -0,0 +1,46 @@
+//
+//  LaunchControl.swift
+//  PHP Monitor Self-Updater
+//
+//  Created by Nico Verbruggen on 02/02/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+
+class LaunchControl {
+    public static func smartRestart(priority: [String]) async {
+        for appPath in priority {
+            if FileManager.default.fileExists(atPath: appPath) {
+                let app = await LaunchControl.startApplication(at: appPath)
+                if app != nil {
+                    return
+                }
+            }
+        }
+    }
+
+    public static func terminateApplications(bundleIds: [String]) async {
+        let runningApplications = NSWorkspace.shared.runningApplications
+
+        // Terminate all instances found
+        for id in bundleIds {
+            if let phpmon = runningApplications.first(where: {
+                (application) in return application.bundleIdentifier == id
+            }) {
+                phpmon.terminate()
+            }
+        }
+    }
+
+    public static func startApplication(at path: String) async -> NSRunningApplication? {
+        await withCheckedContinuation { continuation in
+            let url = NSURL(fileURLWithPath: path, isDirectory: true) as URL
+            let configuration = NSWorkspace.OpenConfiguration()
+            NSWorkspace.shared.openApplication(at: url, configuration: configuration) { phpmon, error in
+                continuation.resume(returning: phpmon)
+            }
+        }
+    }
+}

phpmon-updater/Updater.swift

@@ -0,0 +1,162 @@
+//
+//  Updater.swift
+//  PHP Monitor Updater
+//
+//  Created by Nico Verbruggen on 01/02/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+class Updater: NSObject, NSApplicationDelegate {
+
+    var updaterDirectory: String = ""
+    var manifestPath: String = ""
+    var manifest: ReleaseManifest! = nil
+
+    func applicationDidFinishLaunching(_ aNotification: Notification) {
+        Task { await self.installUpdate() }
+    }
+
+    func installUpdate() async {
+        print("PHP MONITOR SELF-UPDATER by Nico Verbruggen")
+        print("===========================================")
+
+        self.updaterDirectory = "~/.config/phpmon/updater"
+            .replacingOccurrences(of: "~", with: NSHomeDirectory())
+
+        print("Updater directory set to: \(self.updaterDirectory)")
+
+        self.manifestPath = "\(updaterDirectory)/update.json"
+
+        // Fetch the manifest on the local filesystem
+        let manifest = await parseManifest()!
+
+        // Download the latest file
+        let zipPath = await download(manifest)
+
+        // Terminate all instances of PHP Monitor first
+        await LaunchControl.terminateApplications(bundleIds: [
+            "com.nicoverbruggen.phpmon.eap",
+            "com.nicoverbruggen.phpmon.dev",
+            "com.nicoverbruggen.phpmon"
+        ])
+
+        // Install the app based on the zip
+        let appPath = await extractAndInstall(zipPath: zipPath)
+
+        // Restart PHP Monitor, this will also close the updater
+        _ = await LaunchControl.startApplication(at: appPath)
+
+        exit(1)
+    }
+
+    func applicationWillTerminate(_ aNotification: Notification) {
+        exit(1)
+    }
+
+    func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+        return false
+    }
+
+    private func parseManifest() async -> ReleaseManifest? {
+        // Read out the correct information from the manifest JSON
+        print("Checking manifest file at \(manifestPath)...")
+
+        do {
+            let manifestText = try String(contentsOfFile: manifestPath)
+            manifest = try JSONDecoder().decode(ReleaseManifest.self, from: manifestText.data(using: .utf8)!)
+            return manifest
+        } catch {
+            print("Parsing the manifest failed (or the manifest file doesn't exist)!")
+            await Alert.show(description: "The manifest file for a potential update was not found. Please try searching for updates again in PHP Monitor.")
+        }
+
+        return nil
+    }
+
+    private func download(_ manifest: ReleaseManifest) async -> String {
+        // Remove all zips
+        system_quiet("rm -rf \(updaterDirectory)/*.zip")
+
+        // Download the file (and follow redirects + no output on failure)
+        system_quiet("cd \"\(updaterDirectory)\" && curl \(manifest.url) -fLO --max-time 20")
+
+        // Identify the downloaded file
+        let filename = system("cd \"\(updaterDirectory)\" && ls | grep .zip")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+
+        // Ensure the zip exists
+        if filename.isEmpty {
+            print("The update has not been downloaded. Sadly, that means that PHP Monitor cannot not updated!")
+            await Alert.show(description: "The update could not be downloaded, or the file was not correctly written to disk. \n\nPlease try again. \n\n(Note that the download will time-out after 20 seconds, so for slow connections it is recommended to manually download the update.)")
+        }
+
+        // Calculate the checksum for the downloaded file
+        let checksum = system("openssl dgst -sha256 \"\(updaterDirectory)/\(filename)\" | awk '{print $NF}'")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+
+        // Compare the checksums
+        print("""
+        Comparing checksums...
+        Expected SHA256: \(manifest.sha256)
+        Actual SHA256: \(checksum)
+        """)
+
+        // Make sure the checksum matches before we do anything with the file
+        if checksum != manifest.sha256 {
+            print("The checksums failed to match. Cancelling!")
+            await Alert.show(description: "The downloaded update failed checksum validation. Please try again. If this issue persists, there may be an issue with the server and I do not recommend upgrading.")
+        }
+
+        // Return the path to the zip
+        return "\(updaterDirectory)/\(filename)"
+    }
+
+    private func extractAndInstall(zipPath: String) async -> String {
+        // Remove the directory that will contain the extracted update
+        system_quiet("rm -rf \"\(updaterDirectory)/extracted\"")
+
+        // Recreate the directory where we will unzip the .app file
+        system_quiet("mkdir -p \"\(updaterDirectory)/extracted\"")
+
+        // Make sure the updater directory exists
+        var isDirectory: ObjCBool = true
+        if !FileManager.default.fileExists(atPath: "\(updaterDirectory)/extracted", isDirectory: &isDirectory) {
+            await Alert.show(description: "The updater directory is missing. The automatic updater will quit. Make sure that ` ~/.config/phpmon/updater` is writeable.")
+        }
+
+        // Unzip the file
+        system_quiet("unzip \"\(zipPath)\" -d \"\(updaterDirectory)/extracted\"")
+
+        // Find the .app file
+        let app = system("ls \"\(updaterDirectory)/extracted\" | grep .app")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+
+        print("Finished extracting: \(updaterDirectory)/extracted/\(app)")
+
+        // Make sure the file was extracted
+        if app.isEmpty {
+            await Alert.show(description: "The downloaded file could not be extracted. The automatic updater will quit. Make sure that ` ~/.config/phpmon/updater` is writeable.")
+        }
+
+        // Remove the original app
+        print("Removing \(app) before replacing...")
+        system_quiet("rm -rf \"/Applications/\(app)\"")
+
+        // Move the new app in place
+        system_quiet("mv \"\(updaterDirectory)/extracted/\(app)\" \"/Applications/\(app)\"")
+
+        // Remove the zip
+        system_quiet("rm \"\(zipPath)\"")
+
+        // Remove the manifest
+        system_quiet("rm \"\(manifestPath)\"")
+
+        // Write a file that is only written when we upgraded successfully
+        system_quiet("touch \"\(updaterDirectory)/upgrade.success\"")
+
+        // Return the new location of the app
+        return "/Applications/\(app)"
+    }
+}

phpmon-updater/Utility.swift

@@ -0,0 +1,34 @@
+//
+//  Utility.swift
+//  PHP Monitor Self-Updater
+//
+//  Created by Nico Verbruggen on 02/02/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+
+class Alert {
+    public static func show(description: String, shouldExit: Bool = true) async {
+        await withUnsafeContinuation { continuation in
+            DispatchQueue.main.async {
+                let alert = NSAlert()
+                alert.messageText = "The app could not be updated."
+                alert.informativeText = description
+                alert.addButton(withTitle: "OK")
+                alert.alertStyle = .critical
+                alert.runModal()
+                if shouldExit {
+                    exit(0)
+                }
+                continuation.resume()
+            }
+        }
+    }
+}
+
+public struct ReleaseManifest: Codable {
+    let url: String
+    let sha256: String
+}

phpmon-updater/main.swift

@@ -0,0 +1,14 @@
+//
+//  AppDelegate.swift
+//  PHP Monitor Self-Updater
+//
+//  Created by Nico Verbruggen on 01/02/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+let app = NSApplication.shared
+let delegate = Updater()
+app.delegate = delegate
+_ = NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv)

phpmon-updater/phpmon-updater.entitlements

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

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

@@ -0,0 +1,68 @@
+{
+  "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/Assets.xcassets/StatusColorBlue.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.988",
+          "green" : "0.580",
+          "red" : "0.278"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.988",
+          "green" : "0.723",
+          "red" : "0.277"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

phpmon/Common/Command/CommandProtocol.swift

@@ -16,7 +16,26 @@ protocol CommandProtocol {
      - Parameter path: The path of the command or program to invoke.
      - Parameter arguments: A list of arguments that are passed on.
      - Parameter trimNewlines: Removes empty new line output.
+     - Parameter withStandardError: Outputs standard error output to the same string output as well.
      */
-    func execute(path: String, arguments: [String], trimNewlines: Bool) -> String
+    func execute(
+        path: String,
+        arguments: [String],
+        trimNewlines: Bool,
+        withStandardError: Bool
+    ) -> String
+
+    /**
+     Immediately executes a command.
+
+     - Parameter path: The path of the command or program to invoke.
+     - Parameter arguments: A list of arguments that are passed on.
+     - Parameter trimNewlines: Removes empty new line output.
+     */
+    func execute(
+        path: String,
+        arguments: [String],
+        trimNewlines: Bool
+    ) -> String
 
 }

phpmon/Common/Command/RealCommand.swift

@@ -9,13 +9,23 @@ import Cocoa
 
 public class RealCommand: CommandProtocol {
 
-    public func execute(path: String, arguments: [String], trimNewlines: Bool = false) -> String {
+    public func execute(
+        path: String,
+        arguments: [String],
+        trimNewlines: Bool,
+        withStandardError: Bool
+    ) -> String {
         let task = Process()
         task.launchPath = path
         task.arguments = arguments
 
         let pipe = Pipe()
         task.standardOutput = pipe
+
+        if withStandardError {
+            task.standardError = pipe
+        }
+
         task.launch()
 
         let data = pipe.fileHandleForReading.readDataToEndOfFile()
@@ -30,4 +40,17 @@ public class RealCommand: CommandProtocol {
         return output
     }
 
+    public func execute(
+        path: String,
+        arguments: [String],
+        trimNewlines: Bool = false
+    ) -> String {
+        self.execute(
+            path: path,
+            arguments: arguments,
+            trimNewlines: trimNewlines,
+            withStandardError: false
+        )
+    }
+
 }

phpmon/Common/Core/Actions.swift

@@ -12,37 +12,41 @@ class Actions {
 
     // MARK: - Services
 
+    public static func linkPhp() async {
+        await brew("link php --overwrite --force")
+    }
+
     public static func restartPhpFpm() async {
-        await brew("services restart \(Homebrew.Formulae.php)", sudo: Homebrew.Formulae.php.elevated)
+        await brew("services restart \(HomebrewFormulae.php)", sudo: HomebrewFormulae.php.elevated)
     }
 
     public static func restartNginx() async {
-        await brew("services restart \(Homebrew.Formulae.nginx)", sudo: Homebrew.Formulae.nginx.elevated)
+        await brew("services restart \(HomebrewFormulae.nginx)", sudo: HomebrewFormulae.nginx.elevated)
     }
 
     public static func restartDnsMasq() async {
-        await brew("services restart \(Homebrew.Formulae.dnsmasq)", sudo: Homebrew.Formulae.dnsmasq.elevated)
+        await brew("services restart \(HomebrewFormulae.dnsmasq)", sudo: HomebrewFormulae.dnsmasq.elevated)
     }
 
     public static func stopValetServices() async {
-        await brew("services stop \(Homebrew.Formulae.php)", sudo: Homebrew.Formulae.php.elevated)
-        await brew("services stop \(Homebrew.Formulae.nginx)", sudo: Homebrew.Formulae.nginx.elevated)
-        await brew("services stop \(Homebrew.Formulae.dnsmasq)", sudo: Homebrew.Formulae.dnsmasq.elevated)
+        await brew("services stop \(HomebrewFormulae.php)", sudo: HomebrewFormulae.php.elevated)
+        await brew("services stop \(HomebrewFormulae.nginx)", sudo: HomebrewFormulae.nginx.elevated)
+        await brew("services stop \(HomebrewFormulae.dnsmasq)", sudo: HomebrewFormulae.dnsmasq.elevated)
     }
 
     public static func fixHomebrewPermissions() throws {
         var servicesCommands = [
-            "\(Paths.brew) services stop \(Homebrew.Formulae.nginx)",
-            "\(Paths.brew) services stop \(Homebrew.Formulae.dnsmasq)"
+            "\(Paths.brew) services stop \(HomebrewFormulae.nginx)",
+            "\(Paths.brew) services stop \(HomebrewFormulae.dnsmasq)"
         ]
 
         var cellarCommands = [
-            "chown -R \(Paths.whoami):admin \(Paths.cellarPath)/\(Homebrew.Formulae.nginx)",
-            "chown -R \(Paths.whoami):admin \(Paths.cellarPath)/\(Homebrew.Formulae.dnsmasq)"
+            "chown -R \(Paths.whoami):admin \(Paths.cellarPath)/\(HomebrewFormulae.nginx)",
+            "chown -R \(Paths.whoami):admin \(Paths.cellarPath)/\(HomebrewFormulae.dnsmasq)"
         ]
 
-        PhpEnv.shared.availablePhpVersions.forEach { version in
-            let formula = version == PhpEnv.brewPhpAlias
+        PhpEnvironments.shared.availablePhpVersions.forEach { version in
+            let formula = version == PhpEnvironments.brewPhpAlias
                 ? "php"
                 : "php@\(version)"
             servicesCommands.append("\(Paths.brew) services stop \(formula)")
@@ -119,9 +123,9 @@ class Actions {
      extensions and/or run `composer global update`.
      */
     public static func fixMyValet() async {
-        await InternalSwitcher().performSwitch(to: PhpEnv.brewPhpAlias)
-        await brew("services restart \(Homebrew.Formulae.dnsmasq)", sudo: Homebrew.Formulae.dnsmasq.elevated)
-        await brew("services restart \(Homebrew.Formulae.php)", sudo: Homebrew.Formulae.php.elevated)
-        await brew("services restart \(Homebrew.Formulae.nginx)", sudo: Homebrew.Formulae.nginx.elevated)
+        await InternalSwitcher().performSwitch(to: PhpEnvironments.brewPhpAlias)
+        await brew("services restart \(HomebrewFormulae.dnsmasq)", sudo: HomebrewFormulae.dnsmasq.elevated)
+        await brew("services restart \(HomebrewFormulae.php)", sudo: HomebrewFormulae.php.elevated)
+        await brew("services restart \(HomebrewFormulae.nginx)", sudo: HomebrewFormulae.nginx.elevated)
     }
 }

phpmon/Common/Core/Constants.swift

@@ -18,6 +18,42 @@ struct Constants {
      */
     static let MinimumRecommendedValetVersion = "2.16.2"
 
+    /**
+     PHP Monitor supplies a hardcoded list of PHP packages in its own
+     PHP Version Manager. 
+
+     This hardcoded list will expire and will need to be modified when
+     the cutoff date occurs, which is when the `php` formula will
+     become PHP 8.4, and a new build will need to be made.
+
+     If users launch an older version of the app, then a warning
+     will be displayed to let them know that certain operations
+     will not work correctly and that they need to update their app.
+     */
+    static let PhpFormulaeCutoffDate = "2024-11-01"
+
+    /**
+     * 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 var ExperimentalPhpVersions: Set<String> {
+        let releaseDates = [
+            "8.4": Date.fromString("2024-12-01") // PLACEHOLDER DATE
+        ]
+
+        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.
      * Any other PHP versions are considered invalid.
@@ -25,7 +61,8 @@ struct Constants {
     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 +79,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
         ]
     ]
 
@@ -82,6 +119,16 @@ 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"
+        )!
+
+        static let EarlyAccessChangelog = URL(
+            string: "https://phpmon.app/early-access/release-notes"
+        )!
+
     }
 
 }

phpmon/Common/Core/Helpers.swift

@@ -8,13 +8,6 @@
 
 // MARK: Common Shell Commands
 
-/**
- Runs a `valet` command. Defaults to running as superuser.
- */
-func valet(_ command: String, sudo: Bool = true) async -> String {
-    return await Shell.pipe("\(sudo ? "sudo " : "")" + "\(Paths.valet) \(command)").out
-}
-
 /**
  Runs a `brew` command. Can run as superuser.
  */

phpmon/Common/Core/Homebrew.swift

@@ -8,31 +8,27 @@
 
 import Foundation
 
-class Homebrew {
-    static var fake: Bool = false
-
-    struct Formulae {
-        static var php: HomebrewFormula {
-            if Homebrew.fake {
-                return HomebrewFormula("php", elevated: true)
-            }
-
-            if PhpEnv.shared.homebrewPackage == nil {
-                fatalError("You must either load the HomebrewPackage object or call `fake` on the Homebrew class.")
-            }
-
-            return HomebrewFormula(PhpEnv.phpInstall.formula, elevated: true)
+struct HomebrewFormulae {
+    static var php: HomebrewFormula {
+        if PhpEnvironments.shared.homebrewPackage == nil {
+            return HomebrewFormula("php", elevated: true)
         }
 
-        static var nginx: HomebrewFormula {
-            return HomebrewDiagnostics.usesNginxFullFormula
-                ? HomebrewFormula("nginx-full", elevated: true)
-                : HomebrewFormula("nginx", elevated: true)
+        guard let install = PhpEnvironments.phpInstall else {
+            return HomebrewFormula("php", elevated: true)
         }
 
-        static var dnsmasq: HomebrewFormula {
-            return HomebrewFormula("dnsmasq", elevated: true)
-        }
+        return HomebrewFormula(install.formula, elevated: true)
+    }
+
+    static var nginx: HomebrewFormula {
+        return BrewDiagnostics.usesNginxFullFormula
+        ? HomebrewFormula("nginx-full", elevated: true)
+        : HomebrewFormula("nginx", elevated: true)
+    }
+
+    static var dnsmasq: HomebrewFormula {
+        return HomebrewFormula("dnsmasq", elevated: true)
     }
 }
 

phpmon/Common/Core/Logger.swift

@@ -13,6 +13,7 @@ class Log {
     static var shared = Log()
 
     var logFilePath = "~/.config/phpmon/last_session.log"
+
     var logExists = false
 
     enum Verbosity: Int {
@@ -29,9 +30,9 @@ class Log {
 
     public func prepareLogFile() {
         if !isRunningTests && Verbosity.cli.isApplicable() {
-            _ = system("mkdir -p ~/.config/phpmon 2> /dev/null")
-            _ = system("rm ~/.config/phpmon/last_session.log 2> /dev/null")
-            _ = system("touch ~/.config/phpmon/last_session.log 2> /dev/null")
+            system_quiet("mkdir -p ~/.config/phpmon 2> /dev/null")
+            system_quiet("rm ~/.config/phpmon/last_session.log 2> /dev/null")
+            system_quiet("touch ~/.config/phpmon/last_session.log 2> /dev/null")
             self.logExists = FileSystem.fileExists(self.logFilePath)
         }
     }
@@ -72,6 +73,12 @@ class Log {
         }
     }
 
+    static func line(as verbosity: Verbosity = .info) {
+        if verbosity.isApplicable() {
+            Log.shared.log("----------------------------------")
+        }
+    }
+
     private func log(_ text: String) {
         print(text)
 

phpmon/Common/Core/Paths.swift

@@ -17,11 +17,27 @@ public class Paths {
 
     internal var baseDir: Paths.HomebrewDir
     private var userName: String
+    private var preferredShell: String
 
     init() {
+        // Assume the default directory is correct
         baseDir = App.architecture != "x86_64" ? .opt : .usr
+
+        // Ensure that if a different location is used, it takes precendence
+        if baseDir == .usr
+            && FileSystem.directoryExists("/usr/local/homebrew")
+            && !FileSystem.directoryExists("/usr/local/Cellar") {
+            Log.warn("Using /usr/local/homebrew as base directory!")
+            baseDir = .usr_hb
+        }
+
         userName = identity()
-        Log.info("[ID] The current username is `\(userName)`.")
+        preferredShell = preferred_shell()
+
+        if !isRunningSwiftUIPreview {
+            Log.info("The current username is `\(userName)`.")
+            Log.info("The user's shell is `\(preferredShell)`.")
+        }
     }
 
     public func detectBinaryPaths() {
@@ -86,11 +102,19 @@ public class Paths {
         return "\(shared.baseDir.rawValue)/etc"
     }
 
+    public static var tapPath: String {
+        return "\(shared.baseDir.rawValue)/Library/Taps"
+    }
+
     public static var caskroomPath: String {
         return "\(shared.baseDir.rawValue)/Caskroom/"
             + (App.identifier.contains(".dev") ? "phpmon-dev" : "phpmon")
     }
 
+    public static var shell: String {
+        return shared.preferredShell
+    }
+
     // 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)
@@ -100,6 +124,8 @@ public class Paths {
             Paths.composer = "/usr/local/bin/composer"
         } else if FileSystem.fileExists("/opt/homebrew/bin/composer") {
             Paths.composer = "/opt/homebrew/bin/composer"
+        } else if FileSystem.fileExists("/usr/local/homebrew/bin/composer") {
+            Paths.composer = "/usr/local/homebrew/bin/composer"
         } else {
             Paths.composer = nil
             Log.warn("Composer was not found.")
@@ -111,6 +137,7 @@ public class Paths {
     public enum HomebrewDir: String {
         case opt = "/opt/homebrew"
         case usr = "/usr/local"
+        case usr_hb = "/usr/local/homebrew"
     }
 
 }

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/Extensions/StringExtension.swift

@@ -8,6 +8,18 @@ import Foundation
 import SwiftUI
 
 struct Localization {
+    static var preferredLanguage: String? {
+        guard let language = Preferences.preferences[.languageOverride] as? String else {
+            return nil
+        }
+
+        if language.isEmpty {
+            return nil
+        }
+
+        return language
+    }
+
     static var bundle: Bundle = {
         if !isRunningTests {
             return Bundle.main
@@ -32,13 +44,30 @@ struct Localization {
 
 extension String {
     var localized: String {
-        if #available(macOS 13, *) {
-            return NSLocalizedString(
-                self, tableName: nil, bundle: Localization.bundle, value: "", comment: ""
-            ).replacingOccurrences(of: "Preferences", with: "Settings")
+        var preferredBundle: Bundle = Localization.bundle
+
+        if let preferred = Localization.preferredLanguage,
+           let path = Localization.bundle.path(forResource: preferred, ofType: "lproj"),
+           let bundle = Bundle(path: path) {
+            preferredBundle = bundle
         }
 
-        return NSLocalizedString(self, tableName: nil, bundle: Localization.bundle, value: "", comment: "")
+        let string = NSLocalizedString(self, tableName: nil, bundle: preferredBundle, 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 string.replacingOccurrences(of: "Preferences", with: "Settings")
+        }
+
+        return string
     }
 
     var localizedForSwiftUI: LocalizedStringKey {
@@ -131,4 +160,10 @@ extension String {
             return ""
         }
     }
+
+    var isNumber: Bool {
+        return self.range(
+            of: "^[0-9]*$", // 1
+            options: .regularExpression) != nil
+    }
 }

phpmon/Common/Filesystem/RealFileSystem.swift

@@ -64,7 +64,7 @@ class RealFileSystem: FileSystemProtocol {
     // MARK: — FS Attributes
 
     func makeExecutable(_ path: String) throws {
-        _ = system("chmod +x \(path.replacingTildeWithHomeDirectory)")
+        _ = ActiveShell.shared.sync("chmod +x \(path.replacingTildeWithHomeDirectory)")
     }
 
     // MARK: - Checks

phpmon/Common/Helpers/Alert.swift

@@ -14,6 +14,7 @@ class Alert {
         messageText: String,
         informativeText: String,
         buttonTitle: String = "generic.ok".localized,
+        buttonIsDestructive: Bool = false,
         secondButtonTitle: String = "generic.cancel".localized,
         style: NSAlert.Style = .warning,
         onFirstButtonPressed: @escaping (() -> Void)
@@ -27,6 +28,7 @@ class Alert {
         alert.messageText = messageText
         alert.informativeText = informativeText
         alert.addButton(withTitle: buttonTitle)
+        alert.buttons.first?.hasDestructiveAction = buttonIsDestructive
         if !secondButtonTitle.isEmpty {
             alert.addButton(withTitle: secondButtonTitle)
         }

phpmon/Common/Helpers/Measurements.swift

@@ -0,0 +1,17 @@
+//
+//  Measurements.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 02/03/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+public struct Measurement {
+    let started = Date()
+
+    var milliseconds: Double {
+        return round(Date().timeIntervalSince(started) * 1000 * 1000) / 1000
+    }
+}

phpmon/Common/Helpers/MenuBarImageGenerator.swift

@@ -75,7 +75,7 @@ class MenuBarImageGenerator {
 
         // Then we'll fetch the image we want on the left
         var iconType = Preferences.preferences[.iconTypeToDisplay] as? String
-        if iconType == nil {
+        if iconType == nil || !MenuBarIcon.allCases.map({ $0.rawValue }).contains(iconType) {
             Log.warn("Invalid icon type found, using the default")
             iconType = MenuBarIcon.iconPhp.rawValue
         }

phpmon/Common/Helpers/PMWindowController.swift

@@ -37,13 +37,13 @@ class PMWindowController: NSWindowController, NSWindowDelegate {
 
 extension NSWindowController {
 
-    public func positionWindowInTopLeftCorner() {
+    public func positionWindowInTopRightCorner(offsetY: CGFloat = 0, offsetX: CGFloat = 0) {
         guard let frame = NSScreen.main?.frame else { return }
         guard let window = self.window else { return }
 
         window.setFrame(NSRect(
-            x: frame.size.width - window.frame.size.width - 20,
-            y: frame.size.height - window.frame.size.height - 40,
+            x: frame.size.width - window.frame.size.width - 20 + offsetX,
+            y: frame.size.height - window.frame.size.height - 40 + offsetY,
             width: window.frame.width,
             height: window.frame.height
         ), display: true)

phpmon/Common/Helpers/System.swift

@@ -10,7 +10,6 @@ import Foundation
 
 /**
  Run a simple blocking Shell command on the user's own system.
- Avoid using this method in favor of the fakeable Shell class unless needed for express system operations.
  */
 public func system(_ command: String) -> String {
     let task = Process()
@@ -27,9 +26,20 @@ public func system(_ command: String) -> String {
     return output
 }
 
-/** Same as the `system` command, but does not return the output. */
+/**
+ Same as the `system` command, but does not return the output.
+ */
 public func system_quiet(_ command: String) {
-    _ = system(command)
+    let task = Process()
+    task.launchPath = "/bin/sh"
+    task.arguments = ["-c", command]
+
+    let pipe = Pipe()
+    task.standardOutput = pipe
+    task.launch()
+
+    _ = pipe.fileHandleForReading.readDataToEndOfFile()
+    return
 }
 
 /**
@@ -54,3 +64,11 @@ public func identity() -> String {
 
     return output.trimmingCharacters(in: .whitespacesAndNewlines)
 }
+
+/**
+ Retrieves the user's preferred shell.
+ */
+public func preferred_shell() -> String {
+    return system("dscl . -read ~/ UserShell | sed 's/UserShell: //'")
+        .trimmingCharacters(in: .whitespacesAndNewlines)
+}

phpmon/Common/PHP/ActivePhpInstallation.swift

@@ -32,18 +32,25 @@ class ActivePhpInstallation {
     // MARK: - Computed
 
     var formula: String {
-        return (version.short == PhpEnv.brewPhpAlias) ? "php" : "php@\(version.short)"
+        return (version.short == PhpEnvironments.brewPhpAlias) ? "php" : "php@\(version.short)"
     }
 
     // MARK: - Initializer
 
+    public static func load() -> ActivePhpInstallation? {
+        if !FileSystem.fileExists(Paths.phpConfig) {
+            return nil
+        }
+
+        return ActivePhpInstallation()
+    }
+
     init() {
         // Show information about the current version
         do {
             try determineVersion()
         } catch {
-            // TODO: In future versions of PHP Monitor, this should not crash
-            fatalError("Could not determine or parse PHP version; aborting")
+            fatalError("Could not determine or parse PHP version; aborting!")
         }
 
         // Initialize the list of ini files that are loaded
@@ -55,13 +62,6 @@ class ActivePhpInstallation {
             return
         }
 
-        // Load extension information
-        let mainConfigurationFileUrl = URL(fileURLWithPath: "\(Paths.etcPath)/php/\(version.short)/php.ini")
-
-        if let file = PhpConfigurationFile.from(filePath: mainConfigurationFileUrl.path) {
-            iniFiles.append(file)
-        }
-
         // Get configuration values
         limits = Limits(
             memory_limit: getByteCount(key: "memory_limit"),
@@ -69,15 +69,10 @@ class ActivePhpInstallation {
             post_max_size: getByteCount(key: "post_max_size")
         )
 
-        // Return a list of .ini files parsed after php.ini
-        let paths = Command.execute(
-            path: Paths.php,
-            arguments: ["-r", "echo php_ini_scanned_files();"],
-            trimNewlines: false
-        )
-        .replacingOccurrences(of: "\n", with: "")
-        .split(separator: ",")
-        .map { String($0) }
+        let paths = ActiveShell.shared
+            .sync("\(Paths.php) --ini | grep -E -o '(/[^ ]+\\.ini)'").out
+            .split(separator: "\n")
+            .map { String($0) }
 
         // See if any extensions are present in said .ini files
         paths.forEach { (iniFilePath) in
@@ -122,29 +117,19 @@ class ActivePhpInstallation {
             return "∞"
         }
 
-        // Check if the syntax is valid otherwise
-        let regex = try! NSRegularExpression(pattern: #"^([0-9]*)(K|M|G|)$"#, options: [])
-        let match = regex.matches(in: value, options: [], range: NSRange(location: 0, length: value.count)).first
-        return (match == nil) ? "⚠️" : "\(value)B"
-    }
-
-    /**
-     Determine if PHP-FPM is configured correctly.
-     
-     For PHP 5.6, we'll check if `valet.sock` is included in the main `php-fpm.conf` file, but for more recent
-     versions of PHP, we can just check for the existence of the `valet-fpm.conf` file. If the check here fails,
-     that means that Valet won't work properly.
-     */
-    func checkPhpFpmStatus() async -> Bool {
-        if self.version.short == "5.6" {
-            // The main PHP config file should contain `valet.sock` and then we're probably fine?
-            let fileName = "\(Paths.etcPath)/php/5.6/php-fpm.conf"
-            return await Shell.pipe("cat \(fileName)").out
-                .contains("valet.sock")
+        if value.isEmpty {
+            return "⚠️"
         }
 
-        // Make sure to check if valet-fpm.conf exists. If it does, we should be fine :)
-        return FileSystem.fileExists("\(Paths.etcPath)/php/\(self.version.short)/php-fpm.d/valet-fpm.conf")
+        // Check if the syntax is valid otherwise
+        let regex = try! NSRegularExpression(pattern: #"^([0-9]*)(K|M|G|)$"#, options: [])
+
+        let match = regex.matches(
+            in: value, options: [],
+            range: NSRange(location: 0, length: value.count)
+        ).first
+
+        return (match == nil) ? "⚠️" : "\(value)B"
     }
 
     // MARK: - Structs

phpmon/Common/PHP/Extensions/Xdebug.swift

@@ -12,11 +12,11 @@ import Cocoa
 class Xdebug {
 
     public static var enabled: Bool {
-        return PhpEnv.shared.getConfigFile(forKey: "xdebug.mode") != nil
+        return PhpEnvironments.shared.getConfigFile(forKey: "xdebug.mode") != nil
     }
 
     public static var activeModes: [String] {
-        guard let file = PhpEnv.shared.getConfigFile(forKey: "xdebug.mode") else {
+        guard let file = PhpEnvironments.shared.getConfigFile(forKey: "xdebug.mode") else {
             return []
         }
 

phpmon/Common/PHP/Homebrew/HomebrewDecodable.swift

@@ -1,5 +1,5 @@
 //
-//  HomebrewPackage.swift
+//  HomebrewDecodable.swift
 //  PHP Monitor
 //
 //  Copyright © 2023 Nico Verbruggen. All rights reserved.
@@ -17,7 +17,6 @@ struct HomebrewPackage: Decodable {
         return aliases.first!
             .replacingOccurrences(of: "php@", with: "")
     }
-
 }
 
 struct HomebrewInstalled: Decodable {
@@ -26,3 +25,15 @@ struct HomebrewInstalled: Decodable {
     let installed_as_dependency: Bool
     let installed_on_request: Bool
 }
+
+struct OutdatedFormulae: Decodable {
+    let formulae: [OutdatedFormula]
+}
+
+struct OutdatedFormula: Decodable {
+    let name: String
+    let installed_versions: [String]
+    let current_version: String
+    let pinned: Bool
+    let pinned_version: String?
+}

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

@@ -1,5 +1,5 @@
 //
-//  PhpSwitcher.swift
+//  PhpEnvironments.swift
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 21/12/2021.
@@ -8,15 +8,28 @@
 
 import Foundation
 
-class PhpEnv {
+class PhpEnvironments {
 
     // MARK: - Initializer
 
+    /**
+     Loads the currently active PHP installation upon startup. May be empty.
+     */
     init() {
-        self.currentInstall = ActivePhpInstallation()
+        self.currentInstall = ActivePhpInstallation.load()
     }
 
-    func determinePhpAlias() async {
+    /**
+     Creates the shared instance. Called when starting the app.
+     */
+    static func prepare() {
+        _ = Self.shared
+    }
+
+    /**
+     Determine which PHP version the `php` formula is aliased to.
+     */
+    @MainActor func determinePhpAlias() async {
         let brewPhpAlias = await Shell.pipe("\(Paths.brew) info php --json").out
 
         self.homebrewPackage = try! JSONDecoder().decode(
@@ -24,7 +37,28 @@ class PhpEnv {
             from: brewPhpAlias.data(using: .utf8)!
         ).first!
 
-        Log.info("[BREW] On your system, the `php` formula means version \(homebrewPackage.version)!")
+        PhpEnvironments.brewPhpAlias = self.homebrewPackage.version
+        Log.info("[BREW] On your system, the `php` formula means version \(homebrewPackage.version).")
+
+        // Check if that version actually corresponds to an older version
+        let phpConfigExecutablePath = "\(Paths.optPath)/php/bin/php-config"
+        if FileSystem.fileExists(phpConfigExecutablePath) {
+            let longVersionString = Command.execute(
+                path: phpConfigExecutablePath,
+                arguments: ["--version"],
+                trimNewlines: false
+            ).trimmingCharacters(in: .whitespacesAndNewlines)
+
+            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)).")
+                }
+            } else {
+                Log.warn("Could not determine the actual version of the php binary; assuming Homebrew is correct.")
+                PhpEnvironments.brewPhpAlias = homebrewPackage.version
+            }
+        }
     }
 
     // MARK: - Properties
@@ -32,11 +66,16 @@ class PhpEnv {
     /** The delegate that is informed of updates. */
     weak var delegate: PhpSwitcherDelegate?
 
-    /** The static app instance. Accessible at any time. */
-    static let shared = PhpEnv()
+    /** The static instance. Accessible at any time. */
+    static let shared = PhpEnvironments()
 
     /** Whether the switcher is busy performing any actions. */
-    var isBusy: Bool = false
+    @MainActor var isBusy: Bool = false {
+        didSet {
+            MainMenu.shared.refreshIcon()
+            MainMenu.shared.rebuild()
+        }
+    }
 
     /** All versions of PHP that are currently supported. */
     var availablePhpVersions: [String] = []
@@ -48,7 +87,14 @@ class PhpEnv {
     var cachedPhpInstallations: [String: PhpInstallation] = [:]
 
     /** Information about the currently linked PHP installation. */
-    var currentInstall: ActivePhpInstallation!
+    var currentInstall: ActivePhpInstallation? {
+        didSet {
+            // Let the PHP extension manager, if it exists, know the version changed
+            if let version = currentInstall?.version.short {
+                App.shared.phpExtensionManagerWindowController?.view?.manager.phpVersion = version
+            }
+        }
+    }
 
     /**
      The version that the `php` formula via Brew is aliased to on the current system.
@@ -59,16 +105,21 @@ class PhpEnv {
      
      As such, we take that information from Homebrew.
      */
-    static var brewPhpAlias: String {
-        if Homebrew.fake { return "8.2" }
+    static var brewPhpAlias: String = ""
 
-        return Self.shared.homebrewPackage.version
+    /**
+     It's possible for the alias to be newer than the actual installed version of PHP.
+     */
+    static var homebrewBrewPhpAlias: String {
+        if PhpEnvironments.shared.homebrewPackage == nil { return "8.2" }
+
+        return PhpEnvironments.shared.homebrewPackage.version
     }
 
     /**
      The currently linked and active PHP installation.
      */
-    static var phpInstall: ActivePhpInstallation {
+    static var phpInstall: ActivePhpInstallation? {
         return Self.shared.currentInstall
     }
 
@@ -79,25 +130,45 @@ class PhpEnv {
 
     // MARK: - Methods
 
+    /**
+     The switcher that is currently in use.
+     This was originally added so the Internal and Valet switcher could be swapped out,
+     but currently this is no longer needed.
+     */
     public static var switcher: PhpSwitcher {
         return InternalSwitcher()
     }
 
+    /**
+     Alias that detects which versions of PHP are installed.
+     See also: `detectPhpVersions()`. Please note that this method
+     does *not* return the set of PHP versions that are supported.
+     */
     public static func detectPhpVersions() async {
         _ = await Self.shared.detectPhpVersions()
     }
 
     /**
      Detects which versions of PHP are installed.
+     This step also detects which versions of PHP are incompatible with the current version of Valet.
+     If a PHP installation is currently broken, that will also be reflected.
+
+     Returns a `Set<String>` of installations that are considered valid.
      */
     public func detectPhpVersions() async -> Set<String> {
         let files = await Shell.pipe("ls \(Paths.optPath) | grep php@").out
 
         let versions = await extractPhpVersions(from: files.components(separatedBy: "\n"))
 
-        let supportedByValet = Constants.ValetSupportedPhpVersionMatrix[Valet.shared.version.major] ?? []
+        let supportedByValet: Set<String> = {
+            guard let version = Valet.shared.version else {
+                return Constants.DetectedPhpVersions
+            }
 
-        var supportedVersions = versions.intersection(supportedByValet)
+            return Constants.ValetSupportedPhpVersionMatrix[version.major] ?? []
+        }()
+
+        var supportedVersions = Valet.installed ? versions.intersection(supportedByValet) : versions
 
         // Make sure the aliased version is detected
         // The user may have `php` installed, but not e.g. `php@8.0`
@@ -106,7 +177,12 @@ class PhpEnv {
 
         // Avoid inserting a duplicate
         if !supportedVersions.contains(phpAlias) && FileSystem.fileExists("\(Paths.optPath)/php/bin/php") {
-            supportedVersions.insert(phpAlias)
+            let phpAliasInstall = PhpInstallation(phpAlias)
+            // Before inserting, ensure that the actual output matches the alias
+            // if that isn't the case, our formula remains out-of-date
+            if !phpAliasInstall.isMissingBinary {
+                supportedVersions.insert(phpAlias)
+            }
         }
 
         availablePhpVersions = Array(supportedVersions)
@@ -167,6 +243,10 @@ class PhpEnv {
         return output
     }
 
+    /**
+     Returns a list of `VersionNumber` instances based on the available PHP versions
+     that are valid to switch to for a given constraint.
+     */
     public func validVersions(for constraint: String) -> [VersionNumber] {
         constraint.split(separator: "|").flatMap {
             return PhpVersionNumberCollection
@@ -179,7 +259,12 @@ class PhpEnv {
      Validates whether the currently running version matches the provided version.
      */
     public func validate(_ version: String) -> Bool {
-        if self.currentInstall.version.short == version {
+        guard let install = PhpEnvironments.phpInstall else {
+            Log.info("It appears as if no PHP installation is currently active.")
+            return false
+        }
+
+        if install.version.short == version {
             Log.info("Switching to version \(version) seems to have succeeded. Validation passed.")
             Log.info("Keeping track that this is the new version!")
             Stats.persistCurrentGlobalPhpVersion(version: version)
@@ -195,7 +280,11 @@ class PhpEnv {
      You can then use the configuration file instance to change values.
      */
     public func getConfigFile(forKey key: String) -> PhpConfigurationFile? {
-        return PhpEnv.phpInstall.iniFiles
+        guard let install = PhpEnvironments.phpInstall else {
+            return nil
+        }
+
+        return install.iniFiles
             .reversed()
             .first(where: { $0.has(key: key) })
     }

phpmon/Common/PHP/PHP Version/PhpHelper.swift

@@ -28,10 +28,12 @@ class PhpHelper {
         Task { // Create the appropriate folders and check if the files exist
             do {
                 if !FileSystem.directoryExists("~/.config/phpmon/bin") {
-                    try FileSystem.createDirectory(
-                        "~/.config/phpmon/bin",
-                        withIntermediateDirectories: true
-                    )
+                    Task { @MainActor in
+                        try FileSystem.createDirectory(
+                            "~/.config/phpmon/bin",
+                            withIntermediateDirectories: true
+                        )
+                    }
                 }
 
                 if FileSystem.fileExists(destination) {
@@ -47,22 +49,17 @@ class PhpHelper {
                 let path = URL(fileURLWithPath: "\(Paths.optPath)/php@\(version)/bin")
                     .resolvingSymlinksInPath().path
 
-                // The contents of the script!
-                let script = """
-                    #!/bin/zsh
-                    # \(keyPhrase)
-                    # It reflects the location of PHP \(version)'s binaries on your system.
-                    # Usage: . pm\(dotless)
-                    [[ $ZSH_EVAL_CONTEXT =~ :file$ ]] \\
-                        && echo "PHP Monitor has enabled this terminal to use PHP \(version)." \\
-                        || echo "You must run '. pm\(dotless)' (or 'source pm\(dotless)') instead!";
-                    export PATH=\(path):$PATH
-                    """
+                // Check if the user uses Fish
+                let script = Paths.shell.contains("/fish")
+                    ? fishScript(path, keyPhrase, version, dotless)
+                    : zshScript(path, keyPhrase, version, dotless)
 
-                try FileSystem.writeAtomicallyToFile(destination, content: script)
+                Task { @MainActor in
+                    try FileSystem.writeAtomicallyToFile(destination, content: script)
 
-                if !FileSystem.isExecutableFile(destination) {
-                   try FileSystem.makeExecutable(destination)
+                    if !FileSystem.isExecutableFile(destination) {
+                        try FileSystem.makeExecutable(destination)
+                    }
                 }
 
                 // Create a symlink if the folder is not in the PATH
@@ -83,6 +80,40 @@ class PhpHelper {
         }
     }
 
+    private static func zshScript(
+        _ path: String,
+        _ keyPhrase: String,
+        _ version: String,
+        _ dotless: String
+    ) -> String {
+        return """
+            #!/bin/zsh
+            # \(keyPhrase)
+            # It reflects the location of PHP \(version)'s binaries on your system.
+            # Usage: . pm\(dotless)
+            [[ $ZSH_EVAL_CONTEXT =~ :file$ ]] \\
+                && echo "PHP Monitor has enabled this terminal to use PHP \(version)." \\
+                || echo "You must run '. pm\(dotless)' (or 'source pm\(dotless)') instead!";
+            export PATH=\(path):$PATH
+            """
+    }
+
+    private static func fishScript(
+        _ path: String,
+        _ keyPhrase: String,
+        _ version: String,
+        _ dotless: String
+    ) -> String {
+        return """
+            #!\(Paths.binPath)/fish
+            # \(keyPhrase)
+            # It reflects the location of PHP \(version)'s binaries on your system.
+            # Usage: . pm\(dotless)
+            echo "PHP Monitor has enabled this terminal to use PHP \(version)."; \\
+            set -x PATH \(path) $PATH
+            """
+    }
+
     private static func createSymlink(_ dotless: String) async {
         let source = "\(Paths.homePath)/.config/phpmon/bin/pm\(dotless)"
         let destination = "/usr/local/bin/pm\(dotless)"

phpmon/Common/PHP/PhpConfigurationFile.swift

@@ -69,8 +69,9 @@ class PhpConfigurationFile: CreatedFromFile {
         return nil
     }
 
-    enum ReplacementErrors: Error {
+    public enum ReplacementErrors: Error {
         case missingKey
+        case missingFile
     }
 
     /**
@@ -95,10 +96,16 @@ class PhpConfigurationFile: CreatedFromFile {
         // Replace the specific line
         self.lines[item.lineIndex] = components.joined(separator: "=")
 
+        // Ensure the watchers aren't tripped up by config changes
+        ConfigWatchManager.ignoresModificationsToConfigValues = true
+
         // Finally, join the string and save the file atomatically again
         try self.lines.joined(separator: "\n")
             .write(toFile: self.filePath, atomically: true, encoding: .utf8)
 
+        // Ensure watcher behaviour is reverted
+        ConfigWatchManager.ignoresModificationsToConfigValues = false
+
         // Reload the original file
         self.reload()
     }

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,7 +76,7 @@ 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
@@ -84,14 +84,14 @@ class PhpExtension {
 
         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/Common/PHP/PhpInstallation.swift

@@ -12,15 +12,36 @@ class PhpInstallation {
 
     var versionNumber: VersionNumber
 
+    var iniFiles: [PhpConfigurationFile] = []
+
+    var isMissingBinary: Bool = false
+
+    var isHealthy: Bool = true
+
+    var extensions: [PhpExtension] {
+        return self.iniFiles.flatMap({ $0.extensions })
+    }
+
     /**
-     In order to determine details about a PHP installation, we’ll simply run `php-config --version`
-     in the relevant directory.
+     In order to determine details about a PHP installation,
+     we’ll simply run `php-config --version` in the relevant directory.
      */
     init(_ version: String) {
+        let phpConfigExecutablePath = "\(Paths.optPath)/php@\(version)/bin/php-config",
+            phpExecutablePath = "\(Paths.optPath)/php@\(version)/bin/php"
 
-        let phpConfigExecutablePath = "\(Paths.optPath)/php@\(version)/bin/php-config"
-        self.versionNumber = VersionNumber.make(from: version)!
+        versionNumber = VersionNumber.make(from: version)!
 
+        determineVersion(phpConfigExecutablePath, phpExecutablePath)
+        determineHealth(phpExecutablePath)
+        determineIniFiles(phpExecutablePath)
+
+        // Find all enabled extensions
+        let enabled = self.extensions.filter({ $0.enabled }).map({ $0.name })
+        Log.info("PHP \(versionNumber.short) has the following extensions enabled: \(enabled)")
+    }
+
+    private func determineVersion(_ phpConfigExecutablePath: String, _ phpExecutablePath: String) {
         if FileSystem.fileExists(phpConfigExecutablePath) {
             let longVersionString = Command.execute(
                 path: phpConfigExecutablePath,
@@ -30,8 +51,43 @@ class PhpInstallation {
 
             // The parser should always work, or the string has to be very unusual.
             // If so, the app SHOULD crash, so that the users report what's up.
-            self.versionNumber = try! VersionNumber.parse(longVersionString)
+            versionNumber = try! VersionNumber.parse(longVersionString)
+        } else {
+            // Keep track that the `php-config` binary is missing; this often means there's a mismatch between
+            // the `php` version alias and the actual installed version (e.g. you haven't upgraded `php`)
+            isMissingBinary = true
         }
     }
 
+    private func determineHealth(_ phpExecutablePath: String) {
+        if FileSystem.fileExists(phpExecutablePath) {
+            let testCommand = Command.execute(
+                path: phpExecutablePath,
+                arguments: ["-v"],
+                trimNewlines: false,
+                withStandardError: true
+            ).trimmingCharacters(in: .whitespacesAndNewlines)
+
+            // If the "dyld: Library not loaded" issue pops up, we have an unhealthy PHP installation
+            // and we will need to reinstall this version of PHP via Homebrew.
+            if testCommand.contains("Library not loaded") && testCommand.contains("dyld") {
+                self.isHealthy = false
+                Log.err("The PHP installation of \(self.versionNumber.short) is not healthy!")
+            }
+        }
+    }
+
+    private func determineIniFiles(_ phpExecutablePath: String) {
+        let paths = ActiveShell.shared
+            .sync("\(phpExecutablePath) --ini | grep -E -o '(/[^ ]+\\.ini)'").out
+            .split(separator: "\n")
+            .map { String($0) }
+
+        // See if any extensions are present in said .ini files
+        paths.forEach { (iniFilePath) in
+            if let file = PhpConfigurationFile.from(filePath: iniFilePath) {
+                iniFiles.append(file)
+            }
+        }
+    }
 }

phpmon/Common/PHP/Switcher/InternalSwitcher+Valet.swift

@@ -0,0 +1,136 @@
+//
+//  InternalSwitcher+Valet.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 14/03/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+extension InternalSwitcher {
+
+    typealias FixApplied = Bool
+
+    public func ensureValetConfigurationIsValidForPhpVersion(_ version: String) async -> FixApplied {
+        // Early exit if Valet is not installed
+        if !Valet.installed {
+            assertionFailure("Cannot ensure that Valet configuration is valid if Valet is not installed.")
+            return false
+        }
+
+        let corrections = [
+            await self.disableDefaultPhpFpmPool(version),
+            await self.ensureConfigurationFilesExist(version)
+        ]
+
+        return corrections.contains(true)
+    }
+
+    // MARK: - Corrections
+
+    public func disableDefaultPhpFpmPool(_ version: String) async -> FixApplied {
+        let pool = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf"
+
+        if FileSystem.fileExists(pool) {
+            Log.info("A default `www.conf` file was found in the php-fpm.d directory for PHP \(version).")
+            let existing = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf"
+            let new = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf.disabled-by-phpmon"
+            do {
+                if FileSystem.fileExists(new) {
+                    Log.info("A moved `www.conf.disabled-by-phpmon` file was found for PHP \(version), "
+                             + "cleaning up so the newer `www.conf` can be moved again.")
+                    try FileSystem.remove(new)
+                }
+                try FileSystem.move(from: existing, to: new)
+                Log.info("Success: A default `www.conf` file was disabled for PHP \(version).")
+                return true
+            } catch {
+                Log.err(error)
+                return false
+            }
+        }
+
+        return false
+    }
+
+    public func ensureConfigurationFilesExist(_ version: String) async -> FixApplied {
+        let files = self.getExpectedConfigurationFiles(for: version)
+
+        // For each of the files, attempt to fix anything that is wrong
+        let outcomes = files.map { file in
+            let configFileExists = FileSystem.fileExists("\(Paths.etcPath)/php/\(version)/" + file.destination)
+
+            if configFileExists {
+                return false
+            }
+
+            Log.info("Config file `\(file.destination)` does not exist, will attempt to automatically fix!")
+
+            if !file.applies() {
+                return false
+            }
+
+            do {
+                var contents = try FileSystem.getStringFromFile("~/.composer/vendor/laravel/valet" + file.source)
+
+                for (original, replacement) in file.replacements {
+                    contents = contents.replacingOccurrences(of: original, with: replacement)
+                }
+
+                try FileSystem.writeAtomicallyToFile(
+                    "\(Paths.etcPath)/php/\(version)" + file.destination,
+                    content: contents
+                )
+            } catch {
+                Log.err("Automatically fixing \(file.destination) did not work.")
+                return false
+            }
+
+            return true
+        }
+
+        // If any fixes were applied, return true
+        return outcomes.contains(true)
+    }
+
+    // MARK: - Internals
+
+    private func getExpectedConfigurationFiles(for version: String) -> [ExpectedConfigurationFile] {
+        return [
+            ExpectedConfigurationFile(
+                destination: "/php-fpm.d/valet-fpm.conf",
+                source: "/cli/stubs/etc-phpfpm-valet.conf",
+                replacements: [
+                    "VALET_USER": Paths.whoami,
+                    "VALET_HOME_PATH": "~/.config/valet".replacingTildeWithHomeDirectory,
+                    "valet.sock": "valet\(version.replacingOccurrences(of: ".", with: "")).sock"
+                ],
+                applies: { Valet.shared.version!.major > 2 }
+            ),
+            ExpectedConfigurationFile(
+                destination: "/conf.d/error_log.ini",
+                source: "/cli/stubs/etc-phpfpm-error_log.ini",
+                replacements: [
+                    "VALET_USER": Paths.whoami,
+                    "VALET_HOME_PATH": "~/.config/valet".replacingTildeWithHomeDirectory
+                ],
+                applies: { return true }
+            ),
+            ExpectedConfigurationFile(
+                destination: "/conf.d/php-memory-limits.ini",
+                source: "/cli/stubs/php-memory-limits.ini",
+                replacements: [:],
+                applies: { return true }
+            )
+        ]
+    }
+
+}
+
+public struct ExpectedConfigurationFile {
+    let destination: String
+    let source: String
+    let replacements: [String: String]
+    let applies: () -> Bool
+}

phpmon/Common/PHP/Switcher/InternalSwitcher.swift

@@ -25,10 +25,9 @@ class InternalSwitcher: PhpSwitcher {
         let versions = getVersionsToBeHandled(version)
 
         await withTaskGroup(of: String.self, body: { group in
-            for available in PhpEnv.shared.availablePhpVersions {
+            for available in PhpEnvironments.shared.availablePhpVersions {
                 group.addTask {
-                    await self.disableDefaultPhpFpmPool(available)
-                    await self.stopPhpVersion(available)
+                    await self.unlinkAndStopPhpVersion(available)
                     return available
                 }
             }
@@ -42,12 +41,19 @@ class InternalSwitcher: PhpSwitcher {
             Log.info("Linking the new version \(version)!")
 
             for formula in versions {
+                if Valet.installed {
+                    Log.info("Ensuring that the Valet configuration is valid...")
+                    _ = await self.ensureValetConfigurationIsValidForPhpVersion(formula)
+                }
+
                 Log.info("Will start PHP \(version)... (primary: \(version == formula))")
-                await self.startPhpVersion(formula, primary: (version == formula))
+                await self.linkAndStartPhpVersion(formula, primary: (version == formula))
             }
 
-            Log.info("Restarting nginx, just to be sure!")
-            await brew("services restart nginx", sudo: true)
+            if Valet.installed {
+                Log.info("Restarting nginx, just to be sure!")
+                await brew("services restart nginx", sudo: true)
+            }
 
             Log.info("The new version(s) have been linked!")
         })
@@ -69,56 +75,36 @@ class InternalSwitcher: PhpSwitcher {
         return versions
     }
 
-    func requiresDisablingOfDefaultPhpFpmPool(_ version: String) -> Bool {
-        let pool = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf"
-        return FileSystem.fileExists(pool)
+    func unlinkAndStopPhpVersion(_ version: String) async {
+        let formula = (version == PhpEnvironments.brewPhpAlias) ? "php" : "php@\(version)"
+        await brew("unlink \(formula)")
+
+        if Valet.installed {
+            await brew("services stop \(formula)", sudo: true)
+            Log.info("Unlinked and stopped services for \(formula)")
+        } else {
+            Log.info("Unlinked \(formula)")
+        }
     }
 
-    func disableDefaultPhpFpmPool(_ version: String) async {
-        let pool = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf"
-        if FileSystem.fileExists(pool) {
-            Log.info("A default `www.conf` file was found in the php-fpm.d directory for PHP \(version).")
-            let existing = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf"
-            let new = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf.disabled-by-phpmon"
-            do {
-                if FileSystem.fileExists(new) {
-                    Log.info("A moved `www.conf.disabled-by-phpmon` file was found for PHP \(version), "
-                             + "cleaning up so the newer `www.conf` can be moved again.")
-                    try FileSystem.remove(new)
-                }
-                try FileSystem.move(from: existing, to: new)
-                Log.info("Success: A default `www.conf` file was disabled for PHP \(version).")
-            } catch {
-                Log.err(error)
+    func linkAndStartPhpVersion(_ version: String, primary: Bool) async {
+        let formula = (version == PhpEnvironments.brewPhpAlias) ? "php" : "php@\(version)"
+
+        if primary {
+            Log.info("\(formula) is the primary formula, linking...")
+            await brew("link \(formula) --overwrite --force")
+        } else {
+            Log.info("\(formula) is an isolated PHP version, not linking!")
+        }
+
+        if Valet.installed {
+            await brew("services start \(formula)", sudo: true)
+
+            if Valet.enabled(feature: .isolatedSites) && primary {
+                let socketVersion = version.replacingOccurrences(of: ".", with: "")
+                await Shell.quiet("ln -sF ~/.config/valet/valet\(socketVersion).sock ~/.config/valet/valet.sock")
+                Log.info("Symlinked new socket version (valet\(socketVersion).sock → valet.sock).")
             }
         }
     }
-
-    func stopPhpVersion(_ version: String) async {
-        let formula = (version == PhpEnv.brewPhpAlias) ? "php" : "php@\(version)"
-        await brew("unlink \(formula)")
-        await brew("services stop \(formula)", sudo: true)
-        Log.info("Unlinked and stopped services for \(formula)")
-    }
-
-    func startPhpVersion(_ version: String, primary: Bool) async {
-        let formula = (version == PhpEnv.brewPhpAlias) ? "php" : "php@\(version)"
-
-        if primary {
-            Log.info("\(formula) is the primary formula, linking and starting services...")
-            await brew("link \(formula) --overwrite --force")
-        } else {
-            Log.info("\(formula) is an isolated PHP version, starting services only...")
-        }
-
-        await brew("services start \(formula)", sudo: true)
-
-        if Valet.enabled(feature: .isolatedSites) && primary {
-            let socketVersion = version.replacingOccurrences(of: ".", with: "")
-            await Shell.quiet("ln -sF ~/.config/valet/valet\(socketVersion).sock ~/.config/valet/valet.sock")
-            Log.info("Symlinked new socket version (valet\(socketVersion).sock → valet.sock).")
-        }
-
-    }
-
 }

phpmon/Common/Shell/RealShell.swift

@@ -86,14 +86,37 @@ class RealShell: ShellProtocol {
 
     // MARK: - Shellable Protocol
 
+    func sync(_ command: String) -> ShellOutput {
+        let task = getShellProcess(for: command)
+
+        let outputPipe = Pipe()
+        let errorPipe = Pipe()
+
+        if ProcessInfo.processInfo.environment["SLOW_SHELL_MODE"] != nil {
+            sleep(3)
+        }
+
+        task.standardOutput = outputPipe
+        task.standardError = errorPipe
+        task.launch()
+        task.waitUntilExit()
+
+        let stdOut = String(data: outputPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)!
+        let stdErr = String(data: errorPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)!
+
+        if Log.shared.verbosity == .cli {
+            log(task: task, stdOut: stdOut, stdErr: stdErr)
+        }
+
+        return .out(stdOut, stdErr)
+    }
+
     func pipe(_ command: String) async -> ShellOutput {
         let task = getShellProcess(for: command)
 
         let outputPipe = Pipe()
         let errorPipe = Pipe()
 
-        // Seriously slow down how long it takes for the shell to return output
-        // (in order to debug or identify async issues)
         if ProcessInfo.processInfo.environment["SLOW_SHELL_MODE"] != nil {
             Log.info("[SLOW SHELL] \(command)")
             await delay(seconds: 3.0)
@@ -104,20 +127,20 @@ class RealShell: ShellProtocol {
         task.launch()
         task.waitUntilExit()
 
-        let stdOut = String(
-            data: outputPipe.fileHandleForReading.readDataToEndOfFile(),
-            encoding: .utf8
-        )!
-
-        let stdErr = String(
-            data: errorPipe.fileHandleForReading.readDataToEndOfFile(),
-            encoding: .utf8
-        )!
+        let stdOut = String(data: outputPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)!
+        let stdErr = String(data: errorPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)!
 
         if Log.shared.verbosity == .cli {
-            var args = task.arguments ?? []
-            let last = "\"" + (args.popLast() ?? "") + "\""
-            var log = """
+            log(task: task, stdOut: stdOut, stdErr: stdErr)
+        }
+
+        return .out(stdOut, stdErr)
+    }
+
+    private func log(task: Process, stdOut: String, stdErr: String) {
+        var args = task.arguments ?? []
+        let last = "\"" + (args.popLast() ?? "") + "\""
+        var log = """
 
             <~~~~~~~~~~~~~~~~~~~~~~~
             $ \(([self.launchPath] + args + [last]).joined(separator: " "))
@@ -126,22 +149,19 @@ class RealShell: ShellProtocol {
             \(stdOut)
             """
 
-            if !stdErr.isEmpty {
-                log.append("""
+        if !stdErr.isEmpty {
+            log.append("""
                 [ERR]:
                 \(stdErr)
                 """)
-            }
+        }
 
-            log.append("""
+        log.append("""
             ~~~~~~~~~~~~~~~~~~~~~~~~>
 
             """)
 
-            Log.info(log)
-        }
-
-        return .out(stdOut, stdErr)
+        Log.info(log)
     }
 
     func quiet(_ command: String) async {

phpmon/Common/Shell/ShellProtocol.swift

@@ -14,6 +14,16 @@ protocol ShellProtocol {
      */
     var PATH: String { get }
 
+    /**
+     Run a command synchronously. Use with caution.
+
+     Common usage:
+     ```
+     let output = Shell.sync("php -v")
+     ```
+     */
+    func sync(_ command: String) -> ShellOutput
+
     /**
      Run a command asynchronously.
      Returns the most relevant output (prefers error output if it exists).

phpmon/Common/State/BusyStatus.swift

@@ -0,0 +1,29 @@
+//
+//  BusyStatus.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 02/05/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class BusyStatus: ObservableObject {
+    @Published var busy: Bool
+    @Published var title: String
+    @Published var description: String
+
+    init(busy: Bool, title: String, description: String) {
+        self.busy = busy
+        self.title = title
+        self.description = description
+    }
+
+    public static func notBusy() -> BusyStatus {
+        return BusyStatus(busy: false, title: "", description: "")
+    }
+
+    public static func busy() -> BusyStatus {
+        return BusyStatus(busy: false, title: "", description: "")
+    }
+}

phpmon/Common/Testables/TestableCommand.swift

@@ -19,6 +19,10 @@ class TestableCommand: CommandProtocol {
         self.execute(path: path, arguments: arguments, trimNewlines: false)
     }
 
+    public func execute(path: String, arguments: [String], trimNewlines: Bool, withStandardError: Bool) -> String {
+        self.execute(path: path, arguments: arguments, trimNewlines: trimNewlines)
+    }
+
     public func execute(path: String, arguments: [String], trimNewlines: Bool) -> String {
         let concatenatedCommand = "\(path) \(arguments.joined(separator: " "))"
         assert(commands.keys.contains(concatenatedCommand), "Command `\(concatenatedCommand)` not found")

phpmon/Common/Testables/TestableConfiguration.swift

@@ -13,11 +13,113 @@ public struct TestableConfiguration: Codable {
     var filesystem: [String: FakeFile]
     var shellOutput: [String: BatchFakeShellOutput]
     var commandOutput: [String: String]
+    var preferenceOverrides: [PreferenceName: Bool]
+
+    init(
+        architecture: String,
+        filesystem: [String: FakeFile],
+        shellOutput: [String: BatchFakeShellOutput],
+        commandOutput: [String: String],
+        preferenceOverrides: [PreferenceName: Bool],
+        phpVersions: [VersionNumber]
+    ) {
+        self.architecture = architecture
+        self.filesystem = filesystem
+        self.shellOutput = shellOutput
+        self.commandOutput = commandOutput
+        self.preferenceOverrides = preferenceOverrides
+
+        phpVersions.enumerated().forEach { (index, version) in
+            self.addPhpVersion(version, primary: index == 0)
+        }
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case architecture, filesystem, shellOutput, commandOutput, preferenceOverrides
+    }
+
+    // MARK: Add PHP versions
+
+    private var primaryPhpVersion: VersionNumber?
+    private var secondaryPhpVersions: [VersionNumber] = []
+
+    // swiftlint:disable function_body_length
+    mutating func addPhpVersion(_ version: VersionNumber, primary: Bool) {
+        if primary {
+            if primaryPhpVersion != nil {
+                fatalError("You cannot add multiple primary PHP versions to a testable configuration!")
+            }
+            primaryPhpVersion = version
+        } else {
+            self.secondaryPhpVersions.append(version)
+        }
+
+        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"
+                : .fake(.binary),
+            "/opt/homebrew/etc/php/\(version.short)/php-fpm.d/www.conf"
+                : .fake(.text),
+            "/opt/homebrew/etc/php/\(version.short)/php-fpm.d/valet-fpm.conf"
+                : .fake(.text),
+            "/opt/homebrew/etc/php/\(version.short)/php.ini"
+                : .fake(.text),
+            "/opt/homebrew/etc/php/\(version.short)/conf.d/php-memory-limits.ini"
+                : .fake(.text)
+        ]) { (_, new) in new }
+
+        // PHP configuration files
+        self.shellOutput["/opt/homebrew/opt/php@\(version.short)/bin/php --ini | grep -E -o '(/[^ ]+\\.ini)'"] =
+            .instant("/opt/homebrew/etc/php/\(version.short)/conf.d/php-memory-limits.ini")
+
+        // PHP Homebrew operations
+        self.shellOutput["/opt/homebrew/bin/brew unlink php@\(version.short)"] = .delayed(0.2, "OK")
+        self.shellOutput["sudo /opt/homebrew/bin/brew services stop php@\(version.short)"] = .delayed(0.2, "OK")
+        self.shellOutput["sudo /opt/homebrew/bin/brew services start php@\(version.short)"] = .delayed(0.2, "OK")
+        self.shellOutput["/opt/homebrew/bin/brew link php@\(version.short) --overwrite --force"] = .delayed(0.2, "OK")
+
+        // PHP version output
+        self.commandOutput["/opt/homebrew/opt/php@\(version.short)/bin/php-config --version"] = version.long
+        self.commandOutput["/opt/homebrew/opt/php@\(version.short)/bin/php -v"] = "OK"
+
+        if primary {
+            // Files expected to be present for currently linked PHP version
+            self.shellOutput["ls /opt/homebrew/opt | grep php"] =
+                .instant("php")
+            self.shellOutput["/opt/homebrew/bin/php --ini | grep -E -o '(/[^ ]+\\.ini)'"] =
+                .instant("/opt/homebrew/etc/php/\(version.short)/conf.d/php-memory-limits.ini")
+            self.filesystem["/opt/homebrew/opt/php"]
+                = .fake(.symlink, "/opt/homebrew/Cellar/php/\(version.long)")
+            self.filesystem["/opt/homebrew/opt/php/bin/php"]
+                = .fake(.symlink, "/opt/homebrew/Cellar/php/\(version.long)/bin/php")
+            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.short)/bin/php-config")
+            self.commandOutput["/opt/homebrew/bin/php-config --version"]
+                = version.long
+        } else {
+            // Output expected to be present for non-linked PHP versions
+            self.shellOutput["ls /opt/homebrew/opt | grep php@"] =
+                BatchFakeShellOutput.instant(
+                    self.secondaryPhpVersions
+                        .map { "php@\($0.short)" }
+                        .joined(separator: "\n")
+                )
+        }
+    }
+    // swiftlint:enable function_body_length
+
+    // MARK: Interactions
 
     func apply() {
         Log.separator()
         Log.info("USING TESTABLE CONFIGURATION...")
-        Homebrew.fake = true
         Log.separator()
         Log.info("Applying fake shell...")
         ActiveShell.useTestable(shellOutput)
@@ -25,14 +127,23 @@ public struct TestableConfiguration: Codable {
         ActiveFileSystem.useTestable(filesystem)
         Log.info("Applying fake commands...")
         ActiveCommand.useTestable(commandOutput)
-        Log.info("Applying fake scanner...")
-        ValetScanner.useFake()
-        Log.info("Applying fake services manager...")
-        ServicesManager.useFake()
-        Log.info("Applying fake Valet domain interactor...")
-        ValetInteractor.useFake()
+        Log.info("Applying temporary preference overrides...")
+        preferenceOverrides.forEach { (key: PreferenceName, value: Any?) in
+            Preferences.shared.cachedPreferences[key] = value
+        }
+
+        if Valet.shared.installed {
+            Log.info("Applying fake scanner...")
+            ValetScanner.useFake()
+            Log.info("Applying fake services manager...")
+            ServicesManager.useFake()
+            Log.info("Applying fake Valet domain interactor...")
+            ValetInteractor.useFake()
+        }
     }
 
+    // MARK: Persist and load
+
     func toJson(pretty: Bool = false) -> String {
         let data = try! JSONEncoder().encode(self)
 

phpmon/Common/Testables/TestableShell.swift

@@ -19,6 +19,17 @@ public class TestableShell: ShellProtocol {
 
     var expectations: [String: BatchFakeShellOutput] = [:]
 
+    func sync(_ command: String) -> ShellOutput {
+        // This assertion will only fire during test builds
+        assert(expectations.keys.contains(command), "No response declared for command: \(command)")
+
+        guard let expectation = expectations[command] else {
+            return .err("No Expected Output")
+        }
+
+        return expectation.syncOutput()
+    }
+
     func quiet(_ command: String) async {
         _ = try! await self.attach(command, didReceiveOutput: { _, _ in }, withTimeout: 60)
     }
@@ -112,6 +123,29 @@ struct BatchFakeShellOutput: Codable {
         return output
     }
 
+    /**
+     Outputs the fake shell output as expected, but does this synchronously.
+     */
+    public func syncOutput(
+        ignoreDelay: Bool = false
+    ) -> ShellOutput {
+        let output = ShellOutput.empty()
+
+        for item in items {
+            if !ignoreDelay {
+                Thread.sleep(forTimeInterval: item.delay)
+            }
+
+            if item.stream == .stdErr {
+                output.err += item.output
+            } else if item.stream == .stdOut {
+                output.out += item.output
+            }
+        }
+
+        return output
+    }
+
     /**
      For testing purposes (and speed) we may omit the delay, regardless of its timespan.
      */

phpmon/Credits.html

@@ -13,11 +13,13 @@
     </head>
     <body>
         <br>
-        <p><b>Do you enjoy using the app?</b> Leave a <a href="https://phpmon.app/github">star on GitHub</a>!</p>
+        <p><b>Do you enjoy using the app? Is it helping you save time?</b> Leave a <a href="https://phpmon.app/github">star on GitHub</a>!</p>
         <p><b>Having issues?</b> Consult the <a href="https://phpmon.app/faq">FAQ</a> section, I did my best to ensure everything is documented.</p>
         <p><b>Want to support further development of PHP Monitor?</b> You can <a href="https://phpmon.app/sponsor">financially support</a> the continued development of this app.</p>
-        <p><b>Get the latest on Mastodon.</b> Give me a <a href="https://phpc.social/@nicoverbruggen">follow on Mastodon</a> to learn about what's brewing and when new updates drop.</p>
-        <br>
+        <p><b>Get the latest on Twitter or Mastodon.</b> Give me a <a href="https://twitter.com/nicoverbruggen">follow on Twitter</a> or <a href="https://phpc.social/@nicoverbruggen">Mastodon</a> to learn about what's brewing and when new updates drop.</p>
+        <p><b>Special thanks</b> to all current and past <a href="https://github.com/sponsors/nicoverbruggen#sponsors"><b>sponsors</b></a> of PHP Monitor, who have helped to make further development of the app possible.</p>
+        <p><b>Made possible by these GitHub Sponsors</b>: @abdusfauzi, @abicons, @adrolli, @andresayej, @andyunleashed, @anzacorp, @argirisp, @AshPowell, @aurawindsurfing, @awsmug, @barrycarton, @BertvanHoekelen, @calebporzio, @caseyalee, @cgreuling, @cjcox17, @Diewy, @drfraker, @driftingly, @duellsy, @edalzell, @EYOND, @faithfm, @frankmichel, @gwleuverink, @hopkins385, @intrepidws, @jacksleight, @JacobBennett, @jasonvarga, @jeromegamez, @jimmyaldape, @jimmysawczuk, @joetannenbaum, @jolora, @joshuablum, @jpeinelt, @jreviews, @JustSteveKing, @Kajvdh, @KFoobar, @Laravel-Backpack, @leganz, @martinleveille, @mathiasonea, @matthewmnewman, @mcastillo1030, @megabubbletea, @mennen-online, @mike-healy, @mostafakram, @mpociot, @MrMicky-FR, @MrMooky, @murdercode, @nckrtl, @nhedger, @ninjaparade, @ozanuzer, @pepatel, @philbraun, @pickuse2013, @pk-informatics, @Plytas, @rderimay, @rickyjohnston, @rico, @RobertBoes, @runofthemill, @SahinU88, @sdebacker, @sdevore, @shadracnicholas, @simonhamp, @SRWieZ, @stefanbauer, @StriveMedia, @swilla, @Tailcode-Studio, @theutz, @ThomasEnssner, @tillkruss, @timothyrowan, @ttnppedr, @vincent-tarrit, @WheresMarco, @xPand4B, @xuandung38, @yeslandi89, @zackkatz, @zacksmash, @zaherg.<br/>(Some names have been omitted due to their sponsorships being private. Thank you all!)
+        <br/>
     </body>
 </html>
 

phpmon/Domain/App/App+GlobalHotkey.swift

@@ -46,8 +46,10 @@ extension App {
         }
 
         hotkey.keyDownHandler = {
-            MainMenu.shared.statusItem.button?.performClick(nil)
-            NSApplication.shared.activate(ignoringOtherApps: true)
+            Task { @MainActor in
+                MainMenu.shared.statusItem.button?.performClick(nil)
+                NSApplication.shared.activate(ignoringOtherApps: true)
+            }
         }
     }
 

phpmon/Domain/App/App.swift

@@ -62,9 +62,6 @@ class App {
 
     // MARK: Variables
 
-    /** Technical information about the current environment. */
-    var environment = EnvironmentManager()
-
     /** The list of preferences that are currently active. */
     var preferences: [PreferenceName: Bool]!
 
@@ -77,8 +74,17 @@ class App {
     /** The window controller of the onboarding window. */
     var onboardingWindowController: OnboardingWindowController?
 
+    /** The window controller of the config manager window. */
+    var phpConfigManagerWindowController: PhpConfigManagerWindowController?
+
     /** The window controller of the warnings window. */
-    var warningsWindowController: WarningsWindowController?
+    var phpDoctorWindowController: PhpDoctorWindowController?
+
+    /** The window controller of the PHP version manager window. */
+    var phpVersionManagerWindowController: PhpVersionManagerWindowController?
+
+    /** The window controller of the PHP extension manager window. */
+    var phpExtensionManagerWindowController: PhpExtensionManagerWindowController?
 
     /** List of detected (installed) applications that PHP Monitor can work with. */
     var detectedApplications: [Application] = []
@@ -114,8 +120,12 @@ class App {
 
     // MARK: - App Watchers
 
-    /**
-     The `PhpConfigWatcher` is responsible for watching the `.ini` files and the `.conf.d` folder.
+    /** Individual filesystem watchers, which are, i.e. responsible for watching the Homebrew folders. */
+    var watchers: [String: FSNotifier] = [:]
+
+    /** 
+     The `ConfigWatchManager` is responsible for watching the `.ini` files and the `.conf.d` folder.
+     This manager object can immediately start or stop all watchers (or pause them) all at once.
      */
-    var watcher: PhpConfigWatcher!
+    var watchManager: ConfigWatchManager!
 }

phpmon/Domain/App/AppDelegate.swift

@@ -11,6 +11,10 @@ import UserNotifications
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDelegate {
 
+    static var instance: AppDelegate {
+        return NSApplication.shared.delegate as! AppDelegate
+    }
+
     // MARK: - Variables
 
     /**
@@ -38,11 +42,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
     let valet: Valet
 
     /**
-     The PhpEnv singleton that handles PHP version
+     The Brew singleton that contains all information about Homebrew
+     and its configuration on your system.
+     */
+    let brew: Brew
+
+    /**
+     The PhpEnvironments singleton that handles PHP version
      detection, as well as switching. It is initialized
      when the app is ready and passed all checks.
      */
-    var phpEnvironment: PhpEnv! = nil
+    var phpEnvironments: PhpEnvironments! = nil
 
     /**
      The logger is responsible for different levels of logging.
@@ -58,7 +68,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
     override init() {
         #if DEBUG
         logger.verbosity = .performance
-
         if let profile = CommandLine.arguments.first(where: { $0.matches(pattern: "--configuration:*") }) {
             Self.initializeTestingProfile(profile.replacingOccurrences(of: "--configuration:", with: ""))
         }
@@ -79,24 +88,30 @@ 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
         self.paths = Paths.shared
         self.valet = Valet.shared
+        self.brew = Brew.shared
         super.init()
     }
 
     func initializeSwitcher() {
-        self.phpEnvironment = PhpEnv.shared
+        self.phpEnvironments = PhpEnvironments.shared
     }
 
     static func initializeTestingProfile(_ path: String) {
         Log.info("The configuration with path `\(path)` is being requested...")
+        // Clear for PHP Guard
+        Stats.clearCurrentGlobalPhpVersion()
+        // Load the configuration file
         TestableConfiguration.loadFrom(path: path).apply()
     }
 
@@ -108,11 +123,30 @@ 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()
+
         Task { // Make sure the menu performs its initial checks
             await menu.startup()
         }
     }
 
+    // MARK: - Menu Items
+
+    @IBOutlet weak var menuItemSites: NSMenuItem!
+
+    /**
+     Ensure relevant menu items in the main menu bar (not the pop-up menu)
+     are disabled or hidden when needed.
+     */
+    public func configureMenuItems(standalone: Bool) {
+        if standalone {
+            menuItemSites.isHidden = true
+        }
+    }
 }

phpmon/Domain/App/AppUpdater.swift

@@ -14,19 +14,23 @@ class AppUpdater {
     var latestVersionOnline: AppVersion!
     var interactive: Bool = false
 
-    public func checkForUpdates(interactive: Bool) async {
-        self.interactive = interactive
+    public func checkForUpdates(userInitiated: Bool) async {
+        self.interactive = userInitiated
 
-        if interactive && !Preferences.isEnabled(.automaticBackgroundUpdateCheck) {
+        if !interactive && !Preferences.isEnabled(.automaticBackgroundUpdateCheck) {
             Log.info("Skipping automatic update check due to user preference.")
             return
         }
 
         Log.info("The app will search for updates...")
 
-        let caskUrl = App.identifier.contains(".dev")
-            ? Constants.Urls.DevBuildCaskFile
-            : Constants.Urls.StableBuildCaskFile
+        var caskUrl = Constants.Urls.StableBuildCaskFile
+
+        if App.identifier.contains(".phpmon.eap") {
+            caskUrl = Constants.Urls.EarlyAccessCaskFile
+        } else if App.identifier.contains(".phpmon.dev") {
+            caskUrl = Constants.Urls.DevBuildCaskFile
+        }
 
         guard let caskFile = await CaskFile.from(url: caskUrl) else {
             Log.err("The contents of the CaskFile at '\(caskUrl.absoluteString)' could not be retrieved.")
@@ -73,7 +77,7 @@ class AppUpdater {
                     .localized(latestVersionOnline.humanReadable),
                 subtitle: "updater.alerts.newer_version_available.subtitle"
                     .localized,
-                description: HomebrewDiagnostics.customCaskInstalled
+                description: BrewDiagnostics.customCaskInstalled
                 ? "updater.installation_source.brew".localized(command)
                 : "updater.installation_source.direct".localized
             )
@@ -88,11 +92,15 @@ class AppUpdater {
             .withSecondary(
                 text: "updater.alerts.buttons.release_notes".localized,
                 action: { _ in
-                    let urlSegments = self.caskFile.url.split(separator: "/")
-                    let tag = urlSegments[urlSegments.count - 2] // ../download/{tag}/{file.zip}
-                    NSWorkspace.shared.open(
-                        Constants.Urls.GitHubReleases.appendingPathComponent("/tag/\(tag)")
-                    )
+                    NSWorkspace.shared.open({
+                        if App.identifier.contains(".eap") {
+                            return Constants.Urls.EarlyAccessChangelog
+                        } else {
+                            let urlSegments = self.caskFile.url.split(separator: "/")
+                            let tag = urlSegments[urlSegments.count - 2] // ../download/{tag}/{file.zip}
+                            return Constants.Urls.GitHubReleases.appendingPathComponent("/tag/\(tag)")
+                        }
+                    }())
                 }
             )
             .withTertiary(text: "updater.alerts.buttons.dismiss".localized, action: { vc in
@@ -179,11 +187,19 @@ class AppUpdater {
         // Cleanup the upgrade.success file
         if FileSystem.fileExists("~/.config/phpmon/updater/upgrade.success") {
             Task { @MainActor in
-                LocalNotification.send(
-                    title: "notification.phpmon_updated.title".localized,
-                    subtitle: "notification.phpmon_updated.desc".localized(App.shortVersion),
-                    preference: nil
-                )
+                if App.identifier.contains(".phpmon.eap") || App.identifier.contains(".phpmon.dev") {
+                    LocalNotification.send(
+                        title: "notification.phpmon_updated.title".localized,
+                        subtitle: "notification.phpmon_updated_dev.desc".localized(App.shortVersion, App.bundleVersion),
+                        preference: nil
+                    )
+                } else {
+                    LocalNotification.send(
+                        title: "notification.phpmon_updated.title".localized,
+                        subtitle: "notification.phpmon_updated.desc".localized(App.shortVersion),
+                        preference: nil
+                    )
+                }
             }
 
             Log.info("The `upgrade.success` file was found! An update was installed. Cleaning up...")

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Search Toolbar Item" minToolsVersion="12.0" minSystemVersion="11.0"/>
@@ -34,18 +34,6 @@
                                     </items>
                                 </menu>
                             </menuItem>
-                            <menuItem title="File" id="XRy-v5-KNb">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="File" id="zA7-mh-f1x">
-                                    <items>
-                                        <menuItem title="Close" keyEquivalent="w" id="2FI-pQ-tuO">
-                                            <connections>
-                                                <action selector="performClose:" target="Ady-hI-5gd" id="ZHq-so-Sba"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
                             <menuItem title="Sites" id="9gy-d3-Pos">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Sites" id="YTZ-bb-TOG">
@@ -82,12 +70,12 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Edit" id="8Pm-83-BlM">
                                     <items>
-                                        <menuItem title="Undo" keyEquivalent="z" id="jCt-Yf-FSE">
+                                        <menuItem title="Undo" enabled="NO" keyEquivalent="z" id="jCt-Yf-FSE">
                                             <connections>
                                                 <action selector="undo:" target="Ady-hI-5gd" id="O3z-27-Ug0"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Redo" keyEquivalent="Z" id="fCh-1M-Qyg">
+                                        <menuItem title="Redo" enabled="NO" keyEquivalent="Z" id="fCh-1M-Qyg">
                                             <connections>
                                                 <action selector="redo:" target="Ady-hI-5gd" id="utE-Bv-fdY"/>
                                             </connections>
@@ -297,6 +285,18 @@
                                     </items>
                                 </menu>
                             </menuItem>
+                            <menuItem title="Window" id="XRy-v5-KNb">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Window" id="zA7-mh-f1x">
+                                    <items>
+                                        <menuItem title="Close" keyEquivalent="w" id="2FI-pQ-tuO">
+                                            <connections>
+                                                <action selector="performClose:" target="Ady-hI-5gd" id="ZHq-so-Sba"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
                             <menuItem title="Help" id="wpr-3q-Mcd">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
@@ -317,7 +317,11 @@
                 </application>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="PHP_Monitor" customModuleProvider="target"/>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="PHP_Monitor" customModuleProvider="target">
+                    <connections>
+                        <outlet property="menuItemSites" destination="9gy-d3-Pos" id="nul-IL-YuR"/>
+                    </connections>
+                </customObject>
             </objects>
             <point key="canvasLocation" x="-360" y="-94"/>
         </scene>
@@ -425,7 +429,7 @@
                                 </toolbarItem>
                                 <searchToolbarItem implicitItemIdentifier="7C834FBE-7118-4082-A09F-7CBECEC1356A" label="Search" paletteLabel="Search" visibilityPriority="1001" id="G2g-jS-RVc">
                                     <nil key="toolTip"/>
-                                    <searchField key="view" verticalHuggingPriority="750" textCompletion="NO" id="0gE-Yr-MLy">
+                                    <searchField key="view" focusRingType="none" verticalHuggingPriority="750" textCompletion="NO" id="0gE-Yr-MLy">
                                         <rect key="frame" x="0.0" y="0.0" width="100" height="21"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" sendsSearchStringImmediately="YES" id="vp9-vH-goQ">
@@ -517,9 +521,6 @@
                                 <subviews>
                                     <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8zu-cF-KCX">
                                         <rect key="frame" x="383" y="13" width="104" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="90" id="4Uf-fh-jWJ"/>
-                                        </constraints>
                                         <buttonCell key="cell" type="push" title="Primary" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="F26-vf-hFH">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -527,15 +528,15 @@
 DQ
 </string>
                                         </buttonCell>
+                                        <constraints>
+                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="90" id="4Uf-fh-jWJ"/>
+                                        </constraints>
                                         <connections>
                                             <action selector="primaryButtonAction:" target="hkw-9V-NxP" id="W7d-3b-pZT"/>
                                         </connections>
                                     </button>
                                     <button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TCp-nS-HN2">
                                         <rect key="frame" x="281" y="13" width="104" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="90" id="QWZ-BA-0g9"/>
-                                        </constraints>
                                         <buttonCell key="cell" type="push" title="Secondary" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="eCk-FC-9Zr">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -543,6 +544,9 @@ DQ
 Gw
 </string>
                                         </buttonCell>
+                                        <constraints>
+                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="90" id="QWZ-BA-0g9"/>
+                                        </constraints>
                                         <connections>
                                             <action selector="secondaryButtonAction:" target="hkw-9V-NxP" id="YJs-Hu-lFP"/>
                                         </connections>
@@ -571,7 +575,7 @@ Gw
                                     <constraint firstAttribute="bottom" secondItem="8zu-cF-KCX" secondAttribute="bottom" constant="20" symbolic="YES" id="wIl-uw-y3p"/>
                                 </constraints>
                             </visualEffectView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="U1c-qS-cIm">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="U1c-qS-cIm">
                                 <rect key="frame" x="98" y="153" width="384" height="19"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="380" id="WgB-hj-d4P"/>
@@ -582,7 +586,7 @@ Gw
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yI6-qf-htf">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yI6-qf-htf">
                                 <rect key="frame" x="98" y="127" width="384" height="16"/>
                                 <textFieldCell key="cell" selectable="YES" title="This is a slightly more expanded explanation." id="rY3-Nd-Iit">
                                     <font key="font" metaFont="system"/>
@@ -606,7 +610,7 @@ Gw
                                 </constraints>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="7eT-Hw-EL9"/>
                             </imageView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hml-dl-Cah">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hml-dl-Cah">
                                 <rect key="frame" x="98" y="70" width="384" height="42"/>
                                 <textFieldCell key="cell" selectable="YES" id="7iW-Lc-DqO">
                                     <font key="font" metaFont="smallSystem"/>
@@ -681,9 +685,6 @@ DQ
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SwS-o8-pbl">
                                 <rect key="frame" x="13" y="13" width="114" height="32"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="qCP-Sp-gxm"/>
-                                </constraints>
                                 <buttonCell key="cell" type="push" title="[i18n] Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="WHE-HW-jwp">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -691,11 +692,14 @@ DQ
 Gw
 </string>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="qCP-Sp-gxm"/>
+                                </constraints>
                                 <connections>
                                     <action selector="pressedCancel:" target="glS-wF-sEU" id="q0L-YZ-F3J"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZX9-s1-23i">
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZX9-s1-23i">
                                 <rect key="frame" x="20" y="150" width="440" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Enter a domain name here." drawsBackground="YES" id="NFa-1D-Bi4">
                                     <font key="font" metaFont="system"/>
@@ -706,7 +710,7 @@ Gw
                                     <outlet property="delegate" destination="glS-wF-sEU" id="Dyf-0M-Gwj"/>
                                 </connections>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VzR-5a-cmT">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VzR-5a-cmT">
                                 <rect key="frame" x="18" y="128" width="444" height="14"/>
                                 <textFieldCell key="cell" title="[i18n] Preview text here" id="bJr-s6-tdP">
                                     <font key="font" metaFont="smallSystem"/>
@@ -724,7 +728,7 @@ Gw
                                     <action selector="pressedSecure:" target="glS-wF-sEU" id="OIj-Pz-5Ea"/>
                                 </connections>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mmQ-7e-dlb">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mmQ-7e-dlb">
                                 <rect key="frame" x="18" y="60" width="444" height="28"/>
                                 <textFieldCell key="cell" title="[i18n] Securing a domain requires administrative privileges. 
You may be prompted for your password or Touch ID." id="4gd-KM-5Fu">
                                     <font key="font" metaFont="smallSystem"/>
@@ -739,7 +743,7 @@ Gw
                                     <url key="url" string="file:///Users/"/>
                                 </pathCell>
                             </pathControl>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P0B-Ht-R8n">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P0B-Ht-R8n">
                                 <rect key="frame" x="18" y="209" width="128" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="[i18n] Link a Folder" id="S4j-ZC-ddT">
                                     <font key="font" textStyle="headline" name=".SFNS-Bold"/>
@@ -747,7 +751,7 @@ Gw
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="900-Z2-tID">
+                            <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="900-Z2-tID">
                                 <rect key="frame" x="140" y="23" width="180" height="14"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="That domain name already exists." id="jOt-n6-TQf">
                                     <font key="font" metaFont="smallSystem"/>
@@ -882,7 +886,7 @@ Gw
                                                             <rect key="frame" x="69" y="0.0" width="200" height="54"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="XJL-Uw-frD">
+                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="XJL-Uw-frD">
                                                                     <rect key="frame" x="3" y="26" width="145" height="16"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="my-domain-name.test" id="SGC-Gm-Mxd">
                                                                         <font key="font" metaFont="systemSemibold" size="13"/>
@@ -890,7 +894,7 @@ Gw
                                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="CXK-Q9-CpO">
+                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="CXK-Q9-CpO">
                                                                     <rect key="frame" x="3" y="12" width="75" height="14"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="~/path/to/site" id="fe7-Ha-mR9">
                                                                         <font key="font" metaFont="smallSystem"/>
@@ -933,13 +937,13 @@ Gw
                                                             <subviews>
                                                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZXQ-bg-Xba">
                                                                     <rect key="frame" x="27" y="18" width="70" height="18"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="MBa-bB-DTB"/>
-                                                                    </constraints>
                                                                     <buttonCell key="cell" type="inline" title="PHP X.X" bezelStyle="inline" alignment="center" borderStyle="border" inset="2" id="Tfk-YR-L4B">
                                                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                         <font key="font" metaFont="smallSystemBold"/>
                                                                     </buttonCell>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="MBa-bB-DTB"/>
+                                                                    </constraints>
                                                                     <connections>
                                                                         <action selector="pressedPhpVersion:" target="T49-0U-d58" id="jVO-TS-F6d"/>
                                                                     </connections>
@@ -969,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"/>
@@ -983,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="50" 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="16" 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"/>
@@ -1020,10 +1024,10 @@ 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="470" 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">
+                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ljl-8B-key">
                                                                     <rect key="frame" x="6" y="26" width="93" height="14"/>
                                                                     <textFieldCell key="cell" alignment="left" title="Laravel" id="0lu-L6-oKr">
                                                                         <font key="font" metaFont="smallSystem"/>
@@ -1031,7 +1035,7 @@ Gw
                                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aPK-Xc-J4B">
+                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aPK-Xc-J4B">
                                                                     <rect key="frame" x="6" y="15" width="93" height="11"/>
                                                                     <textFieldCell key="cell" alignment="left" title="PHP 8.0" id="puf-Jh-ham">
                                                                         <font key="font" metaFont="miniSystem"/>
@@ -1121,7 +1125,7 @@ Gw
                                     <rect key="frame" x="0.0" y="0.0" width="540" height="286"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QCK-Z9-w7g">
+                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QCK-Z9-w7g">
                                             <rect key="frame" x="20" y="196" width="500" height="21"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" title="http://127.0.0.1:80" placeholderString="http://127.0.0.1:80" drawsBackground="YES" id="muS-8M-KSy">
                                                 <font key="font" metaFont="system"/>
@@ -1132,7 +1136,7 @@ Gw
                                                 <outlet property="delegate" destination="dwh-CF-6iv" id="lNE-OI-G93"/>
                                             </connections>
                                         </textField>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Uib-vA-HRc">
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Uib-vA-HRc">
                                             <rect key="frame" x="18" y="221" width="325" height="14"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="[i18n] Proxy subject (usually: protocol, IP address and port)" id="G1Z-3f-BhL">
                                                 <font key="font" metaFont="systemMedium" size="11"/>
@@ -1140,7 +1144,7 @@ Gw
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mlA-Zt-Hu8">
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mlA-Zt-Hu8">
                                             <rect key="frame" x="18" y="172" width="112" height="14"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="[i18n] Domain name" id="dQs-oZ-80e">
                                                 <font key="font" metaFont="systemMedium" size="11"/>
@@ -1148,7 +1152,7 @@ Gw
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SNw-oQ-bnb">
+                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SNw-oQ-bnb">
                                             <rect key="frame" x="20" y="147" width="500" height="21"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Enter a domain name here." drawsBackground="YES" id="gTQ-Y2-Y9w">
                                                 <font key="font" metaFont="system"/>
@@ -1190,9 +1194,6 @@ DQ
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nC0-dk-QaF">
                                 <rect key="frame" x="13" y="13" width="114" height="32"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="uCc-fF-wS2"/>
-                                </constraints>
                                 <buttonCell key="cell" type="push" title="[i18n] Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="D8g-GE-7TU">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1200,11 +1201,14 @@ DQ
 Gw
 </string>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="uCc-fF-wS2"/>
+                                </constraints>
                                 <connections>
                                     <action selector="pressedCancel:" target="dwh-CF-6iv" id="J2T-Zj-A0j"/>
                                 </connections>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JSZ-x8-Pqi">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JSZ-x8-Pqi">
                                 <rect key="frame" x="18" y="128" width="504" height="14"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="500" id="sF1-RG-URI"/>
@@ -1225,7 +1229,7 @@ Gw
                                     <action selector="pressedSecure:" target="dwh-CF-6iv" id="b74-8T-AzO"/>
                                 </connections>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5x7-ll-2f7">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5x7-ll-2f7">
                                 <rect key="frame" x="18" y="60" width="504" height="28"/>
                                 <textFieldCell key="cell" title="[i18n] Securing a domain requires administrative privileges. 
You may be prompted for your password or Touch ID." id="IMB-O5-ZOy">
                                     <font key="font" metaFont="smallSystem"/>
@@ -1233,7 +1237,7 @@ Gw
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DAh-br-Dfx">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DAh-br-Dfx">
                                 <rect key="frame" x="18" y="250" width="123" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="[i18n] Add a Proxy" id="AZ1-04-kUl">
                                     <font key="font" textStyle="headline" name=".SFNS-Bold"/>
@@ -1241,7 +1245,7 @@ Gw
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="w0k-CK-0u4">
+                            <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="w0k-CK-0u4">
                                 <rect key="frame" x="191" y="23" width="180" height="14"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="That domain name already exists." id="4sH-94-UJl">
                                     <font key="font" metaFont="smallSystem"/>
@@ -1336,9 +1340,6 @@ Gw
                                 <subviews>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FhN-AM-SkI">
                                         <rect key="frame" x="13" y="13" width="114" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="Zhu-D8-cLK"/>
-                                        </constraints>
                                         <buttonCell key="cell" type="push" title="[i18n] Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="LxP-t4-H2W">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -1346,6 +1347,9 @@ Gw
 Gw
 </string>
                                         </buttonCell>
+                                        <constraints>
+                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="Zhu-D8-cLK"/>
+                                        </constraints>
                                         <connections>
                                             <action selector="pressedCancel:" target="gOD-Gu-zDG" id="wMp-sM-0A4"/>
                                         </connections>
@@ -1385,7 +1389,7 @@ Gw
                                             <real value="3.4028234663852886e+38"/>
                                         </customSpacing>
                                     </stackView>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fJK-Ke-IK3">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fJK-Ke-IK3">
                                         <rect key="frame" x="18" y="138" width="504" height="19"/>
                                         <textFieldCell key="cell" selectable="YES" alignment="left" title="[i18n] What kind of domain would you like to set up?" id="agk-Nj-FLd">
                                             <font key="font" metaFont="systemBold" size="15"/>
@@ -1393,7 +1397,7 @@ Gw
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="urj-Xq-TrJ">
+                                    <textField wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="urj-Xq-TrJ">
                                         <rect key="frame" x="18" y="60" width="504" height="70"/>
                                         <constraints>
                                             <constraint firstAttribute="width" relation="lessThanOrEqual" constant="500" id="tbl-AV-4qB"/>

phpmon/Domain/App/EnvironmentCheck.swift

@@ -43,3 +43,9 @@ struct EnvironmentCheck {
         return await !self.command()
     }
 }
+
+struct EnvironmentCheckGroup {
+    let name: String
+    let condition: () -> Bool
+    let checks: [EnvironmentCheck]
+}

phpmon/Domain/App/EnvironmentManager.swift

@@ -1,35 +0,0 @@
-//
-//  EnvironmentManager.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 14/09/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-public class EnvironmentManager {
-    var values: [EnvironmentProperty: Bool] = [:]
-
-    public func process() async {
-        self.values[.hasValetInstalled] = await !{
-            let output = await Shell.pipe("valet --version").out
-
-            // Failure condition #1: does not contain Laravel Valet
-            if !output.contains("Laravel Valet") {
-                return false
-            }
-
-            // Extract the version number
-            Valet.shared.version = try! VersionNumber.parse(VersionExtractor.from(output)!)
-
-            // Get the actual version
-            return Valet.shared.version == nil
-        }() // returns true if none of the failure conditions are met
-    }
-}
-
-public enum EnvironmentProperty {
-    case hasHomebrewInstalled
-    case hasValetInstalled
-}

phpmon/Domain/App/InterAppHandler.swift

@@ -23,13 +23,13 @@ class InterApp {
 
     @MainActor static func getCommands() -> [InterApp.Action] { return [
         InterApp.Action(command: "list", action: { _ in
-            DomainListVC.show()
+            if Valet.installed { DomainListVC.show() }
         }),
         InterApp.Action(command: "services/stop", action: { _ in
-            Task { MainMenu.shared.stopValetServices() }
+            if Valet.installed { Task { MainMenu.shared.stopValetServices() } }
         }),
         InterApp.Action(command: "services/restart/all", action: { _ in
-            Task { MainMenu.shared.restartValetServices() }
+            if Valet.installed { Task { MainMenu.shared.restartValetServices() } }
         }),
         InterApp.Action(command: "services/restart/nginx", action: { _ in
             Task { MainMenu.shared.restartNginx() }
@@ -47,7 +47,7 @@ class InterApp {
             Task { MainMenu.shared.openGlobalComposerFolder() }
         }),
         InterApp.Action(command: "locate/valet", action: { _ in
-            Task { MainMenu.shared.openValetConfigFolder() }
+            if Valet.installed { Task { MainMenu.shared.openValetConfigFolder() } }
         }),
         InterApp.Action(command: "phpinfo", action: { _ in
             Task { MainMenu.shared.openPhpInfo() }

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 {
@@ -107,9 +107,9 @@ class ServicesManager: ObservableObject {
 
     var formulae: [HomebrewFormula] {
         var formulae = [
-            Homebrew.Formulae.php,
-            Homebrew.Formulae.nginx,
-            Homebrew.Formulae.dnsmasq
+            HomebrewFormulae.php,
+            HomebrewFormulae.nginx,
+            HomebrewFormulae.dnsmasq
         ]
 
         let additionalFormulae = (Preferences.custom.services ?? []).map({ item in

phpmon/Domain/App/Services/ValetServicesManager.swift

@@ -34,6 +34,10 @@ class ValetServicesManager: ServicesManager {
      these two commands are executed concurrently.
      */
     override func reloadServicesStatus() async {
+        if !Valet.installed {
+            return Log.info("Not reloading services because running in Standalone Mode.")
+        }
+
         await withTaskGroup(of: [HomebrewService].self, body: { group in
             // First, retrieve the status of the formulae that run as root
             group.addTask {

phpmon/Domain/App/Startup.swift

@@ -19,24 +19,32 @@ class Startup {
      */
     func checkEnvironment() async -> Bool {
         // Do the important system setup checks
-        Log.info("[ARCH] The user is running PHP Monitor with the architecture: \(App.architecture)")
+        Log.info("The user is running PHP Monitor with the architecture: \(App.architecture)")
 
-        for check in self.checks {
-            if await check.succeeds() {
-                Log.info("[OK] \(check.name)")
-                continue
+        for group in self.groups {
+            if group.condition() {
+                Log.info("Now running \(group.checks.count) \(group.name) checks!")
+                for check in group.checks {
+                    let start = Measurement()
+                    if await check.succeeds() {
+                        Log.info("[PASS] \(check.name) (\(start.milliseconds) ms)")
+                        continue
+                    }
+
+                    // If we get here, something's gone wrong and the check has failed...
+                    Log.info("[FAIL] \(check.name) (\(start.milliseconds) ms)")
+                    await showAlert(for: check)
+                    return false
+                }
+            } else {
+                Log.info("Skipping \(group.name) checks!")
             }
-
-            // If we get here, something's gone wrong and the check has failed...
-            Log.info("[FAIL] \(check.name)")
-            await showAlert(for: check)
-            return false
         }
 
         // If we get here, nothing has gone wrong. That's what we want!
         initializeSwitcher()
-        Log.separator(as: .info)
         Log.info("PHP Monitor has determined the application has successfully passed all checks.")
+        Log.separator(as: .info)
         return true
     }
 
@@ -81,188 +89,222 @@ class Startup {
 
     // MARK: - Check (List)
 
-    public var checks: [EnvironmentCheck] = [
-        // =================================================================================
-        // The Homebrew binary must exist.
-        // =================================================================================
-        EnvironmentCheck(
-            command: { return !FileSystem.fileExists(Paths.brew) },
-            name: "`\(Paths.brew)` exists",
-            titleText: "alert.homebrew_missing.title".localized,
-            subtitleText: "alert.homebrew_missing.subtitle".localized,
-            descriptionText: "alert.homebrew_missing.info".localized(
-                App.architecture
-                    .replacingOccurrences(of: "x86_64", with: "Intel")
-                    .replacingOccurrences(of: "arm64", with: "Apple Silicon"),
-                Paths.brew
+    public var groups: [EnvironmentCheckGroup] = [
+        EnvironmentCheckGroup(name: "core", condition: { return true }, checks: [
+            // =================================================================================
+            // The Homebrew binary must exist.
+            // =================================================================================
+            EnvironmentCheck(
+                command: { return !FileSystem.fileExists(Paths.brew) },
+                name: "`\(Paths.brew)` exists",
+                titleText: "alert.homebrew_missing.title".localized,
+                subtitleText: "alert.homebrew_missing.subtitle".localized,
+                descriptionText: "alert.homebrew_missing.info".localized(
+                    App.architecture
+                        .replacingOccurrences(of: "x86_64", with: "Intel")
+                        .replacingOccurrences(of: "arm64", with: "Apple Silicon"),
+                    Paths.brew
+                ),
+                buttonText: "alert.homebrew_missing.quit".localized,
+                requiresAppRestart: true
             ),
-            buttonText: "alert.homebrew_missing.quit".localized,
-            requiresAppRestart: true
-        ),
-        // =================================================================================
-        // The PHP binary must exist.
-        // =================================================================================
-        EnvironmentCheck(
-            command: { return !FileSystem.fileExists(Paths.php) },
-            name: "`\(Paths.php)` exists",
-            titleText: "startup.errors.php_binary.title".localized,
-            subtitleText: "startup.errors.php_binary.subtitle".localized,
-            descriptionText: "startup.errors.php_binary.desc".localized(Paths.php)
-        ),
-        // =================================================================================
-        // Make sure we can detect one or more PHP installations.
-        // =================================================================================
-        EnvironmentCheck(
-            command: {
-                return await !Shell.pipe("ls \(Paths.optPath) | grep php").out.contains("php")
-            },
-            name: "`ls \(Paths.optPath) | grep php` returned php result",
-            titleText: "startup.errors.php_opt.title".localized,
-            subtitleText: "startup.errors.php_opt.subtitle".localized(
-                Paths.optPath
-            ),
-            descriptionText: "startup.errors.php_opt.desc".localized
-        ),
-        // =================================================================================
-        // The Valet binary must exist.
-        // =================================================================================
-        EnvironmentCheck(
-            command: {
-                return !(FileSystem.fileExists(Paths.valet) || FileSystem.fileExists("~/.composer/vendor/bin/valet"))
-            },
-            name: "`valet` binary exists",
-            titleText: "startup.errors.valet_executable.title".localized,
-            subtitleText: "startup.errors.valet_executable.subtitle".localized,
-            descriptionText: "startup.errors.valet_executable.desc".localized(
-                Paths.valet
+            // =================================================================================
+            // Make sure we can detect one or more PHP installations.
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    return await !Shell.pipe("ls \(Paths.optPath) | grep php").out.contains("php")
+                },
+                name: "`ls \(Paths.optPath) | grep php` returned php result",
+                titleText: "startup.errors.php_opt.title".localized,
+                subtitleText: "startup.errors.php_opt.subtitle".localized(
+                    Paths.optPath
+                ),
+                descriptionText: "startup.errors.php_opt.desc".localized
             )
-        ),
-        // =================================================================================
-        // Check if Valet and Homebrew need manual password intervention. If they do, then
-        // PHP Monitor will be unable to run these commands, which prevents PHP Monitor from
-        // functioning correctly. Let the user know that they need to run `valet trust`.
-        // =================================================================================
-        EnvironmentCheck(
-            command: { return await !Shell.pipe("cat /private/etc/sudoers.d/brew").out.contains(Paths.brew) },
-            name: "`/private/etc/sudoers.d/brew` contains brew",
-            titleText: "startup.errors.sudoers_brew.title".localized,
-            subtitleText: "startup.errors.sudoers_brew.subtitle".localized,
-            descriptionText: "startup.errors.sudoers_brew.desc".localized
-        ),
-        EnvironmentCheck(
-            command: { return await !Shell.pipe("cat /private/etc/sudoers.d/valet").out.contains(Paths.valet) },
-            name: "`/private/etc/sudoers.d/valet` contains valet",
-            titleText: "startup.errors.sudoers_valet.title".localized,
-            subtitleText: "startup.errors.sudoers_valet.subtitle".localized,
-            descriptionText: "startup.errors.sudoers_valet.desc".localized
-        ),
-        // =================================================================================
-        // Verify if the Homebrew services are running (as root).
-        // =================================================================================
-        EnvironmentCheck(
-            command: {
-                await HomebrewDiagnostics.loadInstalledTaps()
-                return await HomebrewDiagnostics.cannotLoadService("dnsmasq")
-            },
-            name: "`sudo \(Paths.brew) services info` JSON loaded",
-            titleText: "startup.errors.services_json_error.title".localized,
-            subtitleText: "startup.errors.services_json_error.subtitle".localized,
-            descriptionText: "startup.errors.services_json_error.desc".localized
-        ),
-        // =================================================================================
-        // Determine that Valet is installed
-        // =================================================================================
-        EnvironmentCheck(
-            command: {
-                return !FileSystem.directoryExists("~/.config/valet")
-            },
-            name: "`.config/valet` not empty (Valet installed)",
-            titleText: "startup.errors.valet_not_installed.title".localized,
-            subtitleText: "startup.errors.valet_not_installed.subtitle".localized,
-            descriptionText: "startup.errors.valet_not_installed.desc".localized
-        ),
-        // =================================================================================
-        // Determine that the Valet configuration JSON file is valid.
-        // =================================================================================
-        EnvironmentCheck(
-            command: {
-                // Detect additional binaries (e.g. Composer)
-                Paths.shared.detectBinaryPaths()
-                // Load the configuration file (config.json)
-                Valet.shared.loadConfiguration()
-                // This check fails when the config is nil
-                return Valet.shared.config == nil
-            },
-            name: "`config.json` was valid",
-            titleText: "startup.errors.valet_json_invalid.title".localized,
-            subtitleText: "startup.errors.valet_json_invalid.subtitle".localized,
-            descriptionText: "startup.errors.valet_json_invalid.desc".localized
-        ),
-        // =================================================================================
-        // Check for `which` alias issue
-        // =================================================================================
-        EnvironmentCheck(
-            command: {
-                let nodePath = await Shell.pipe("which node").out
-                return App.architecture == "x86_64"
+        ]),
+        EnvironmentCheckGroup(name: "valet", condition: { return Valet.installed }, checks: [
+            // =================================================================================
+            // The PHP binary must exist.
+            // =================================================================================
+            EnvironmentCheck(
+                command: { return !FileSystem.fileExists(Paths.php) },
+                name: "`\(Paths.php)` exists",
+                titleText: "startup.errors.php_binary.title".localized,
+                subtitleText: "startup.errors.php_binary.subtitle".localized,
+                descriptionText: "startup.errors.php_binary.desc".localized(Paths.php)
+            ),
+            // =================================================================================
+            // Ensure that the main PHP installation is not broken.
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    return await Shell.pipe("\(Paths.binPath)/php -v").err
+                        .contains("Library not loaded")
+                },
+                name: "no `dyld` issue (`Library not loaded`) detected",
+                titleText: "startup.errors.dyld_library.title".localized,
+                subtitleText: "startup.errors.dyld_library.subtitle".localized(
+                    Paths.optPath
+                ),
+                descriptionText: "startup.errors.dyld_library.desc".localized
+            ),
+            // =================================================================================
+            // The Valet binary must exist.
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    return !(FileSystem.fileExists(Paths.valet)
+                             || FileSystem.fileExists("~/.composer/vendor/bin/valet"))
+                },
+                name: "`valet` binary exists",
+                titleText: "startup.errors.valet_executable.title".localized,
+                subtitleText: "startup.errors.valet_executable.subtitle".localized,
+                descriptionText: "startup.errors.valet_executable.desc".localized(
+                    Paths.valet
+                )
+            ),
+            // =================================================================================
+            // Check if Valet and Homebrew need manual password intervention. If they do, then
+            // PHP Monitor will be unable to run these commands, which prevents PHP Monitor from
+            // functioning correctly. Let the user know that they need to run `valet trust`.
+            // =================================================================================
+            EnvironmentCheck(
+                command: { return await !Shell.pipe("cat /private/etc/sudoers.d/brew").out.contains(Paths.brew) },
+                name: "`/private/etc/sudoers.d/brew` contains brew",
+                titleText: "startup.errors.sudoers_brew.title".localized,
+                subtitleText: "startup.errors.sudoers_brew.subtitle".localized,
+                descriptionText: "startup.errors.sudoers_brew.desc".localized
+            ),
+            EnvironmentCheck(
+                command: { return await !Shell.pipe("cat /private/etc/sudoers.d/valet").out.contains(Paths.valet) },
+                name: "`/private/etc/sudoers.d/valet` contains valet",
+                titleText: "startup.errors.sudoers_valet.title".localized,
+                subtitleText: "startup.errors.sudoers_valet.subtitle".localized,
+                descriptionText: "startup.errors.sudoers_valet.desc".localized
+            ),
+            // =================================================================================
+            // Determine that Valet is installed
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    return !FileSystem.directoryExists("~/.config/valet")
+                },
+                name: "`.config/valet` not empty (Valet installed)",
+                titleText: "startup.errors.valet_not_installed.title".localized,
+                subtitleText: "startup.errors.valet_not_installed.subtitle".localized,
+                descriptionText: "startup.errors.valet_not_installed.desc".localized
+            ),
+            // =================================================================================
+            // Determine that the Valet configuration JSON file is valid.
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    // Detect additional binaries (e.g. Composer)
+                    Paths.shared.detectBinaryPaths()
+                    // Load the configuration file (config.json)
+                    Valet.shared.loadConfiguration()
+                    // This check fails when the config is nil
+                    return Valet.shared.config == nil
+                },
+                name: "`config.json` was valid",
+                titleText: "startup.errors.valet_json_invalid.title".localized,
+                subtitleText: "startup.errors.valet_json_invalid.subtitle".localized,
+                descriptionText: "startup.errors.valet_json_invalid.desc".localized
+            ),
+            // =================================================================================
+            // Verify if the Homebrew services are running (as root).
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    await BrewDiagnostics.loadInstalledTaps()
+                    return await BrewDiagnostics.cannotLoadService("dnsmasq")
+                },
+                name: "`sudo \(Paths.brew) services info` JSON loaded",
+                titleText: "startup.errors.services_json_error.title".localized,
+                subtitleText: "startup.errors.services_json_error.subtitle".localized,
+                descriptionText: "startup.errors.services_json_error.desc".localized
+            ),
+            // =================================================================================
+            // Check for `which` alias issue
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    let nodePath = await Shell.pipe("which node").out
+                    return App.architecture == "x86_64"
                     && FileSystem.fileExists("/usr/local/bin/which")
                     && nodePath.contains("env: node: No such file or directory")
-            },
-            name: "`env: node` issue does not apply",
-            titleText: "startup.errors.which_alias_issue.title".localized,
-            subtitleText: "startup.errors.which_alias_issue.subtitle".localized,
-            descriptionText: "startup.errors.which_alias_issue.desc".localized
-        ),
-        // =================================================================================
-        // Determine that Valet works correctly (no issues in platform detected)
-        // =================================================================================
-        EnvironmentCheck(
-            command: {
-                return await Shell.pipe("valet --version").out
-                    .contains("Composer detected issues in your platform")
-            },
-            name: "`no global composer issues",
-            titleText: "startup.errors.global_composer_platform_issues.title".localized,
-            subtitleText: "startup.errors.global_composer_platform_issues.subtitle".localized,
-            descriptionText: "startup.errors.global_composer_platform_issues.desc".localized
-        ),
-        // =================================================================================
-        // Determine the Valet version and ensure it isn't unknown.
-        // =================================================================================
-        EnvironmentCheck(
-            command: {
-                let output = await Shell.pipe("valet --version").out
-                // Failure condition #1: does not contain Laravel Valet
-                if !output.contains("Laravel Valet") {
-                    return true
-                }
-                // Failure condition #2: version cannot be parsed
-                let versionString = output
-                    .trimmingCharacters(in: .whitespacesAndNewlines)
-                    .components(separatedBy: "Laravel Valet")[1]
-                    .trimmingCharacters(in: .whitespaces)
-                // Extract the version number
-                Valet.shared.version = try! VersionNumber.parse(VersionExtractor.from(versionString)!)
-                // Get the actual version
-                return Valet.shared.version == nil
-            },
-            name: "`valet --version` was loaded",
-            titleText: "startup.errors.valet_version_unknown.title".localized,
-            subtitleText: "startup.errors.valet_version_unknown.subtitle".localized,
-            descriptionText: "startup.errors.valet_version_unknown.desc".localized
-        ),
-        // =================================================================================
-        // Ensure the Valet version is supported.
-        // =================================================================================
-        EnvironmentCheck(
-            command: {
-                // We currently support Valet 2, 3 or 4. Any other version should get an alert.
-                return ![2, 3, 4].contains(Valet.shared.version.major)
-            },
-            name: "valet version is supported",
-            titleText: "startup.errors.valet_version_not_supported.title".localized,
-            subtitleText: "startup.errors.valet_version_not_supported.subtitle".localized,
-            descriptionText: "startup.errors.valet_version_not_supported.desc".localized
-        )
+                },
+                name: "`env: node` issue does not apply",
+                titleText: "startup.errors.which_alias_issue.title".localized,
+                subtitleText: "startup.errors.which_alias_issue.subtitle".localized,
+                descriptionText: "startup.errors.which_alias_issue.desc".localized
+            ),
+            // =================================================================================
+            // Determine that Laravel Herd is not running (may cause conflicts)
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    return NSWorkspace.shared.runningApplications.contains(where: { app in
+                        return app.bundleIdentifier == "de.beyondco.herd"
+                    })
+                },
+                name: "Herd is not running",
+                titleText: "startup.errors.herd_running.title".localized,
+                subtitleText: "startup.errors.herd_running.subtitle".localized,
+                descriptionText: "startup.errors.herd_running.desc".localized
+            ),
+            // =================================================================================
+            // Determine that Valet works correctly (no issues in platform detected)
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    return await Shell.pipe("valet --version").out
+                        .contains("Composer detected issues in your platform")
+                },
+                name: "no global composer issues",
+                titleText: "startup.errors.global_composer_platform_issues.title".localized,
+                subtitleText: "startup.errors.global_composer_platform_issues.subtitle".localized,
+                descriptionText: "startup.errors.global_composer_platform_issues.desc".localized
+            ),
+            // =================================================================================
+            // Determine the Valet version and ensure it isn't unknown.
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    let output = await Shell.pipe("valet --version").out
+                    // Failure condition #1: does not contain Laravel Valet
+                    if !output.contains("Laravel Valet") {
+                        return true
+                    }
+                    // Failure condition #2: version cannot be parsed
+                    let versionString = output
+                        .trimmingCharacters(in: .whitespacesAndNewlines)
+                        .components(separatedBy: "Laravel Valet")[1]
+                        .trimmingCharacters(in: .whitespaces)
+                    // Extract the version number
+                    Valet.shared.version = try! VersionNumber.parse(VersionExtractor.from(versionString)!)
+                    // Get the actual version
+                    return Valet.shared.version == nil
+                },
+                name: "`valet --version` was loaded",
+                titleText: "startup.errors.valet_version_unknown.title".localized,
+                subtitleText: "startup.errors.valet_version_unknown.subtitle".localized,
+                descriptionText: "startup.errors.valet_version_unknown.desc".localized
+            ),
+            // =================================================================================
+            // Ensure the Valet version is supported.
+            // =================================================================================
+            EnvironmentCheck(
+                command: {
+                    // We currently support Valet 2, 3 or 4. Any other version should get an alert.
+                    return ![2, 3, 4].contains(Valet.shared.version?.major)
+                },
+                name: "valet version is supported",
+                titleText: "startup.errors.valet_version_not_supported.title".localized,
+                subtitleText: "startup.errors.valet_version_not_supported.subtitle".localized,
+                descriptionText: "startup.errors.valet_version_not_supported.desc".localized
+            )
+        ])
     ]
 }

phpmon/Domain/Integrations/Composer/ComposerJson.swift

@@ -62,12 +62,13 @@ struct ComposerJson: Decodable {
     public func getNotableDependencies() -> [String: String] {
         var notable: [String: String] = [:]
 
-        var scan = Array(PhpFrameworks.DependencyList.keys)
-        scan.append("php")
+        let scan = Array(ProjectTypeDetection.CommonDependencyList.keys) +
+            Array(ProjectTypeDetection.SpecificDependencyList.keys) +
+            ["php"]
 
         scan.forEach { dependency in
-            if dependencies?[dependency] != nil {
-                notable[dependency] = dependencies![dependency]
+            if let resolvedDependency = dependencies?[dependency] {
+                notable[dependency] = resolvedDependency
             }
         }
 

phpmon/Domain/Integrations/Composer/ComposerWindow.swift

@@ -27,9 +27,7 @@ import Foundation
             return
         }
 
-        PhpEnv.shared.isBusy = true
-        MainMenu.shared.setBusyImage()
-        MainMenu.shared.rebuild()
+        PhpEnvironments.shared.isBusy = true
 
         window = TerminalProgressWindowController.display(
             title: "alert.composer_progress.title".localized,
@@ -105,15 +103,12 @@ import Foundation
     // MARK: Main Menu Update
 
     private func removeBusyStatus() {
-        PhpEnv.shared.isBusy = false
-        Task { @MainActor in
-            MainMenu.shared.updatePhpVersionInStatusBar()
-        }
+        PhpEnvironments.shared.isBusy = false
     }
 
     // MARK: Alert
 
-    @MainActor private func presentMissingAlert() {
+    private func presentMissingAlert() {
         BetterAlert()
             .withInformation(
                 title: "alert.composer_missing.title".localized,

phpmon/Domain/Integrations/Composer/ProjectTypeDetection.swift

@@ -8,20 +8,20 @@
 
 import Foundation
 
-struct PhpFrameworks {
-
+struct ProjectTypeDetection {
     /**
-     This list should probably be reversed when checked, because some of these
-     will also require either `laravel/framework` or `symfony/symfony`.
+     This list is only checked if the specific dependency list doesn't report a match.
      */
-    public static let DependencyList = [
-
-        // COMMON FRAMEWORKS
+    public static let CommonDependencyList = [
         "laravel/framework": "Laravel",
         "symfony/symfony": "Symfony",
-        "laravel/lumen": "Lumen",
+        "laravel/lumen": "Lumen"
+    ]
 
-        // VARIOUS CMS
+    /**
+     This list is checked first to see if a project dependency can be mapped to a certain project type.
+     */
+    public static let SpecificDependencyList = [
         "roots/bedrock": "Bedrock",
         "cakephp/app": "CakePHP",
         "craftcms/craft": "Craft",
@@ -37,30 +37,8 @@ struct PhpFrameworks {
         "johnpbloch/wordpress-core": "WordPress",
         "zendframework/zendframework": "Zend",
         "zendframework/zend-mvc": "Zend",
-        "typo3/cms-core": "Typo3"
-        // "magento/*": "Magento",
-        // "concrete5/*": "Concrete5",
-        // "contao/*": "Contao",
-        // "slim/*": "Slim",
-    ]
-
-    public static let FileMapping: [String: [String]] = [
-        "Drupal": [
-            // Legacy installations
-            "/misc/drupal.js",
-            "/core/lib/Drupal.php",
-            // The default (new) installation w/ Composer puts the modules in /web
-            "/web/misc/drupal.js",
-            "/web/core/lib/Drupal.php"
-        ],
-        "WordPress": [
-            "/wp-config.php",
-            "/wp-config-sample.php"
-        ],
-        "Typo3": [
-            "/typo3",
-            "/public/typo3"
-        ]
+        "typo3/cms-core": "Typo3",
+        "slim/slim": "Slim"
     ]
 
     /**
@@ -82,4 +60,25 @@ struct PhpFrameworks {
         return nil
     }
 
+    /**
+     File mapping is used as a fallback if neither specific nor framework matches could be done.
+     */
+    public static let FileMapping: [String: [String]] = [
+        "Drupal": [
+            // Legacy installations
+            "/misc/drupal.js",
+            "/core/lib/Drupal.php",
+            // The default (new) installation w/ Composer puts the modules in /web
+            "/web/misc/drupal.js",
+            "/web/core/lib/Drupal.php"
+        ],
+        "WordPress": [
+            "/wp-config.php",
+            "/wp-config-sample.php"
+        ],
+        "Typo3": [
+            "/typo3",
+            "/public/typo3"
+        ]
+    ]
 }

phpmon/Domain/Integrations/Homebrew/Behaviors/BrewPermissionFixer.swift

@@ -0,0 +1,125 @@
+//
+//  BrewPermissionFixer.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 23/04/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class BrewPermissionFixer {
+
+    var broken: [DueOwnershipFormula] = []
+
+    /**
+     Takes ownership of the /BREW_PATH/Cellar/php/x.y.z/bin folder, for all PHP versions.
+
+     This might not be required if the user has only used that version of PHP
+     with site isolation, so this method checks if it's required first.
+
+     This is a required operation for *all* PHP versions when PHP Version Manager is running
+     operations, since any installation or upgrade may prompt the installation or upgrade
+     of other PHP versions, in which case the permissions need to set correctly.
+     */
+    public func fixPermissions() async throws {
+        await determineBrokenFormulae()
+
+        if broken.isEmpty {
+            return
+        }
+
+        let appleScript = NSAppleScript(
+            source: "do shell script \"\(buildBrokenFormulaeScript())\" with administrator privileges"
+        )
+
+        let eventResult: NSAppleEventDescriptor? = appleScript?
+            .executeAndReturnError(nil)
+
+        if eventResult == nil {
+            throw HomebrewPermissionError(
+                kind: .applescriptNilError
+            )
+        }
+
+        Log.info("Ownership was taken of the folder(s) at: " + broken
+            .map({ $0.path })
+            .joined(separator: ", "))
+    }
+
+    /**
+     Determines which formulae's permissions are broken.
+
+     To do so, PHP Monitor resolves which directory needs to be checked and verifies
+     whether the Homebrew binary directory for the given PHP version is owned by root.
+     */
+    private func determineBrokenFormulae() async {
+        let formulae = PhpEnvironments.shared.cachedPhpInstallations.keys
+
+        for formula in formulae {
+            let realFormula = formula == PhpEnvironments.brewPhpAlias
+                ? "php"
+                : "php@\(formula)"
+
+            let binFolderOwned = isOwnedByRoot(path: "\(Paths.optPath)/\(realFormula)/bin")
+            let sbinFolderOwned = isOwnedByRoot(path: "\(Paths.optPath)/\(realFormula)/sbin")
+
+            if binFolderOwned || sbinFolderOwned {
+                Log.warn("\(formula) is owned by root")
+
+                if binFolderOwned {
+                    broken.append(DueOwnershipFormula(
+                        formula: realFormula,
+                        path: "\(Paths.optPath)/\(realFormula)/bin"
+                    ))
+                }
+
+                if sbinFolderOwned {
+                    broken.append(DueOwnershipFormula(
+                        formula: realFormula,
+                        path: "\(Paths.optPath)/\(realFormula)/sbin"
+                    ))
+                }
+            }
+        }
+    }
+
+    /**
+     Generates the appropriate AppleScript script required to restore permissions.
+     This script also stops the services prior to taking ownership, which is requirement.
+     */
+    private func buildBrokenFormulaeScript() -> String {
+        return broken
+            .map { b in
+                return """
+                    \(Paths.brew) services stop \(b.formula) \
+                    && chown -R \(Paths.whoami):admin \(b.path)
+                    """
+            }
+            .joined(
+                separator: " && "
+            )
+    }
+
+    /**
+     Checks if the directory at the path is owned by the `root` user,
+     by checking the FS owner account name attribute.
+     */
+    private func isOwnedByRoot(path: String) -> Bool {
+        do {
+            let attributes = try FileManager.default.attributesOfItem(atPath: path)
+            if let owner = attributes[.ownerAccountName] as? String {
+                return owner == "root"
+            }
+        } catch {
+            return true
+        }
+
+        return true
+    }
+
+    struct DueOwnershipFormula {
+        let formula: String
+        let path: String
+    }
+}

phpmon/Domain/Integrations/Homebrew/Brew.swift

@@ -0,0 +1,50 @@
+//
+//  Homebrew.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 17/03/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class Brew {
+    static let shared = Brew()
+
+    /// Formulae that can be observed.
+    var formulae = BrewFormulaeObservable()
+
+    /// The version of Homebrew that was detected.
+    var version: VersionNumber?
+
+    /// Determine which version of Homebrew is installed.
+    public func determineVersion() async {
+        let output = await Shell.pipe("\(Paths.brew) --version")
+        self.version = try? VersionNumber.parse(output.out)
+
+        if let version = version {
+            Log.info("The user has Homebrew \(version.text) installed.")
+
+            if version.major < 4 {
+                Log.warn("Managing PHP versions is only officially supported with Homebrew 4 or newer!")
+            }
+        } else {
+            Log.warn("The Homebrew version could not be determined.")
+        }
+    }
+
+    /// Each formula for each PHP version that can be installed.
+    public static let phpVersionFormulae = [
+        "8.4": "shivammathur/php/php@8.4",
+        "8.3": "php@8.3",
+        "8.2": "php@8.2",
+        "8.1": "php@8.1",
+        "8.0": "shivammathur/php/php@8.0",
+        "7.4": "shivammathur/php/php@7.4",
+        "7.3": "shivammathur/php/php@7.3",
+        "7.2": "shivammathur/php/php@7.2",
+        "7.1": "shivammathur/php/php@7.1",
+        "7.0": "shivammathur/php/php@7.0",
+        "5.6": "shivammathur/php/php@5.6"
+    ]
+}

phpmon/Domain/Integrations/Homebrew/BrewDiagnostics.swift

@@ -1,5 +1,5 @@
 //
-//  AliasConflict.swift
+//  BrewDiagnostics.swift
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 28/11/2021.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-class HomebrewDiagnostics {
+class BrewDiagnostics {
     /**
      Determines the Homebrew taps the user has installed.
      */
@@ -27,6 +27,21 @@ class HomebrewDiagnostics {
             }
     }
 
+    /**
+     Logs a bunch of useful information during startup.
+     */
+    public static func logBootInformation() {
+        Log.info(BrewDiagnostics.customCaskInstalled
+             ? "[BREW] The app has been installed via Homebrew Cask."
+             : "[BREW] The app has been installed directly (optimal)."
+        )
+
+        Log.info(BrewDiagnostics.usesNginxFullFormula
+             ? "[BREW] The app will be using the `nginx-full` formula."
+             : "[BREW] The app will be using the `nginx` formula."
+        )
+    }
+
     /**
      Determines whether the PHP Monitor Cask is installed.
      */
@@ -46,6 +61,43 @@ class HomebrewDiagnostics {
         return destination.contains("/nginx-full/")
     }()
 
+    /**
+     It is possible to have outdated symlinks for PHP installations. This can mean that certain PHP installations
+     are going to be reported incorrectly (e.g. `php@8.2` links to an installation in a `8.3` folder after an upgrade).
+
+     To ensure this does not cause issues, PHP Monitor will automatically remove all incorrect PHP symlinks.
+     */
+    public static func checkForOutdatedPhpInstallationSymlinks() async {
+        // Set up a regular expression
+        let regex = try! NSRegularExpression(pattern: "^php@[0-9]+\\.[0-9]+$", options: .caseInsensitive)
+
+        // Check for incorrect versions
+        if let contents = try? FileSystem.getShallowContentsOfDirectory("\(Paths.optPath)")
+            .filter({
+                let range = NSRange($0.startIndex..., in: $0)
+                return regex.firstMatch(in: $0, options: [], range: range) != nil
+            }) {
+
+            for symlink in contents {
+                let version = symlink.replacingOccurrences(of: "php@", with: "")
+                if let destination = try? FileSystem.getDestinationOfSymlink("\(Paths.optPath)/\(symlink)") {
+                    if !destination.contains("Cellar/php/\(version)")
+                        && !destination.contains("Cellar/php@\(version)") {
+                        Log.err("Symlink for \(symlink) is incorrect. Removing...")
+                        do {
+                            try FileSystem.remove("\(Paths.optPath)/\(symlink)")
+                            Log.info("Incorrect symlink for \(symlink) has been successfully removed.")
+                        } catch {
+                            Log.err("Symlink for \(symlink) was incorrect but could not be removed!")
+                        }
+                    }
+                } else {
+                    Log.warn("Could not read symlink at: \(Paths.optPath)/\(symlink)! Symlink check skipped.")
+                }
+            }
+        }
+    }
+
     /**
      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`).
@@ -63,30 +115,25 @@ class HomebrewDiagnostics {
      It is possible to upgrade PHP, but forget running `valet install`.
      This results in a scenario where a rogue www.conf file exists.
      */
-    public static func checkForPhpFpmPoolConflicts() {
-        Log.info("Checking for PHP-FPM pool conflicts...")
+    public static func checkForValetMisconfiguration() async {
+        Log.info("Checking for PHP-FPM issues with Valet...")
+
+        guard let install = PhpEnvironments.phpInstall else {
+            Log.info("Will skip check for issues if no PHP version is linked.")
+            return
+        }
 
         // We'll need to know what the primary PHP version is
-        let primary = PhpEnv.shared.currentInstall.version.short
+        let primary = install.version.short
 
         // Versions to be handled
         let switcher = InternalSwitcher()
-        var versions = switcher.getVersionsToBeHandled(primary)
 
-        versions = versions.filter { version in
-            return switcher.requiresDisablingOfDefaultPhpFpmPool(version)
-        }
-
-        if versions.isEmpty {
-            Log.info("No PHP-FPM pools need to be fixed. All OK.")
-        }
-
-        versions.forEach { version in
-            Task { // Fix each pool concurrently (but perform the tasks sequentially)
-                await switcher.disableDefaultPhpFpmPool(version)
-                await switcher.stopPhpVersion(version)
-                await switcher.startPhpVersion(version, primary: version == primary)
-            }
+        for version in switcher.getVersionsToBeHandled(primary)
+        where await switcher.ensureValetConfigurationIsValidForPhpVersion(version) {
+            Log.info("One or more fixes were applied for PHP \(version)!")
+            await switcher.unlinkAndStopPhpVersion(version)
+            await switcher.linkAndStartPhpVersion(version, primary: version == primary)
         }
     }
 
@@ -108,13 +155,13 @@ class HomebrewDiagnostics {
                 from: tapAlias.data(using: .utf8)!
             ).first!
 
-            if tapPhp.version != PhpEnv.brewPhpAlias {
+            if 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 bothInstalled = PhpEnv.shared.availablePhpVersions.contains(tapPhp.version)
-                    && PhpEnv.shared.availablePhpVersions.contains(PhpEnv.brewPhpAlias)
+                let bothInstalled = PhpEnvironments.shared.availablePhpVersions.contains(tapPhp.version)
+                    && PhpEnvironments.shared.availablePhpVersions.contains(PhpEnvironments.brewPhpAlias)
 
                 if bothInstalled {
                     Log.warn("Both conflicting aliases seem to be installed, warning the user!")