👌 Save window size and position for site list

- Site name already exists?
- Site name empty?

.github/pull_request_template.md

@@ -0,0 +1,35 @@
+Hello there! Thank you for considering a pull request for PHP Monitor. 
+
+Please read the text below first before you submit your PR.
+
+## Do not PR unless...
+
+In order to make development and maintenance of PHP Monitor easier, I ask that you _avoid_ making a pull request in the following situations:
+
+* No issue has been associated with the changes you‘d like to merge
+* You have not announced you will be addressing a particular issue
+* The PR is a low effort change: e.g. commits that only fix typos or phrasing may not be accepted
+
+(If you believe the phrasing of particular text in the app is unclear or incorrect, please open an issue first.)
+
+In short: It is usually best to *get in touch first* if you are making substantial changes.
+
+## About destination branches
+
+Please keep in mind that `main` is reserved for the current code state of the latest release and should *never* be the destination branch unless a new release is happening. **Merge requests that target `main` will be closed without mercy.**
+
+Usually, the best target is the stable `dev/x.x` branch that corresponds with the latest major version that is released. 
+
+There may be a newer branch available, which is an appropriate place for bigger changes, but please keep in mind that it is usually best to announce you‘ll be working on such a change before you spend the time, since as the lead contributor I might not even want said change in the app. Thank you.
+
+## Your changes
+
+(feel free to remove the disclaimer above)
+
+* Affected parts of the app: shared code / UI code / CLI (remove what does not apply)
+* Estimated impact on performance: none / low / high (remove what does not apply)
+* Made a new build with Xcode and tested this: yes / no (remove what does not apply)
+* Tested on macOS version + architecture: (e.g. "Monterey on M1" or "Big Sur on Intel")
+* References issue(s): (please reference the issue here, using # and the number of the issue)
+
+(please describe what you have changed here)

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

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1320"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C415D3D52770F341005EF286"
+               BuildableName = "phpmon-cli"
+               BlueprintName = "phpmon-cli"
+               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 = "Debug"
+      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 = "C415D3D52770F341005EF286"
+            BuildableName = "phpmon-cli"
+            BlueprintName = "phpmon-cli"
+            ReferencedContainer = "container:PHP Monitor.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "help"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C415D3D52770F341005EF286"
+            BuildableName = "phpmon-cli"
+            BlueprintName = "phpmon-cli"
+            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 = "1220"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

README.md

@@ -1,13 +1,13 @@
 # PHP Monitor
 
-> If this software has been useful to you, all I ask is that you **please star the repository**, so I know that the software is being used.
+> If this software has been useful to you, I ask that you **please star the repository**, that way I know that the software is being used. Also, please consider leaving [a one-time donation](https://nicoverbruggen.be/sponsor) to support the project.
 > You can also send me [feedback](https://twitter.com/nicoverbruggen) if the app came in handy.<br>**Thank you!** ⭐️
 
 <img src="./phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png" alt="phpmon icon" width="128px" />
 
 **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 you need to have it set up before you can use this.
 
-<img src="./docs/screenshot34.png" width="412px" alt="phpmon screenshot (menu bar app)"/>
+<img src="./docs/screenshot41.jpg" width="800px" alt="phpmon screenshot (menu bar app)"/>
 
 <small><i>Screenshot: A menu showing all of the functionality of PHP Monitor.</i></small>
 
@@ -21,16 +21,16 @@ PHP Monitor also gives you quick access to various useful functionality (like ac
 
 PHP Monitor is a universal application that runs on Apple Silicon **and** Intel-based Macs.
 
-* macOS 10.14 Mojave or higher (works on macOS 11 Big Sur and macOS 12 Monterey)
+* macOS 11 Big Sur or higher (supports macOS 12 Monterey)
 * Homebrew is installed in `/usr/local/homebrew` or `/opt/homebrew`
 * The brew formula `php` has to be installed (which version is detected)
-* Laravel Valet 2.13 or higher
+* Laravel Valet 2.16.2 or higher (older versions might be compatible but are not supported)
 
-_You may need to update your Valet installation to keep everything working if a major version update of PHP has been released._
+_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`._
 
 ## 🚀 How to install
 
-You can install via Homebrew, or may download the latest [release](https://github.com/nicoverbruggen/phpmon/releases).
+You can install via Homebrew (recommended), or may download the latest release on GitHub.
 
 To install via Homebrew, run:
 
@@ -111,9 +111,15 @@ If you're on an Apple Silicon-based Mac, you'll need to add:
     # on an M1 Mac
     export PATH=$HOME/bin:/opt/homebrew/bin:$PATH
 
-and add the following to your .zshrc:
+and add the following to your .zshrc, 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
+    export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH
+    export PATH=$HOME/bin:/opt/homebrew/bin:$PATH
 
 Make sure PHP is linked correctly:
 
@@ -231,18 +237,40 @@ PHP Monitor itself doesn't do any network requests. Feel free to check the sourc
 </details>
 
 <details>
-<summary><strong>After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade`!</strong></summary>
+<summary><strong>How do I get various applications to show up in the domain list's right-click menu?</strong></summary>
 
-This is a security feature of Brew. When you start a service as an administrator, the root user becomes the owner of relevant binaries. 
+When you select and right-click on a domain, you can open these directories with various applications. This can help speed up your workflow. However, for these apps to show up, they must be detected first.
 
-You will need to manually clean up those folders yourself using `rm -rf` (or by manually removing those folders via Finder).
+The supported apps are: <i>PhpStorm, Visual Studio Code, Sublime Text, Sublime Merge, iTerm</i>.
+
+All of these apps should just be detected correctly, no matter their location on your system. If you can open it using `open -a "appname"`, the app should be detected and work. If you have renamed the app, there might be an issue getting it detected.
+
+To see which files are checked to determine availability, see [this file](./phpmon/Domain/Helpers/Application.swift).
+
+You can add your own apps by creating and editing a `~/.phpmon.conf.json` file, with the following entry:
+
+<pre>
+{
+    "scan_apps": ["Xcode", "Kraken"]
+}
+</pre>
+
+You can put as many apps as you'd like in the `scan_apps` array, and PHP Monitor will check for the existence of these apps. You do not need to set the full path, just the name of the app should work. Not all apps support opening a folder, though, so your success might vary.
+</details>
+
+<details>
+<summary><strong>After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade` or `brew cleanup`!</strong></summary>
+
+<strike>This is a security feature of Homebrew. When you start a service as an administrator, the root user becomes the owner of relevant binaries. You will need to manually clean up those folders yourself using `rm -rf` (or by manually removing those folders via Finder).</strike>
+
+**Update**: If you are using the Valet switcher (currently not available in the latest stable build) you will not encounter this issue. For more information on this, see [this issue](https://github.com/nicoverbruggen/phpmon/issues/17) and also [this issue about switching to Valet's switcher](https://github.com/nicoverbruggen/phpmon/issues/34).
 
 </details>
 
 <details>
 <summary><strong>The app has crashed!</strong></summary>
 
-Please get in touch and open an issue. PHP Monitor shouldn't crash :)
+Please get in touch and open an issue. PHP Monitor shouldn't crash... (unless you are actually removing PHP *while* the app is running, that’s considered normal behaviour!)
 
 </details>
 
@@ -268,6 +296,7 @@ While I did make this application during my own free time, I have been lucky eno
 * Everyone in the Laravel community who shared the app (thanks!)
 * Various folks who [reached](https://twitter.com/stauffermatt) [out](https://twitter.com/marcelpociot)
 * Everyone who left feedback via issues
+* Everyone who donated to keep the project up and running
 
 Thank you very much for your contributions, kind words and support.
 
@@ -283,22 +312,27 @@ In order to save power, this only happens once every 60 seconds.
 
 This utility will detect which PHP versions you have installed via Homebrew, and then allows you to switch between them.
 
-This means:
+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 much faster than Valet’s switcher.
 
-- You have at least the latest version of PHP installed (`php`)
-- You have installed Laravel Valet (`which valet` returns `/usr/local/bin/valet`)
-- You ran `valet trust`, which means Valet commands can be run without using sudo
+### Config change detection
 
-The utility runs the following commands:
+PHP Monitor watches your filesystem in the relevant `conf.d` directory for the currently linked PHP version. 
 
-- Unlink all detected PHP versions & stop the respective `php@X.X` services
-- Link the desired version of PHP, and start the associated service
+Whenever an .ini file is modified, PHP Monitor will attempt to reload the current information about the active PHP installation. 
+
+If an extension or other process writes to a single file a bunch of times in a short span of time (&lt; 1 sec), PHP Monitor will only reload the active configuration information after a while (with a slight delay).
+
+### Site detection
+
+1. **Location of your sites**: PHP Monitor uses the Valet configuration file to determine which folders to look into. Each folder is scanned and then PHP Monitor will validate if a composer.json file exists to determine the desired PHP version.
+1. **Sites secured or not secured**: Whether the directory has been secured is determined by checking if a matching certificate exists under Valet's `Certificates` directory for that site name.
+1. **Site drivers**: PHP Monitor runs `valet which` to determine which driver is currently in use for each individual site. This command is executed once for each site whenever the site list is refreshed.
+
+*Note*: If you have linked a folder in Documents, Desktop or Downloads you might need to grant PHP Monitor access to those directories for PHP Monitor to work correctly.
 
 ### Want to know more?
 
-If you want to know more about how this works, I recommend you check out the source code. 
-
-This app isn't very complicated after all. In the end, this just (conveniently) executes some shell commands.
+If you want to know more about how this works, I recommend you check out the source code.
 
 ## 🔧 Build instructions
 

SECURITY.md

@@ -2,16 +2,26 @@
 
 ## Supported versions
 
-Generally speaking, only the latest version of **PHP Monitor** is supported:
+Generally speaking, only the latest version of **PHP Monitor** is supported, except during transition periods (for example, when particular system requirements go up):
 
-| Version | Apple silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions |
-| ------- | ------------- | ------------------ | ----- | ----- | ----- |
-| 3.5       | ✅ Universal binary | ✅ | Big Sur (11.0) and Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 |
-| 3.0—3.4     | ✅ Universal binary | ✅ | Big Sur (11.0) | macOS 10.14+ | PHP 5.6—PHP 8.1 |
-| 2.6     | ✅ Universal binary | ❌ | Big Sur (11.0) | macOS 10.14+ | PHP 5.6—PHP 8.0 |
-| 2.5     | ✴️ Universal binary<br/>`/usr/local/homebrew` installations only | ❌ | Big Sur (11.0)<br/>Catalina (10.15) | macOS 10.14+ | not applicable |
-| 2.4     | ✴️ Universal binary<br/>`/usr/local/homebrew` installations only | ❌ | Big Sur (11.0)<br/>Catalina (10.15) | macOS 10.14+ | not applicable |
-| < 2.4   | ❌ Intel binary<br/>`/usr/local/homebrew` installations only | ❌ | Catalina (10.15) | macOS 10.14+ | not applicable |
+| Version | Apple silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Minimum Required Valet Version |
+| ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
+| 5.x       | ✅ Universal binary | ✅ Yes | Big Sur (11.0) and Monterey (12.0) | macOS 11+ | PHP 5.6—PHP 8.2 | TBD |
+
+## Legacy versions
+
+These versions of PHP Monitor are no longer supported, but if you’re using an older computer with an older version of Homebrew, Valet or macOS, you might want to use one of these versions.
+
+| Version | Apple silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Minimum Required Valet Version |
+| ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
+| 4.1       | ✅ Universal binary | ❌ | Big Sur (11.0) and Monterey (12.0) | macOS 11+ | PHP 5.6—PHP 8.2 | 2.16.2 |
+| 4.0       | ✅ Universal binary | ❌ | Big Sur (11.0) and Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 | 2.13 |
+| 3.5       | ✅ Universal binary | ❌ | Big Sur (11.0) and Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 | 2.13 |
+| 3.0—3.4   | ✅ Universal binary | ❌ | Big Sur (11.0) | macOS 10.14+ | PHP 5.6—PHP 8.1 | 2.13 |
+| 2.6       | ✅ Universal binary | ❌ | Big Sur (11.0) | macOS 10.14+ | PHP 5.6—PHP 8.0 | 2.13 |
+| 2.5       | ✴️ Universal binary<br/>`/usr/local/homebrew` installations only | ❌ | Big Sur (11.0)<br/>Catalina (10.15) | macOS 10.14+ | not applicable | not applicable |
+| 2.4       | ✴️ Universal binary<br/>`/usr/local/homebrew` installations only | ❌ | Big Sur (11.0)<br/>Catalina (10.15) | macOS 10.14+ | not applicable | not applicable |
+| < 2.4     | ❌ Intel binary<br/>`/usr/local/homebrew` installations only | ❌ | Catalina (10.15) | macOS 10.14+ | not applicable | not applicable | 
 
 ## Reporting a vulnerability
 

phpmon-cli/AllowedArguments.swift

@@ -0,0 +1,26 @@
+//
+//  AllowedArguments.swift
+//  phpmon-cli
+//
+//  Created by Nico Verbruggen on 20/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+enum AllowedArguments: String, CaseIterable {
+    case use = "use"
+    case performSwitch = "switch"
+    case fix = "fix"
+    case help = "help"
+    
+    static func has(_ string: String) -> Bool {
+        return Self.allCases.contains { arg in
+            return arg.rawValue == string
+        }
+    }
+    
+    static var rawValues: [String] {
+        return Self.allCases.map { $0.rawValue }
+    }
+}

phpmon-cli/main.swift

@@ -0,0 +1,103 @@
+//
+//  main.swift
+//  phpmon-cli
+//
+//  Created by Nico Verbruggen on 20/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+let toolver = "0.1 (early access)"
+
+let log = Log.shared
+log.verbosity = .info
+
+if CommandLine.arguments.contains("-q") || CommandLine.arguments.contains("--quiet") {
+    Log.shared.verbosity = .warning
+}
+if CommandLine.arguments.contains("-p") || CommandLine.arguments.contains("--performance") {
+    Log.shared.verbosity = .performance
+}
+
+var argument = "help"
+if CommandLine.arguments.count > 1 {
+    argument = CommandLine.arguments[1]
+}
+
+if !AllowedArguments.has(argument) {
+    Log.err("The supported arguments are: \(AllowedArguments.rawValues)")
+    exit(1)
+}
+
+let action = AllowedArguments.init(rawValue: argument)
+
+switch action {
+case .use, .performSwitch:
+    if !Shell.fileExists("\(Paths.binPath)/php") {
+        Log.err("PHP is currently not linked. Attempting quick fix...")
+        _ = Shell.user.executeSynchronously("brew link php", requiresPath: true)
+    }
+    
+    let phpenv = PhpEnv.shared
+    PhpEnv.detectPhpVersions()
+    
+    if CommandLine.arguments.count < 3 {
+        Log.err("You must enter at least two additional arguments when using this command.")
+        exit(1)
+    }
+    
+    let version = CommandLine.arguments[2].replacingOccurrences(of: "php@", with: "")
+    if phpenv.availablePhpVersions.contains(version) {
+        Log.info("Switching to PHP \(version)...")
+        Actions.switchToPhpVersion(
+            version: version,
+            availableVersions: phpenv.availablePhpVersions,
+            completed: {
+                Log.info("The switch has been completed.")
+                exit(0)
+            }
+        )
+    } else {
+        Log.err("A PHP installation with version \(version) is not installed.")
+        Log.err("The installed versions are: \(phpenv.availablePhpVersions.joined(separator: ", ")).")
+        Log.err("If this version is available, you may be able to install it by using `brew install php@\(version)`.")
+        exit(1)
+    }
+case .fix:
+    Log.info("Fixing your PHP installation...")
+    Actions.fixMyPhp()
+    Log.info("All operations completed. You can check which version of PHP is linked by using `php -v`.")
+    exit(0)
+case .help:
+    print("""
+    ===============================================================
+    PHP MONITOR CLI \(toolver)
+    by Nico Verbruggen
+    ===============================================================
+    
+    Gives access to the quick version switcher from PHP Monitor,
+    but without the GUI and 100% of the speed!
+    
+    SUPPORTED COMMANDS
+    
+    * use {version}:      Switch to a specific version of PHP.
+                          (e.g. `phpmon-cli use 8.0`)
+    * switch {version}:   Alias for the `use` command.
+    * fix                 Attempts to unlink all PHP versions,
+                          and link the latest version of PHP.
+    * help:               Show this help.
+    
+    SUPPORTED FLAGS
+    
+    * `-q / --quiet`:     Silences all logs except for warnings and exceptions.
+    * `-p / --perf`:      Enables performance mode.
+    
+    """)
+    exit(0)
+case .none:
+    Log.err("Action not recognized!")
+    exit(1)
+}
+
+RunLoop.main.run()

phpmon-common/Core/Actions.swift

@@ -0,0 +1,121 @@
+//
+//  Services.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import AppKit
+
+class Actions {
+    
+    // MARK: - Services
+    
+    public static func restartPhpFpm()
+    {
+        brew("services restart \(PhpEnv.phpInstall.formula)", sudo: true)
+    }
+    
+    public static func restartNginx()
+    {
+        brew("services restart nginx", sudo: true)
+    }
+    
+    public static func restartDnsMasq()
+    {
+        brew("services restart dnsmasq", sudo: true)
+    }
+    
+    public static func stopAllServices()
+    {
+        brew("services stop \(PhpEnv.phpInstall.formula)", sudo: true)
+        brew("services stop nginx", sudo: true)
+        brew("services stop dnsmasq", sudo: true)
+    }
+    
+    /**
+     Kindly asks Valet to switch to a specific PHP version.
+     */
+    public static func switchToPhpVersionUsingValet(
+        version: String,
+        availableVersions: [String],
+        completed: @escaping () -> Void
+    ) {
+        Log.info("Switching to \(version) using Valet")
+        Log.info(valet("use php@\(version)"))
+        completed()
+    }
+    
+    // MARK: - Finding Config Files
+    
+    public static func openGenericPhpConfigFolder()
+    {
+        let files = [NSURL(fileURLWithPath: "\(Paths.etcPath)/php")];
+        NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
+    }
+    
+    public static func openGlobalComposerFolder()
+    {
+        let file = FileManager.default.homeDirectoryForCurrentUser
+            .appendingPathComponent(".composer/composer.json")
+        NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
+    }
+    
+    public static func openPhpConfigFolder(version: String)
+    {
+        let files = [NSURL(fileURLWithPath: "\(Paths.etcPath)/php/\(version)/php.ini")];
+        NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
+    }
+    
+    public static func openValetConfigFolder()
+    {
+        let file = FileManager.default.homeDirectoryForCurrentUser
+            .appendingPathComponent(".config/valet")
+        NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
+    }
+
+    // MARK: - Other Actions
+    
+    public static func createTempPhpInfoFile() -> URL
+    {
+        // Write a file called `phpmon_phpinfo.php` to /tmp
+        try! "<?php phpinfo();".write(toFile: "/tmp/phpmon_phpinfo.php", atomically: true, encoding: .utf8)
+        
+        // Tell php-cgi to run the PHP and output as an .html file
+        Shell.run("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
+        
+        return URL(string: "file:///private/tmp/phpmon_phpinfo.html")!
+    }
+    
+    // MARK: - Quick Fix
+    
+    /**
+     Detects all currently available PHP versions,
+     and unlinks each and every one of them.
+     
+     After this, the brew services are also stopped,
+     the latest PHP version is linked, and php + nginx are restarted.
+     
+     If this does not solve the issue, the user may need to install additional
+     extensions and/or run `composer global update`.
+     */
+    public static func fixMyPhp()
+    {
+        brew("services restart dnsmasq", sudo: true)
+        
+        PhpEnv.shared.detectPhpVersions().forEach { (version) in
+            let formula = (version == PhpEnv.brewPhpVersion) ? "php" : "php@\(version)"
+            brew("unlink php@\(version)")
+            brew("services stop \(formula)")
+            brew("services stop \(formula)", sudo: true)
+        }
+        
+        brew("services stop php")
+        brew("services stop nginx")
+        brew("link php")
+        brew("services restart dnsmasq", sudo: true)
+        brew("services stop php", sudo: true)
+        brew("services stop nginx", sudo: true)
+    }
+}

phpmon-common/Core/Command.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class Command {
+public class Command {
     
     /**
      Immediately executes a command.

phpmon-common/Core/Constants.swift

@@ -15,6 +15,16 @@ class Constants {
      */
     static let LatestStablePhpVersion = "8.1"
     
+    /**
+     The minimum version of Valet that is recommended.
+     If the installed version is older, a notification will be shown
+     every time the app launches (with a recommendation to upgrade).
+     
+     The minimum requirement is currently synced to PHP 8.1 compatibility.
+     See also: https://github.com/laravel/valet/releases/tag/v2.16.2
+     */
+    static let MinimumRecommendedValetVersion = "2.16.2"
+    
     /**
      * The PHP versions supported by this application.
      * Versions that do not appear in this array are omitted from the list.
@@ -40,7 +50,5 @@ class Constants {
         // dev release. In this case, that means that the version below is detected.
         "8.2"
     ]
-    
 
-    
 }

phpmon-common/Core/Events.swift

@@ -0,0 +1,15 @@
+//
+//  Events.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 23/01/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class Events {
+    
+    static let ServicesUpdated = Notification.Name("ServicesUpdated")
+    
+}

phpmon-common/Core/Helpers.swift

@@ -0,0 +1,55 @@
+//
+//  Helpers.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 24/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+// MARK: Common Shell Commands
+
+/**
+ Runs a `valet` command.
+ */
+func valet(_ command: String) -> String
+{
+    return Shell.pipe("sudo \(Paths.valet) \(command)", requiresPath: true)
+}
+
+/**
+ Runs a `brew` command. Can run as superuser.
+ */
+func brew(_ command: String, sudo: Bool = false)
+{
+    Shell.run("\(sudo ? "sudo " : "")" + "\(Paths.brew) \(command)")
+}
+
+/**
+ Runs `sed` in order to replace all occurrences of a string in a specific file with another.
+ */
+func sed(file: String, original: String, replacement: String)
+{
+    // Escape slashes (or `sed` won't work)
+    let e_original = original.replacingOccurrences(of: "/", with: "\\/")
+    let e_replacement = replacement.replacingOccurrences(of: "/", with: "\\/")
+    
+    // Check if gsed exists; it is able to follow symlinks,
+    // which we want to do to toggle the extension
+    if Shell.fileExists("\(Paths.binPath)/gsed") {
+        Shell.run("\(Paths.binPath)/gsed -i --follow-symlinks 's/\(e_original)/\(e_replacement)/g' \(file)")
+    } else {
+        Shell.run("sed -i '' 's/\(e_original)/\(e_replacement)/g' \(file)")
+    }
+}
+
+/**
+ Uses `grep` to determine whether a particular query string can be found in a particular file.
+ */
+func grepContains(file: String, query: String) -> Bool
+{
+    return Shell.pipe("""
+            grep -q '\(query)' \(file); [ $? -eq 0 ] && echo "YES" || echo "NO"
+            """)
+        .trimmingCharacters(in: .whitespacesAndNewlines)
+        .contains("YES")
+}

phpmon-common/Core/Logger.swift

@@ -0,0 +1,52 @@
+//
+//  Logger.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 21/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class Log {
+    
+    static var shared = Log()
+    
+    enum Verbosity: Int {
+        case error = 1,
+             warning = 2,
+             info = 3,
+             performance = 4
+        
+        public func isApplicable() -> Bool {
+            return Log.shared.verbosity.rawValue >= self.rawValue
+        }
+    }
+    
+    var verbosity: Verbosity = .warning
+    
+    static func err(_ item: Any) {
+        if Verbosity.error.isApplicable() {
+            print(item)
+        }
+    }
+    
+    static func warn(_ item: Any) {
+        if Verbosity.warning.isApplicable() {
+            print(item)
+        }
+    }
+    
+    static func info(_ item: Any) {
+        if Verbosity.info.isApplicable() {
+            print(item)
+        }
+    }
+    
+    static func perf(_ item: Any) {
+        if Verbosity.performance.isApplicable() {
+            print(item)
+        }
+    }
+    
+}

phpmon-common/Core/Paths.swift

@@ -0,0 +1,67 @@
+//
+//  Paths.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+/**
+ The `Paths` class is used to locate various binaries on the system,
+ and provides a full
+ */
+public class Paths {
+    
+    public static let shared = Paths()
+    
+    private var baseDir : Paths.HomebrewDir
+    
+    init() {
+        baseDir = Shell.fileExists("\(HomebrewDir.opt.rawValue)/bin/brew") ? .opt : .usr
+    }
+    
+    // - MARK: Binaries
+    
+    public static var valet: String {
+        return "\(binPath)/valet"
+    }
+    
+    public static var brew: String {
+        return "\(binPath)/brew"
+    }
+    
+    public static var php: String {
+        return "\(binPath)/php"
+    }
+    
+    public static var phpConfig: String {
+        return "\(binPath)/php-config"
+    }
+    
+    // - MARK: Paths
+    
+    public static var whoami: String {
+        return String(Shell.pipe("whoami").split(separator: "\n")[0])
+    }
+    
+    public static var binPath: String {
+        return "\(shared.baseDir.rawValue)/bin"
+    }
+    
+    public static var optPath: String {
+        return "\(shared.baseDir.rawValue)/opt"
+    }
+    
+    public static var etcPath: String {
+        return "\(shared.baseDir.rawValue)/etc"
+    }
+    
+    // MARK: - Enum
+    
+    public enum HomebrewDir: String {
+        case opt = "/opt/homebrew"
+        case usr = "/usr/local"
+    }
+    
+}

phpmon-common/Core/Shell.swift

@@ -0,0 +1,180 @@
+//
+//  Shell.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+public class Shell {
+    
+    // MARK: - Invoke static functions
+    
+    public static func run(
+        _ command: String,
+        requiresPath: Bool = false
+    ) {
+        Shell.user.run(command, requiresPath: requiresPath)
+    }
+    
+    public static func pipe(
+        _ command: String,
+        requiresPath: Bool = false
+    ) -> String {
+        return Shell.user.pipe(command, requiresPath: requiresPath)
+    }
+    
+    // MARK: - Singleton
+    
+    /**
+     We now require macOS 11, so no need to detect which terminal to use.
+     */
+    public var shell: String = "/bin/sh"
+    
+    /**
+     Singleton to access a user shell (with --login)
+     */
+    public static let user = Shell()
+    
+    /**
+     Runs a shell command without using the output.
+     Uses the default shell.
+     
+     - Parameter command: The command to run
+     - Parameter requiresPath: By default, the PATH is not resolved but some binaries might require this
+     */
+    private func run(
+        _ command: String,
+        requiresPath: Bool = false
+    ) {
+        // Equivalent of piping to /dev/null; don't do anything with the string
+        _ = Shell.pipe(command, requiresPath: requiresPath)
+    }
+    
+    /**
+     Runs a shell command and returns the output.
+     
+     - Parameter command: The command to run
+     - Parameter requiresPath: By default, the PATH is not resolved but some binaries might require this
+     */
+    private func pipe(
+        _ command: String,
+        requiresPath: Bool = false
+    ) -> String {
+        let shellOutput = self.executeSynchronously(command, requiresPath: requiresPath)
+        let hasError = (
+            shellOutput.standardOutput == ""
+            && shellOutput.errorOutput.lengthOfBytes(using: .utf8) > 0
+        )
+        return !hasError ? shellOutput.standardOutput : shellOutput.errorOutput
+    }
+    
+    /**
+     Runs the command and returns a `ShellOutput` object, which contains info about the process.
+     
+     - Parameter command: The command to run
+     - Parameter requiresPath: By default, the PATH is not resolved but some binaries might require this
+     - Parameter waitUntilExit: Waits for the command to complete before returning the `ShellOutput`
+     */
+    public func executeSynchronously(
+        _ command: String,
+        requiresPath: Bool = false
+    ) -> Shell.Output {
+        
+        let outputPipe = Pipe()
+        let errorPipe = Pipe()
+        
+        let task = self.createTask(for: command, requiresPath: requiresPath)
+        task.standardOutput = outputPipe
+        task.standardError = errorPipe
+        task.launch()
+        task.waitUntilExit()
+    
+        return Shell.Output(
+            standardOutput: String(
+                data: outputPipe.fileHandleForReading.readDataToEndOfFile(),
+                encoding: .utf8
+            )!,
+            errorOutput: String(
+                data: errorPipe.fileHandleForReading.readDataToEndOfFile(),
+                encoding: .utf8
+            )!,
+            task: task
+        )
+    }
+    
+    /**
+     Checks if a file exists at the provided path.
+     Uses `/bin/echo` instead of the `builtin` (which does not support `-n`).
+     */
+    public static func fileExists(_ path: String) -> Bool {
+        let escapedPath = path.replacingOccurrences(of: " ", with: "\\ ")
+        return Shell.pipe("if [ -f \(escapedPath) ]; then /bin/echo -n \"0\"; fi") == "0"
+    }
+    
+    /**
+     Creates a new process with the correct PATH and shell.
+     */
+    public func createTask(for command: String, requiresPath: Bool) -> Process {
+        let tailoredCommand = requiresPath
+        ? "export PATH=\(Paths.binPath):$PATH && \(command)"
+        : command
+        
+        let task = Process()
+        task.launchPath = self.shell
+        task.arguments = ["--login", "-c", tailoredCommand]
+        
+        return task
+    }
+    
+    public static func captureOutput(
+        _ task: Process,
+        didReceiveStdOutData: @escaping (String) -> Void,
+        didReceiveStdErrData: @escaping (String) -> Void
+    ) {
+        let outputPipe = Pipe()
+        let errorPipe = Pipe()
+        
+        task.standardOutput = outputPipe
+        task.standardError = errorPipe
+        
+        [(outputPipe, didReceiveStdOutData), (errorPipe, didReceiveStdErrData)].forEach {
+            (pipe: Pipe, callback: @escaping (String) -> Void) in
+            pipe.fileHandleForReading.waitForDataInBackgroundAndNotify()
+            NotificationCenter.default.addObserver(
+                forName: NSNotification.Name.NSFileHandleDataAvailable,
+                object: pipe.fileHandleForReading,
+                queue: nil
+            ) { notification in
+                if let outputString = String(data: pipe.fileHandleForReading.availableData, encoding: String.Encoding.utf8) {
+                    callback(outputString)
+                }
+                pipe.fileHandleForReading.waitForDataInBackgroundAndNotify()
+            }
+        }
+    }
+    
+    public static func haltCapturingOutput(_ task: Process) {
+        if let pipe = task.standardOutput as? Pipe {
+            NotificationCenter.default.removeObserver(pipe.fileHandleForReading)
+        }
+        if let pipe = task.standardError as? Pipe {
+            NotificationCenter.default.removeObserver(pipe.fileHandleForReading)
+        }
+    }
+    
+    public class Output {
+        public let standardOutput: String
+        public let errorOutput: String
+        public let task: Process
+        
+        init(standardOutput: String,
+             errorOutput: String,
+             task: Process) {
+            self.standardOutput = standardOutput
+            self.errorOutput = errorOutput
+            self.task = task
+        }
+    }
+}

phpmon-common/PHP/ActivePhpInstallation.swift

@@ -1,5 +1,5 @@
 //
-//  PhpInstallation.swift
+//  ActivePhpInstallation.swift
 //  PHP Monitor
 //
 //  Copyright © 2021 Nico Verbruggen. All rights reserved.
@@ -13,29 +13,30 @@ import Foundation
  When initialized, that version's .ini files are also scanned (for active or inactive extensions).
  Integrity checks can be performed to determine whether PHP-FPM is configured correctly.
  
- - Note: Each installation has a separate version number. Using `version.short` is advisable if you want to interact with Homebrew.
+ - Note: Each installation has a separate version number.
+ Using `version.short` is advisable if you want to interact with Homebrew.
  */
-class PhpInstallation {
+class ActivePhpInstallation {
 
     var version: Version!
-    var configuration: Configuration!
+    var limits: Limits!
     var extensions: [PhpExtension]!
     
     // MARK: - Computed
     
     var formula: String {
-        return (version.short == App.shared.brewPhpVersion) ? "php" : "php@\(version.short)"
+        return (version.short == PhpEnv.brewPhpVersion) ? "php" : "php@\(version.short)"
     }
     
     // MARK: - Initializer
 
     init() {
         // Show information about the current version
-        self.getVersion()
+        getVersion()
         
         // If an error occurred, exit early
         if (version.error) {
-            configuration = Configuration()
+            limits = Limits()
             extensions = []
             return
         }
@@ -45,10 +46,10 @@ class PhpInstallation {
         extensions = PhpExtension.load(from: path)
         
         // Get configuration values
-        configuration = Configuration(
-            memory_limit: self.getByteCount(key: "memory_limit"),
-            upload_max_filesize: self.getByteCount(key: "upload_max_filesize"),
-            post_max_size: self.getByteCount(key: "post_max_size")
+        limits = Limits(
+            memory_limit: getByteCount(key: "memory_limit"),
+            upload_max_filesize: getByteCount(key: "upload_max_filesize"),
+            post_max_size: getByteCount(key: "post_max_size")
         )
         
         // Return a list of .ini files parsed after php.ini
@@ -59,9 +60,9 @@ class PhpInstallation {
         
         // See if any extensions are present in said .ini files
         paths.forEach { (iniFilePath) in
-            let extensions = PhpExtension.load(from: URL(fileURLWithPath: iniFilePath))
-            if extensions.count > 0 {
-                self.extensions.append(contentsOf: extensions)
+            let exts = PhpExtension.load(from: URL(fileURLWithPath: iniFilePath))
+            if exts.count > 0 {
+                extensions.append(contentsOf: exts)
             }
         }
     }
@@ -100,8 +101,10 @@ class PhpInstallation {
      * 10000: an integer = amount of bytes
      * 1K, 1M, 1G = shorthand for kilobytes, megabytes and gigabytes
      
-     If none of these notations are used, the _fallback_ value is used. We'll show an emoji to indicate something has gone wrong here.
-     To clarify, B gets appended to valid values. As a result, "5M" (valid) becomes "5MB", and "5MB" (invalid) becomes ⚠️.
+     If none of these notations are used, the _fallback_ value is used.
+     We'll show an emoji to indicate something has gone wrong here.
+     To clarify, B gets appended to valid values.
+     As a result, "5M" (valid) becomes "5MB", and "5MB" (invalid) becomes ⚠️.
      
      - Parameter key: The key of the `ini` value that needs to be retrieved. For example, you can use `memory_limit`.
      */
@@ -119,25 +122,6 @@ class PhpInstallation {
         return (match == nil) ? "⚠️" : "\(value)B"
     }
     
-    /**
-     It is always possible that the system configuration for PHP-FPM has not been set up for Valet.
-     This can occur when a user manually installs a new PHP version, but does not run `valet install`.
-     In that case, we should alert the user!
-     
-     - Important: The underlying check is `checkPhpFpmStatus`, which can be run multiple times.
-     This method actively presents a modal if said checks fails, so don't call this method too many times.
-     */
-    public func notifyAboutBrokenPhpFpm() {
-        if !self.checkPhpFpmStatus() {
-            DispatchQueue.main.async {
-                Alert.notify(
-                    message: "alert.php_fpm_broken.title".localized,
-                    info: "alert.php_fpm_broken.info".localized
-                )
-            }
-        }
-    }
-    
     /**
      Determine if PHP-FPM is configured correctly.
      
@@ -145,7 +129,7 @@ class PhpInstallation {
      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.
      */
-    private func checkPhpFpmStatus() -> Bool {
+    func checkPhpFpmStatus() -> 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"
@@ -157,14 +141,24 @@ class PhpInstallation {
     }
     
     // MARK: - Structs
-    
+
+    /**
+     Struct containing information about the version number of the current PHP installation.
+     Also includes information about whether the install is considered "broken" or not.
+     If an error was found in the terminal output, `error` is set to `true` and the installation
+     can be considered broken. (The app will display this as well.)
+     */
     struct Version {
         var short = "???"
         var long = "???"
         var error = false
     }
     
-    struct Configuration {
+    /**
+     Struct containing information about the limits of the current PHP installation.
+     Includes: memory limit, max upload size and max post size.
+     */
+    struct Limits {
         var memory_limit = "???"
         var upload_max_filesize = "???"
         var post_max_size = "???"

phpmon-common/PHP/Homebrew/HomebrewPackage.swift

@@ -0,0 +1,30 @@
+//
+//  HomebrewPackage.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+struct HomebrewPackage: Decodable {
+    
+    let name: String
+    let full_name: String
+    let aliases: [String]
+    let installed: [HomebrewInstalled]
+    let linked_keg: String?
+    
+    public var version: String {
+        return aliases.first!
+            .replacingOccurrences(of: "php@", with: "")
+    }
+    
+}
+
+struct HomebrewInstalled: Decodable {
+    let version: String
+    let built_as_bottle: Bool
+    let installed_as_dependency: Bool
+    let installed_on_request: Bool
+}

phpmon-common/PHP/Homebrew/HomebrewService.swift

@@ -0,0 +1,21 @@
+//
+//  HomebrewService.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 11/01/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+struct HomebrewService: Decodable, Equatable {
+    let name: String
+    let service_name: String
+    let running: Bool
+    let loaded: Bool
+    let pid: Int?
+    let user: String?
+    let status: String?
+    let log_path: String?
+    let error_log_path: String?
+}

phpmon-common/PHP/PHP Version/PhpEnv.swift

@@ -0,0 +1,158 @@
+//
+//  PhpSwitcher.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 21/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+protocol PhpSwitcherDelegate: AnyObject {
+    func switcherDidStartSwitching()
+    func switcherDidCompleteSwitch()
+}
+
+class PhpEnv {
+    
+    // MARK: - Initializer
+    
+    init() {
+        self.currentInstall = ActivePhpInstallation()
+        
+        let brewPhpAlias = Shell.pipe("\(Paths.brew) info php --json");
+        
+        self.homebrewPackage = try! JSONDecoder().decode(
+            [HomebrewPackage].self,
+            from: brewPhpAlias.data(using: .utf8)!
+        ).first!
+        
+        Log.info("When on your system, the `php` formula means version \(homebrewPackage.version)!")
+    }
+    
+    // MARK: - Properties
+    
+    /** The delegate that is informed of updates. */
+    weak var delegate: PhpSwitcherDelegate?
+
+    /** The static app instance. Accessible at any time. */
+    static let shared = PhpEnv()
+    
+    /** Whether the switcher is busy performing any actions. */
+    var isBusy: Bool = false
+    
+    /** All available versions of PHP. */
+    var availablePhpVersions: [String] = []
+    
+    /** Cached information about the PHP installations. */
+    var cachedPhpInstallations: [String: PhpInstallation] = [:]
+    
+    /** Information about the currently linked PHP installation. */
+    var currentInstall: ActivePhpInstallation
+    
+    /**
+     The version that the `php` formula via Brew is aliased to on the current system.
+     
+     If you're up to date, `php` will be aliased to the latest version,
+     but that might not be the case since not everyone keeps their
+     software up-to-date.
+     
+     As such, we take that information from Homebrew.
+     */
+    static var brewPhpVersion: String {
+        return Self.shared.homebrewPackage.version
+    }
+    
+    /**
+     The currently linked and active PHP installation.
+     */
+    static var phpInstall: ActivePhpInstallation {
+        return Self.shared.currentInstall
+    }
+    
+    /**
+     Information we were able to discern from the Homebrew info command.
+     */
+    var homebrewPackage: HomebrewPackage! = nil
+    
+    // MARK: - Methods
+    
+    public static var switcher: PhpSwitcher {
+        return InternalSwitcher()
+    }
+    
+    public static func detectPhpVersions() -> Void {
+        _ = Self.shared.detectPhpVersions()
+    }
+    
+    /**
+     Detects which versions of PHP are installed.
+     */
+    public func detectPhpVersions() -> [String]
+    {
+        let files = Shell.pipe("ls \(Paths.optPath) | grep php@")
+        
+        var versionsOnly = extractPhpVersions(from: files.components(separatedBy: "\n"))
+        
+        // Make sure the aliased version is detected
+        // The user may have `php` installed, but not e.g. `php@8.0`
+        // We should also detect that as a version that is installed
+        let phpAlias = homebrewPackage.version
+        
+        // Avoid inserting a duplicate
+        if (!versionsOnly.contains(phpAlias) && Shell.fileExists("\(Paths.optPath)/php/bin/php")) {
+            versionsOnly.append(phpAlias)
+        }
+        
+        Log.info("The PHP versions that were detected are: \(versionsOnly)")
+        
+        availablePhpVersions = versionsOnly
+        
+        var mappedVersions: [String: PhpInstallation] = [:]
+        
+        availablePhpVersions.forEach { version in
+            mappedVersions[version] = PhpInstallation(version)
+        }
+        
+        cachedPhpInstallations = mappedVersions
+        
+        return versionsOnly
+    }
+    
+    /**
+     Extracts valid PHP versions from an array of strings.
+     This array of strings is usually retrieved from `grep`.
+     */
+    public func extractPhpVersions(
+        from versions: [String],
+        checkBinaries: Bool = true
+    ) -> [String] {
+        var output : [String] = []
+        
+        versions.filter { (version) -> Bool in
+            // Omit everything that doesn't start with php@
+            // (e.g. something-php@8.0 won't be detected)
+            return version.starts(with: "php@")
+        }.forEach { (string) in
+            let version = string.components(separatedBy: "php@")[1]
+            // Only append the version if it doesn't already exist (avoid dupes),
+            // is supported and where the binary exists (avoids broken installs)
+            if !output.contains(version)
+                && Constants.SupportedPhpVersions.contains(version)
+                && (checkBinaries ? Shell.fileExists("\(Paths.optPath)/php@\(version)/bin/php") : true)
+            {
+                output.append(version)
+            }
+        }
+        
+        return output
+    }
+    
+    public func validVersions(for constraint: String) -> [PhpVersionNumber] {
+        constraint.split(separator: "|").flatMap {
+            return PhpVersionNumberCollection
+                .make(from: self.availablePhpVersions)
+                .matching(constraint: $0.trimmingCharacters(in: .whitespacesAndNewlines))
+        }
+    }
+}

phpmon-common/PHP/PHP Version/PhpVersionNumber.swift

@@ -0,0 +1,141 @@
+//
+//  PhpVersionNumber.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 23/01/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+public struct PhpVersionNumberCollection: Equatable {
+    let versions: [PhpVersionNumber]
+    
+    public static func make(from versions: [String]) -> Self {
+        return PhpVersionNumberCollection(
+            versions: versions.map { PhpVersionNumber.make(from: $0)! }
+        )
+    }
+    
+    public var first: PhpVersionNumber? {
+        return self.versions.first
+    }
+    
+    public var all: [PhpVersionNumber] {
+        return self.versions
+    }
+    
+    /**
+     Checks if any versions of PHP are valid for the constraint provided.
+     Due to the complexity of evaluating these, a important test is maintained.
+     More information on these constraints can be found here:
+     https://getcomposer.org/doc/articles/versions.md#writing-version-constraints
+     
+     - Parameter constraint: The full constraint as a string (e.g. "^7.0")
+     - Parameter strict: Whether the minor version check is strict. See more below.
+     
+     The strict mode does not matter if a patch version is provided for all versions in the collection.
+     
+     Strict mode assumes that any PHP version lacking precise patch information, e.g. inferred
+     from Homebrew corresponds to the .0 patch version of that version. The default, which is imprecise,
+     assumes that the patch version is .999, which means that in all cases the patch version check is
+     always going to pass.
+     
+     **STRICT MODE (= patch precision on)**
+     
+     Given versions 8.0.? and 8.1.?, but the requirement is ^8.0.1, in strict mode only 8.1.? will
+     be considered valid (8.0 translates to 8.0.0 and as such is older than 8.0.1, 8.1.0 is OK).
+     When checking against actual PHP versions installed by the user, use strict mode.
+     
+     **NON-STRICT MODE (= patch precision off)**
+     
+     Given versions 8.0.? and 8.1.?, but the requirement is ^8.0.1, in non-strict mode version 8.0
+     is assumed to be equal to version 8.0.999, which is actually fine if 8.0.1 is the required version.
+     In non-strict mode, the patch version is ignored for regular version checks (no caret / tilde).
+     If checking compatibility with general Homebrew versions of PHP, do NOT use strict mode, since
+     the patch version there is not used. (The formula php@8.0 suffices for ^8.0.1.)
+     */
+    public func matching(constraint: String, strict: Bool = false) -> [PhpVersionNumber] {
+        if let version = PhpVersionNumber.make(from: constraint, type: .versionOnly) {
+            // Strict constraint (e.g. "7.0") -> returns specific version
+            return self.versions.filter {
+                $0.major == version.major
+                && $0.minor == version.minor
+                && (strict ? $0.patch(strict, version) == version.patch(strict) : true)
+            }
+        }
+        
+        if let version = PhpVersionNumber.make(from: constraint, type: .caretVersionRange) {
+            // Caret range means that the major version is never higher but minor version can be higher
+            // ^7.2 will be compatible with all versions between 7.2 and 8.0
+            return self.versions.filter {
+                $0.major == version.major &&
+                (
+                    // Either the minor version is the same and the patch is higher or equal
+                    $0.minor == version.minor && $0.patch(strict) >= version.patch(strict, $0)
+                    // or the minor version number has been bumped
+                    || $0.minor > version.minor
+                )
+            }
+        }
+        
+        if let version = PhpVersionNumber.make(from: constraint, type: .tildeVersionRange) {
+            // Tilde range means that most specific digit is used as the basis.
+            if version.patch != nil {
+                // If a patch is provided then the minor version cannot be bumped.
+                return self.versions.filter {
+                    $0.major == version.major && $0.minor == version.minor
+                    && $0.patch(strict, version) >= version.patch!
+                }
+            } else {
+                // If a patch is not provided then the major version cannot be bumped.
+                return self.versions.filter {
+                    $0.major == version.major && $0.minor >= version.minor
+                }
+            }
+        }
+        
+        return []
+    }
+}
+
+public struct PhpVersionNumber: Equatable {
+    let major: Int
+    let minor: Int
+    let patch: Int?
+    
+    public func patch(_ strictFallback: Bool, _ constraint: PhpVersionNumber? = nil) -> Int {
+        return patch ?? (strictFallback ? 0 : constraint?.patch ?? 999)
+    }
+    
+    public var homebrewVersion: String {
+        return "\(major).\(minor)"
+    }
+    
+    public enum MatchType: String {
+        case versionOnly = #"^(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
+        case caretVersionRange = #"^\^(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
+        case tildeVersionRange = #"^~(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
+    }
+    
+    public static func make(from versionString: String, type: MatchType = .versionOnly) -> Self? {
+        let regex = try! NSRegularExpression(pattern: type.rawValue, options: [])
+        let match = regex.matches(in: versionString, options: [], range: NSMakeRange(0, versionString.count)).first
+        
+        if match != nil {
+            let major = Int(
+                versionString[Range(match!.range(withName: "major"), in: versionString)!]
+            )!
+            let minor = Int(
+                versionString[Range(match!.range(withName: "minor"), in: versionString)!]
+            )!
+            var patch: Int? = nil
+            if let minorRange = Range(match!.range(withName: "patch"), in: versionString) {
+                patch = Int(versionString[minorRange])
+            }
+            return Self(major: major, minor: minor, patch: patch)
+        }
+        
+        return nil
+    }
+}

phpmon-common/PHP/PhpExtension.swift

@@ -78,7 +78,7 @@ class PhpExtension {
             // ENABLED: Line where the comment delimiter (;) is removed
             : line.replacingOccurrences(of: "; ", with: "")
         
-        Actions.sed(file: file, original: line, replacement: newLine)
+        sed(file: file, original: line, replacement: newLine)
         
         enabled.toggle()
     }
@@ -92,7 +92,7 @@ class PhpExtension {
         let file = try? String(contentsOf: path, encoding: .utf8)
         
         if (file == nil) {
-            print("There was an issue reading the file. Assuming no extensions were found.")
+            Log.err("There was an issue reading the file. Assuming no extensions were found.")
             return []
         }
         

phpmon-common/PHP/PhpInstallation.swift

@@ -0,0 +1,36 @@
+//
+//  PhpInstallation.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 28/11/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class PhpInstallation {
+    
+    var longVersion: PhpVersionNumber
+    
+    /**
+     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"
+        self.longVersion = PhpVersionNumber.make(from: version)!
+        
+        if Shell.fileExists(phpConfigExecutablePath) {
+            let longVersionString = Command.execute(
+                path: phpConfigExecutablePath,
+                arguments: ["--version"]
+            ).trimmingCharacters(in: .whitespacesAndNewlines)
+            
+            self.longVersion = PhpVersionNumber.make(
+                from: String(longVersionString.split(separator: "-")[0])
+            )!
+        }
+    }
+    
+}

phpmon-common/PHP/Switcher/InternalSwitcher.swift

@@ -0,0 +1,58 @@
+//
+//  InternalSwitcher.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 24/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class InternalSwitcher: PhpSwitcher {
+    
+    /**
+     Switching to a new PHP version involves:
+     - unlinking the current version
+     - stopping the active services
+     - linking the new desired version
+     
+     Please note that depending on which version is installed,
+     the version that is switched to may or may not be identical to `php`
+     (without @version).
+     */
+    func performSwitch(to version: String, completion: @escaping () -> Void)
+    {
+        Log.info("Switching to \(version), unlinking all versions...")
+        
+        let group = DispatchGroup()
+        
+        PhpEnv.shared.availablePhpVersions.forEach { (available) in
+            group.enter()
+            
+            DispatchQueue.global(qos: .userInitiated).async {
+                let formula = (available == PhpEnv.brewPhpVersion)
+                ? "php" : "php@\(available)"
+                
+                brew("unlink \(formula)")
+                brew("services stop \(formula)", sudo: true)
+                
+                Log.perf("Unlinked and stopped services for \(formula)")
+                
+                group.leave()
+            }
+        }
+        
+        group.notify(queue: .global(qos: .userInitiated)) {
+            Log.info("All versions have been unlinked!")
+            Log.info("Linking the new version!")
+            
+            let formula = (version == PhpEnv.brewPhpVersion) ? "php" : "php@\(version)"
+            brew("link \(formula) --overwrite --force")
+            brew("services start \(formula)", sudo: true)
+            
+            Log.info("The new version has been linked!")
+            completion()
+        }
+    }
+    
+}

phpmon-common/PHP/Switcher/PhpSwitcher.swift

@@ -0,0 +1,15 @@
+//
+//  PhpVersionSwitchContract.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 24/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+protocol PhpSwitcher {
+    
+    func performSwitch(to version: String, completion: @escaping () -> Void)
+    
+}

phpmon-tests/BrewJsonParserTest.swift

@@ -9,20 +9,77 @@
 import XCTest
 
 class BrewJsonParserTest: XCTestCase {
+    
+    // - MARK: SYNTHETIC TESTS
 
     static var jsonBrewFile: URL {
-        return Bundle(for: Self.self).url(forResource: "brew", withExtension: "json")!
+        return Bundle(for: Self.self)
+            .url(forResource: "brew", withExtension: "json")!
     }
 
-    func testCanLoadExtension() throws {
-        let json = try? String(contentsOf: Self.jsonBrewFile, encoding: .utf8)
+    func testCanLoadExtensionJson() throws {
+        let json = try! String(contentsOf: Self.jsonBrewFile, encoding: .utf8)
         let package = try! JSONDecoder().decode(
-            [HomebrewPackage].self, from: json!.data(using: .utf8)!
+            [HomebrewPackage].self, from: json.data(using: .utf8)!
         ).first!
         
         XCTAssertEqual(package.name, "php")
         XCTAssertEqual(package.full_name, "php")
         XCTAssertEqual(package.aliases.first!, "php@8.0")
+        XCTAssertEqual(package.installed.contains(where: { installed in
+            installed.version.starts(with: "8.0")
+        }), true)
     }
+    
+    static var jsonBrewServicesFile: URL {
+        return Bundle(for: Self.self)
+            .url(forResource: "brew-services", withExtension: "json")!
+    }
+    
+    func testCanParseServicesJson() throws {
+        let json = try! String(contentsOf: Self.jsonBrewServicesFile, encoding: .utf8)
+        let services = try! JSONDecoder().decode(
+            [HomebrewService].self, from: json.data(using: .utf8)!
+        )
+        
+        XCTAssertGreaterThan(services.count, 0)
+        XCTAssertEqual(services.first?.name, "dnsmasq")
+        XCTAssertEqual(services.first?.service_name, "homebrew.mxcl.dnsmasq")
+    }
+    
+    // - MARK: LIVE TESTS
 
+    /// This test requires that you have a valid Homebrew installation set up,
+    /// and requires the Valet services to be installed: php, nginx and dnsmasq.
+    /// If this test fails, there is an issue with your Homebrew installation
+    /// or the JSON API of the Homebrew output may have changed.
+    func testCanParseServicesJsonFromCliOutput() throws {
+        let services = try! JSONDecoder().decode(
+            [HomebrewService].self,
+            from: Shell.pipe(
+                "sudo \(Paths.brew) services info --all --json",
+                requiresPath: true
+            ).data(using: .utf8)!
+        ).filter({ service in
+            return ["php", "nginx", "dnsmasq"].contains(service.name)
+        })
+        
+        XCTAssertTrue(services.contains(where: {$0.name == "php"} ))
+        XCTAssertTrue(services.contains(where: {$0.name == "nginx"} ))
+        XCTAssertTrue(services.contains(where: {$0.name == "dnsmasq"} ))
+        XCTAssertEqual(services.count, 3)
+    }
+    
+    /// This test requires that you have a valid Homebrew installation set up,
+    /// and requires the `php` formula to be installed.
+    /// If this test fails, there is an issue with your Homebrew installation
+    /// or the JSON API of the Homebrew output may have changed.
+    func testCanLoadExtensionJsonFromCliOutput() throws {
+        let package = try! JSONDecoder().decode(
+            [HomebrewPackage].self,
+            from: Shell.pipe("\(Paths.brew) info php --json", requiresPath: true).data(using: .utf8)!
+        ).first!
+        
+        XCTAssertTrue(package.name == "php")
+    }
 }

phpmon-tests/PhpVersionDetectionTest.swift

@@ -11,7 +11,7 @@ import XCTest
 class PhpVersionDetectionTest: XCTestCase {
 
     func testCanDetectValidPhpVersions() throws {
-        let outcome = Actions.extractPhpVersions(from: [
+        let outcome = PhpEnv.shared.extractPhpVersions(from: [
             "", // empty lines should be omitted
             "php@8.0",
             "php@8.0", // should only be detected once
@@ -26,5 +26,4 @@ class PhpVersionDetectionTest: XCTestCase {
         
         XCTAssertEqual(outcome, ["8.0", "7.0", "5.6"])
     }
-
 }

phpmon-tests/PhpVersionNumberTest.swift

@@ -0,0 +1,194 @@
+//
+//  PhpVersionNumberTest.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 23/01/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import XCTest
+
+class PhpVersionNumberTest: XCTestCase {
+
+    func testCanDeconstructPhpVersion() throws {
+        XCTAssertEqual(
+            PhpVersionNumber.make(from: "8.0.11"),
+            PhpVersionNumber(major: 8, minor: 0, patch: 11)
+        )
+        XCTAssertEqual(
+            PhpVersionNumber.make(from: "7.4.2"),
+            PhpVersionNumber(major: 7, minor: 4, patch: 2)
+        )
+        XCTAssertEqual(
+            PhpVersionNumber.make(from: "7.4"),
+            PhpVersionNumber(major: 7, minor: 4, patch: nil)
+        )
+        XCTAssertEqual(
+            PhpVersionNumber.make(from: "7"),
+            nil
+        )
+    }
+    
+    func testCanCheckFixedConstraints() throws {
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: "7.0"),
+            PhpVersionNumberCollection
+                .make(from: ["7.0"]).all
+        )
+        
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4.3", "7.3.3", "7.2.3", "7.1.3", "7.0.3"])
+                .matching(constraint: "7.0.3"),
+            PhpVersionNumberCollection
+                .make(from: ["7.0.3"]).all
+        )
+        
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: "7.0.3", strict: false),
+            PhpVersionNumberCollection
+                .make(from: ["7.0"]).all
+        )
+        
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: "7.0.3", strict: true),
+            PhpVersionNumberCollection
+                .make(from: []).all
+        )
+    }
+    
+    func testCanCheckCaretConstraints() throws {
+        // 1. Imprecise checks
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: "^7.0", strict: true),
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]).all
+        )
+        
+        // 2. Imprecise check with precise constraint (lenient AKA not strict)
+        // These versions are interpreted as 7.4.999, 7.3.999, 7.2.999, etc.
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: "^7.0.1", strict: false),
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]).all
+        )
+        
+        // 3. Imprecise check with precise constraint (strict mode)
+        // These versions are interpreted as 7.4.0, 7.3.0, 7.2.0, etc.
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: "^7.0.1", strict: true),
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1"]).all
+        )
+        
+        // 4. Precise members and constraint all around
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
+                .matching(constraint: "^7.0.1", strict: true),
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
+        )
+        
+        // 5. Precise members but imprecise constraint (strict mode)
+        // In strict mode the constraint's patch version is assumed to be 0
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
+                .matching(constraint: "^7.0", strict: true),
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
+        )
+        
+        // 6. Precise members but imprecise constraint (lenient mode)
+        // In lenient mode the constraint's patch version is assumed to be equal
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
+                .matching(constraint: "^7.0", strict: false),
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
+        )
+    }
+    
+    func testCanCheckTildeConstraints() throws {
+        // 1. Imprecise checks
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: "~7.0", strict: true),
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]).all
+        )
+        
+        // 2. Imprecise check with precise constraint (lenient AKA not strict)
+        // These versions are interpreted as 7.4.999, 7.3.999, 7.2.999, etc.
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: "~7.0.1", strict: false),
+            // One result because 7.0.1 to 7.0.x is expected.
+            // 7.0.999 (assumed due to no strictness) is valid.
+            // 7.1.0 and up are not valid (minor version is too high).
+            PhpVersionNumberCollection
+                .make(from: ["7.0"]).all
+        )
+        
+        // 3. Imprecise check with precise constraint (strict mode)
+        // These versions are interpreted as 7.4.0, 7.3.0, 7.2.0, etc.
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: "~7.0.1", strict: true),
+            // No results because 7.0.1 to 7.0.x is expected.
+            // 7.0.0 (assumed due to strictness) is not valid.
+            // 7.1.0 and up are also not valid (minor version is too high).
+            PhpVersionNumberCollection
+                .make(from: []).all
+        )
+        
+        // 4. Precise members and constraint all around
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
+                .matching(constraint: "~7.0.1", strict: true),
+            // Only 7.0 with a patch version of .1 or higher is OK.
+            // In this example, 7.0.10 is OK but all other versions are too new.
+            PhpVersionNumberCollection
+                .make(from: ["7.0.10"]).all
+        )
+        
+        // 5. Precise members but imprecise constraint (strict mode)
+        // In strict mode the constraint's patch version is assumed to be 0.
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
+                .matching(constraint: "~7.0", strict: true),
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
+        )
+        
+        // 6. Precise members but imprecise constraint (lenient mode)
+        // In lenient mode the constraint's patch version is assumed to be equal.
+        // (Strictness does not make any difference here, but both should be tested.)
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
+                .matching(constraint: "~7.0", strict: false),
+            PhpVersionNumberCollection
+                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
+        )
+    }
+}

phpmon-tests/Test Files/brew-services.json

@@ -0,0 +1,135 @@
+[
+    {
+        "name": "dnsmasq",
+        "service_name": "homebrew.mxcl.dnsmasq",
+        "running": true,
+        "loaded": true,
+        "schedulable": false,
+        "pid": 106,
+        "exit_code": 0,
+        "user": "root",
+        "status": "started",
+        "file": "/Library/LaunchDaemons/homebrew.mxcl.dnsmasq.plist",
+        "command": "/opt/homebrew/opt/dnsmasq/sbin/dnsmasq --keep-in-foreground -C /opt/homebrew/etc/dnsmasq.conf -7 /opt/homebrew/etc/dnsmasq.d,*.conf",
+        "working_dir": null,
+        "root_dir": null,
+        "log_path": null,
+        "error_log_path": null,
+        "interval": null,
+        "cron": null
+    },
+    {
+        "name": "httpd",
+        "service_name": "homebrew.mxcl.httpd",
+        "running": false,
+        "loaded": false,
+        "schedulable": false,
+        "pid": null,
+        "exit_code": null,
+        "user": null,
+        "status": "none",
+        "file": "/opt/homebrew/opt/httpd/homebrew.mxcl.httpd.plist",
+        "command": "/opt/homebrew/opt/httpd/bin/httpd -D FOREGROUND",
+        "working_dir": null,
+        "root_dir": null,
+        "log_path": null,
+        "error_log_path": null,
+        "interval": null,
+        "cron": null
+    },
+    {
+        "name": "mailhog",
+        "service_name": "homebrew.mxcl.mailhog",
+        "running": false,
+        "loaded": false,
+        "schedulable": false,
+        "pid": null,
+        "exit_code": null,
+        "user": null,
+        "status": "none",
+        "file": "/opt/homebrew/opt/mailhog/homebrew.mxcl.mailhog.plist",
+        "command": "/opt/homebrew/opt/mailhog/bin/MailHog",
+        "working_dir": null,
+        "root_dir": null,
+        "log_path": "/opt/homebrew/var/log/mailhog.log",
+        "error_log_path": "/opt/homebrew/var/log/mailhog.log",
+        "interval": null,
+        "cron": null
+    },
+    {
+        "name": "nginx",
+        "service_name": "homebrew.mxcl.nginx",
+        "running": true,
+        "loaded": true,
+        "schedulable": false,
+        "pid": 116,
+        "exit_code": 0,
+        "user": "root",
+        "status": "started",
+        "file": "/Library/LaunchDaemons/homebrew.mxcl.nginx.plist",
+        "command": "/opt/homebrew/opt/nginx/bin/nginx -g daemon off;",
+        "working_dir": "/opt/homebrew",
+        "root_dir": null,
+        "log_path": null,
+        "error_log_path": null,
+        "interval": null,
+        "cron": null
+    },
+    {
+        "name": "php",
+        "service_name": "homebrew.mxcl.php",
+        "running": true,
+        "loaded": true,
+        "schedulable": false,
+        "pid": 142,
+        "exit_code": 0,
+        "user": "root",
+        "status": "started",
+        "file": "/Library/LaunchDaemons/homebrew.mxcl.php.plist",
+        "command": "/opt/homebrew/opt/php/sbin/php-fpm --nodaemonize",
+        "working_dir": "/opt/homebrew/var",
+        "root_dir": null,
+        "log_path": null,
+        "error_log_path": "/opt/homebrew/var/log/php-fpm.log",
+        "interval": null,
+        "cron": null
+    },
+    {
+        "name": "php@8.0",
+        "service_name": "homebrew.mxcl.php@8.0",
+        "running": false,
+        "loaded": false,
+        "schedulable": false,
+        "pid": null,
+        "exit_code": null,
+        "user": null,
+        "status": "none",
+        "file": "/opt/homebrew/opt/php@8.0/homebrew.mxcl.php@8.0.plist",
+        "command": "/opt/homebrew/opt/php@8.0/sbin/php-fpm --nodaemonize",
+        "working_dir": "/opt/homebrew/var",
+        "root_dir": null,
+        "log_path": null,
+        "error_log_path": "/opt/homebrew/var/log/php-fpm.log",
+        "interval": null,
+        "cron": null
+    },
+    {
+        "name": "unbound",
+        "service_name": "homebrew.mxcl.unbound",
+        "running": false,
+        "loaded": false,
+        "schedulable": false,
+        "pid": null,
+        "exit_code": null,
+        "user": null,
+        "status": "none",
+        "file": "/opt/homebrew/opt/unbound/homebrew.mxcl.unbound.plist",
+        "command": "/opt/homebrew/opt/unbound/sbin/unbound -d -c /opt/homebrew/etc/unbound/unbound.conf",
+        "working_dir": null,
+        "root_dir": null,
+        "log_path": null,
+        "error_log_path": null,
+        "interval": null,
+        "cron": null
+    }
+]

phpmon-tests/Test Files/valet-config.json

@@ -0,0 +1,8 @@
+{
+    "tld": "test",
+    "paths": [
+        "/Users/username/.config/valet/Sites",
+        "/Users/username/Sites"
+    ],
+    "loopback": "127.0.0.1"
+}

phpmon-tests/Utility.swift

@@ -19,7 +19,7 @@ class Utility {
                 try FileManager.default.copyItem(at: bundleURL, to: targetURL)
                 return targetURL
             } catch let error {
-                print("Unable to copy file: \(error)")
+                Log.err("Unable to copy file: \(error)")
             }
         }
         

phpmon-tests/ValetConfigParserTest.swift

@@ -0,0 +1,38 @@
+//
+//  ValetConfigParserTest.swift
+//  phpmon-tests
+//
+//  Created by Nico Verbruggen on 29/11/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import XCTest
+
+class ValetConfigParserTest: XCTestCase {
+    
+    static var jsonConfigFileUrl: URL {
+        return Bundle(for: Self.self).url(
+            forResource: "valet-config",
+            withExtension: "json"
+        )!
+    }
+    
+    func testCanLoadConfigFile() throws {
+        let json = try? String(
+            contentsOf: Self.jsonConfigFileUrl,
+            encoding: .utf8
+        )
+        let config = try! JSONDecoder().decode(
+            Valet.Configuration.self,
+            from: json!.data(using: .utf8)!
+        )
+        
+        XCTAssertEqual(config.tld, "test")
+        XCTAssertEqual(config.paths, [
+            "/Users/username/.config/valet/Sites",
+            "/Users/username/Sites"
+        ])
+        XCTAssertEqual(config.loopback, "127.0.0.1")
+    }
+    
+}

phpmon-tests/ValetTest.swift

@@ -0,0 +1,18 @@
+//
+//  ValetTest.swift
+//  phpmon-tests
+//
+//  Created by Nico Verbruggen on 29/11/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import XCTest
+
+class ValetTest: XCTestCase {
+
+    func testDetermineValetVersion() {
+        let version = valet("--version")
+        XCTAssert(version.contains("Laravel Valet 2."))
+    }
+    
+}

phpmon-tests/VersionExtractorTest.swift

@@ -0,0 +1,25 @@
+//
+//  VersionExtractorTest.swift
+//  phpmon-tests
+//
+//  Created by Nico Verbruggen on 16/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import XCTest
+
+class VersionExtractorTest: XCTestCase {
+
+    func testExtractVersion() {
+        XCTAssertEqual(VersionExtractor.from("Laravel Valet 2.17.1"), "2.17.1")
+        XCTAssertEqual(VersionExtractor.from("Laravel Valet 2.0"), "2.0")
+    }
+    
+    func testVersionComparison() {
+        XCTAssertEqual("2.0".versionCompare("2.1"), .orderedAscending)
+        XCTAssertEqual("2.1".versionCompare("2.0"), .orderedDescending)
+        XCTAssertEqual("2.0".versionCompare("2.0"), .orderedSame)
+        XCTAssertEqual("2.17.0".versionCompare("2.17.1"), .orderedAscending)
+    }
+    
+}

phpmon/Assets.xcassets/AppIconBeta.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/Checkmark.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "check.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

phpmon/Assets.xcassets/Checkmark.imageset/check.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M435.848 83.466L172.804 346.51l-96.652-96.652c-4.686-4.686-12.284-4.686-16.971 0l-28.284 28.284c-4.686 4.686-4.686 12.284 0 16.971l133.421 133.421c4.686 4.686 12.284 4.686 16.971 0l299.813-299.813c4.686-4.686 4.686-12.284 0-16.971l-28.284-28.284c-4.686-4.686-12.284-4.686-16.97 0z"/></svg>

phpmon/Assets.xcassets/IconLinked.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "link.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

phpmon/Assets.xcassets/IconLinked.imageset/link.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z"/></svg>

phpmon/Assets.xcassets/IconParked.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "car-alt.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

phpmon/Assets.xcassets/IconParked.imageset/car-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 480 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M438.66 212.33l-11.24-28.1-19.93-49.83C390.38 91.63 349.57 64 303.5 64h-127c-46.06 0-86.88 27.63-103.99 70.4l-19.93 49.83-11.24 28.1C17.22 221.5 0 244.66 0 272v48c0 16.12 6.16 30.67 16 41.93V416c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32v-32h256v32c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32v-54.07c9.84-11.25 16-25.8 16-41.93v-48c0-27.34-17.22-50.5-41.34-59.67zm-306.73-54.16c7.29-18.22 24.94-30.17 44.57-30.17h127c19.63 0 37.28 11.95 44.57 30.17L368 208H112l19.93-49.83zM80 319.8c-19.2 0-32-12.76-32-31.9S60.8 256 80 256s48 28.71 48 47.85-28.8 15.95-48 15.95zm320 0c-19.2 0-48 3.19-48-15.95S380.8 256 400 256s32 12.76 32 31.9-12.8 31.9-32 31.9z"/></svg>

phpmon/Assets.xcassets/Lock.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Locked.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

phpmon/Assets.xcassets/Lock.imageset/Locked.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <rect id="Locked" x="0" y="0" width="30" height="30" style="fill:none;"/>
+    <g id="Locked1" serif:id="Locked">
+        <g transform="matrix(0.0468317,0,0,0.0468317,4.50971,3.01112)">
+            <path d="M400,256L152,256L152,152.9C152,113.3 183.7,80.4 223.3,80C263.3,79.6 296,112.1 296,152L296,266.079C296,279.379 376,279.137 376,265.837L376,152C376,68 307.5,-0.3 223.5,0C139.5,0.3 72,69.5 72,153.5L72,256L48,256C21.5,256 0,277.5 0,304L0,464C0,490.5 21.5,512 48,512L400,512C426.5,512 448,490.5 448,464L448,304C448,277.5 426.5,256 400,256Z" style="fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>

phpmon/Assets.xcassets/LockUnlocked.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Unlocked.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

phpmon/Assets.xcassets/LockUnlocked.imageset/Unlocked.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <rect id="Locked" x="0" y="0" width="30" height="30" style="fill:none;"/>
+    <g id="Locked1" serif:id="Locked">
+        <g transform="matrix(0.0468317,0,0,0.0468317,4.50971,3.01112)">
+            <path d="M400,256L152,256L152,152.9C152,113.3 183.7,80.4 223.3,80C263.3,79.6 296,112.1 296,152L296,168C296,181.3 322.386,192 322.386,192L352,192C365.3,192 376,181.3 376,168L376,152C376,68 307.5,-0.3 223.5,0C139.5,0.3 72,69.5 72,153.5L72,256L48,256C21.5,256 0,277.5 0,304L0,464C0,490.5 21.5,512 48,512L400,512C426.5,512 448,490.5 448,464L448,304C448,277.5 426.5,256 400,256Z" style="fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>

phpmon/Assets.xcassets/ServiceLoading.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "question-circle.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

phpmon/Assets.xcassets/ServiceLoading.imageset/question-circle.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z"/></svg>

phpmon/Assets.xcassets/ServiceOff.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "times-circle.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

phpmon/Assets.xcassets/ServiceOff.imageset/times-circle.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm0 448c-110.5 0-200-89.5-200-200S145.5 56 256 56s200 89.5 200 200-89.5 200-200 200zm101.8-262.2L295.6 256l62.2 62.2c4.7 4.7 4.7 12.3 0 17l-22.6 22.6c-4.7 4.7-12.3 4.7-17 0L256 295.6l-62.2 62.2c-4.7 4.7-12.3 4.7-17 0l-22.6-22.6c-4.7-4.7-4.7-12.3 0-17l62.2-62.2-62.2-62.2c-4.7-4.7-4.7-12.3 0-17l22.6-22.6c4.7-4.7 12.3-4.7 17 0l62.2 62.2 62.2-62.2c4.7-4.7 12.3-4.7 17 0l22.6 22.6c4.7 4.7 4.7 12.3 0 17z"/></svg>

phpmon/Assets.xcassets/ServiceOn.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "check-circle.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

phpmon/Assets.xcassets/ServiceOn.imageset/check-circle.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M256 8C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 48c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m140.204 130.267l-22.536-22.718c-4.667-4.705-12.265-4.736-16.97-.068L215.346 303.697l-59.792-60.277c-4.667-4.705-12.265-4.736-16.97-.069l-22.719 22.536c-4.705 4.667-4.736 12.265-.068 16.971l90.781 91.516c4.667 4.705 12.265 4.736 16.97.068l172.589-171.204c4.704-4.668 4.734-12.266.067-16.971z"/></svg>

phpmon/Assets.xcassets/StatusBarPHP.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "php@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

phpmon/Domain/Core/Actions.swift

@@ -1,221 +0,0 @@
-//
-//  Services.swift
-//  PHP Monitor
-//
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-import AppKit
-
-class Actions {
-    
-    // MARK: - Detect PHP Versions
-    
-    public static func detectPhpVersions() -> [String]
-    {
-        let files = Shell.pipe("ls \(Paths.optPath) | grep php@")
-        var versionsOnly = Self.extractPhpVersions(from: files.components(separatedBy: "\n"))
-        
-        // Make sure the aliased version is detected
-        // The user may have `php` installed, but not e.g. `php@8.0`
-        // We should also detect that as a version that is installed
-        let phpAlias = App.shared.brewPhpVersion
-        
-        // Avoid inserting a duplicate
-        if (!versionsOnly.contains(phpAlias)) {
-            versionsOnly.append(phpAlias);
-        }
-        
-        print("The PHP versions that were detected are: \(versionsOnly)")
-        
-        return versionsOnly
-    }
-    
-    /**
-     Extracts valid PHP versions from an array of strings.
-     This array of strings is usually retrieved from `grep`.
-     */
-    public static func extractPhpVersions(
-        from versions: [String],
-        checkBinaries: Bool = true
-    ) -> [String] {
-        var output : [String] = []
-        
-        versions.filter { (version) -> Bool in
-            // Omit everything that doesn't start with php@
-            // (e.g. something-php@8.0 won't be detected)
-            return version.starts(with: "php@")
-        }.forEach { (string) in
-            let version = string.components(separatedBy: "php@")[1]
-            // Only append the version if it doesn't already exist (avoid dupes),
-            // is supported and where the binary exists (avoids broken installs)
-            if !output.contains(version)
-                && Constants.SupportedPhpVersions.contains(version)
-                && (checkBinaries ? Shell.fileExists("\(Paths.optPath)/php@\(version)/bin/php") : true)
-            {
-                output.append(version)
-            }
-        }
-        
-        return output
-    }
-    
-    // MARK: - Services
-    
-    public static func restartPhpFpm()
-    {
-        brew("services restart \(App.phpInstall!.formula)", sudo: true)
-    }
-    
-    public static func restartNginx()
-    {
-        brew("services restart nginx", sudo: true)
-    }
-    
-    public static func restartDnsMasq()
-    {
-        brew("services restart dnsmasq", sudo: true)
-    }
-    
-    public static func stopAllServices()
-    {
-        brew("services stop \(App.phpInstall!.formula)", sudo: true)
-        brew("services stop nginx", sudo: true)
-        brew("services stop dnsmasq", sudo: true)
-    }
-    
-    /**
-     Switching to a new PHP version involves:
-     - unlinking the current version
-     - stopping the active services
-     - linking the new desired version
-     
-     Please note that depending on which version is installed,
-     the version that is switched to may or may not be identical to `php` (without @version).
-     */
-    public static func switchToPhpVersion(
-        version: String,
-        availableVersions: [String],
-        completed: @escaping () -> Void
-    ) {
-        print("Switching to \(version), unlinking all versions...")
-
-        let group = DispatchGroup()
-        
-        availableVersions.forEach { (available) in
-            group.enter()
-            
-            DispatchQueue.global(qos: .userInitiated).async {
-                let formula = (available == App.shared.brewPhpVersion)
-                    ? "php" : "php@\(available)"
-                
-                brew("unlink \(formula)")
-                brew("services stop \(formula)", sudo: true)
-                
-                group.leave()
-            }
-        }
-        
-        group.notify(queue: .global(qos: .userInitiated)) {
-            print("All versions have been unlinked!")
-            print("Linking the new version!")
-            
-            let formula = (version == App.shared.brewPhpVersion) ? "php" : "php@\(version)"
-            brew("link \(formula) --overwrite --force")
-            brew("services start \(formula)", sudo: true)
-            
-            print("The new version has been linked!")
-            completed()
-        }
-    }
-    
-    // MARK: - Finding Config Files
-    
-    public static func openGenericPhpConfigFolder()
-    {
-        let files = [NSURL(fileURLWithPath: "\(Paths.etcPath)/php")];
-        NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
-    }
-    
-    public static func openGlobalComposerFolder()
-    {
-        let file = FileManager.default.homeDirectoryForCurrentUser
-            .appendingPathComponent(".composer/composer.json")
-        NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
-    }
-    
-    public static func openPhpConfigFolder(version: String)
-    {
-        let files = [NSURL(fileURLWithPath: "\(Paths.etcPath)/php/\(version)/php.ini")];
-        NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
-    }
-    
-    public static func openValetConfigFolder()
-    {
-        let file = FileManager.default.homeDirectoryForCurrentUser
-            .appendingPathComponent(".config/valet")
-        NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
-    }
-    
-    // MARK: - Quick Fix
-    
-    /**
-     Detects all currently available PHP versions, and unlinks each and every one of them.
-     After this, the brew services are also stopped, the latest PHP version is linked, and php + nginx are restarted.
-     If this does not solve the issue, the user may need to install additional extensions and/or run `composer global update`.
-     */
-    public static func fixMyPhp()
-    {
-        brew("services restart dnsmasq", sudo: true)
-        
-        detectPhpVersions().forEach { (version) in
-            let formula = (version == App.shared.brewPhpVersion) ? "php" : "php@\(version)"
-            brew("unlink php@\(version)")
-            brew("services stop \(formula)")
-            brew("services stop \(formula)", sudo: true)
-        }
-        
-        brew("services stop php")
-        brew("services stop nginx")
-        brew("link php")
-        brew("services restart dnsmasq", sudo: true)
-        brew("services stop php", sudo: true)
-        brew("services stop nginx", sudo: true)
-    }
-    
-    // MARK: Common Shell Commands
-    
-    /**
-     Runs a `brew` command. Can run as superuser.
-     */
-    public static func brew(_ command: String, sudo: Bool = false)
-    {
-        Shell.run("\(sudo ? "sudo " : "")" + "\(Paths.brew) \(command)")
-    }
-    
-    /**
-     Runs `sed` in order to replace all occurrences of a string in a specific file with another.
-     */
-    public static func sed(file: String, original: String, replacement: String)
-    {
-        // Escape slashes (or `sed` won't work)
-        let e_original = original.replacingOccurrences(of: "/", with: "\\/")
-        let e_replacment = replacement.replacingOccurrences(of: "/", with: "\\/")
-        
-        Shell.run("sed -i '' 's/\(e_original)/\(e_replacment)/g' \(file)")
-    }
-    
-    /**
-     Uses `grep` to determine whether a particular query string can be found in a particular file.
-     */
-    public static func grepContains(file: String, query: String) -> Bool
-    {
-        return Shell.pipe("""
-            grep -q '\(query)' \(file); [ $? -eq 0 ] && echo "YES" || echo "NO"
-            """)
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .contains("YES")
-    }
-    
-}

phpmon/Domain/Core/App+ActivationPolicy.swift

@@ -0,0 +1,44 @@
+//
+//  App+ActivationPolicy.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 05/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+import Foundation
+
+extension App {
+    
+    // MARK: - Application State
+    
+    /**
+     Registers a window as currently open.
+     */
+    public func register(window name: String) {
+        if !openWindows.contains(name) {
+            openWindows.append(name)
+        }
+        updateActivationPolicy()
+    }
+    
+    /**
+     Removes a window, assuming it was closed.
+     */
+    public func remove(window name: String) {
+        openWindows.removeAll { window in
+            window == name
+        }
+        updateActivationPolicy()
+    }
+    
+    /**
+     If there are any open windows, the app will be a regular app.
+     If there are no windows open, the app will be an accessory (toolbar) app.
+     */
+    public func updateActivationPolicy() {
+        NSApp.setActivationPolicy(openWindows.count > 0 ? .regular : .accessory)
+    }
+    
+}

phpmon/Domain/Core/App+GlobalHotkey.swift

@@ -0,0 +1,55 @@
+//
+//  App+GlobalHotkey.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 05/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import HotKey
+import Cocoa
+
+extension App {
+    
+    // MARK: - Methods
+    
+    /**
+     On startup, the preferences should be loaded from the .plist,
+     and we'll enable the shortcut if it is set.
+     */
+    func loadGlobalHotkey() {
+        // Make sure we can retrieve the hotkey from preferences
+        guard let hotkey = Preferences.preferences[.globalHotkey] as? String else {
+            Log.info("No global hotkey was saved in preferences. None set.")
+            return
+        }
+        
+        // Make sure we can parse the JSON into the desired format
+        guard let keybindPref = GlobalKeybindPreference.fromJson(hotkey) else {
+            Log.err("No global hotkey loaded, could not be parsed!")
+            shortcutHotkey = nil
+            return
+        }
+        
+        shortcutHotkey = HotKey(keyCombo: KeyCombo(
+            carbonKeyCode: keybindPref.keyCode,
+            carbonModifiers: keybindPref.carbonFlags
+        ))
+    }
+    
+    /**
+     Sets up the action that needs to occur when the shortcut key is pressed
+     (opens the menu).
+     */
+    func setupGlobalHotkeyListener() {
+        guard let hotkey = shortcutHotkey else {
+            return
+        }
+        
+        hotkey.keyDownHandler = {
+            MainMenu.shared.statusItem.button?.performClick(nil)
+            NSApplication.shared.activate(ignoringOtherApps: true)
+        }
+    }
+    
+}

phpmon/Domain/Core/App.swift

@@ -8,118 +8,85 @@
 import Cocoa
 import HotKey
 
-class App {
+class App: PhpSwitcherDelegate {
     
+    // MARK: Static Vars
+    
+    /** The static app instance. Accessible at any time. */
     static let shared = App()
     
-    init() {
-        loadGlobalHotkey()
-    }
-    
-    /** Information about the currently linked PHP installation. */
-    static var phpInstall: PhpInstallation? {
-        return App.shared.currentInstall
+    /** Retrieve the version number from the main info dictionary, Info.plist. */
+    static var version: String {
+        let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
+        let build = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
+        return "\(version) (\(build))"
     }
     
     /** Whether the app is busy doing something. Used to determine what UI to display. */
     static var busy: Bool {
-        return App.shared.busy
+        return PhpEnv.shared.isBusy
     }
     
+    // MARK: Variables
+    
     /** The list of preferences that are currently active. */
     var preferences: [PreferenceName: Bool]!
     
-    /**
-     The window controller of the currently active window.
-     */
-    var windowController: NSWindowController? = nil
+    /** The window controller of the currently active preferences window. */
+    var preferencesWindowController: PrefsWC? = nil
     
-    /**
-     Whether the application is busy switching versions.
-     */
-    var busy: Bool = false
+    /** The window controller of the currently active site list window. */
+    var siteListWindowController: SiteListWC? = nil
     
-    /**
-     The currently active installation of PHP.
-     */
-    var currentInstall: PhpInstallation? = nil
+    /** List of detected (installed) applications that PHP Monitor can work with. */
+    var detectedApplications: [Application] = []
     
-    /**
-     All available versions of PHP.
-     */
-    var availablePhpVersions : [String] = []
-    
-    /**
-     The timer that will periodically fetch the PHP version that is currently active.
-     */
+    /** Timer that will periodically reload info about the user's PHP installation. */
     var timer: Timer?
-    
-    /**
-     Information we were able to discern from the Homebrew info command (as JSON).
-     */
-    var brewPhpPackage: HomebrewPackage? = nil {
-        didSet {
-            brewPhpVersion = brewPhpPackage!.version
-        }
-    }
-    
-    /**
-     The version that the `php` formula via Brew is aliased to on the current system.
-     
-     If you're up to date, `php` will be aliased to the latest version,
-     but that might not be the case.
-     
-     We'll technically default to the version in Constants.swift, but the information
-     should always be loaded from Homebrew itself upon startup.
-     */
-    var brewPhpVersion: String = Constants.LatestStablePhpVersion
+
+    // MARK: - Global Hotkey
     
     /**
      The shortcut the user has requested.
      */
     var shortcutHotkey: HotKey? = nil {
         didSet {
-            self.setupGlobalHotkeyListener()
+            setupGlobalHotkeyListener()
         }
     }
     
-    // MARK: - Methods
+    // MARK: - Activation Policy
     
     /**
-     On startup, the preferences should be loaded from the .plist, and we'll enable the shortcut if it is set.
+     Variable that keeps track of which windows are currently open.
+     (Please note that window controllers remain open in memory once opened.)
+     
+     When this list is updated, the app activation policy is re-evaluated.
+     The app activation policy dictates how the app runs
+     (as a normal app or as a toolbar app).
      */
-    private func loadGlobalHotkey() {
-        // Make sure we can retrieve the hotkey from preferences; if we cannot, no hotkey is set
-        guard let hotkey = Preferences.preferences[.globalHotkey] as? String else {
-            print("No global hotkey loaded")
-            return
-        }
-        
-        // Make sure we can parse the JSON into the desired format; if we cannot, no hotkey is set
-        guard let keybindPref = GlobalKeybindPreference.fromJson(hotkey) else {
-            print("No global hotkey loaded, could not be parsed!")
-            self.shortcutHotkey = nil
-            return
-        }
-        
-        self.shortcutHotkey = HotKey(keyCombo: KeyCombo(
-            carbonKeyCode: keybindPref.keyCode,
-            carbonModifiers: keybindPref.carbonFlags
-        ))
-    }
+    var openWindows: [String] = []
+    
+    // MARK: - App Watchers
     
     /**
-     Sets up the action that needs to occur when the shortcut key is pressed (open the menu).
+     The `PhpConfigWatcher` is responsible for watching the `.ini` files and the `.conf.d` folder.
      */
-    private func setupGlobalHotkeyListener() {
-        guard let hotkey = self.shortcutHotkey else {
-            return
-        }
-        
-        hotkey.keyDownHandler = {
-            MainMenu.shared.statusItem.button?.performClick(nil)
-            NSApplication.shared.activate(ignoringOtherApps: true)
-        }
+    var watcher: PhpConfigWatcher!
+    
+    // MARK: - PhpSwitcherDelegate
+    
+    func switcherDidStartSwitching() {
     }
     
+    func switcherDidCompleteSwitch() {
+        PhpEnv.shared.currentInstall = ActivePhpInstallation()
+        handlePhpConfigWatcher()
+        
+        if let window = siteListWindowController {
+            DispatchQueue.main.async {
+                window.contentVC.reloadSites()
+            }
+        }
+    }
 }

phpmon/Domain/Core/AppDelegate+InterApp.swift

@@ -0,0 +1,19 @@
+//
+//  AppDelegate+InterApp.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 20/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+import Foundation
+
+extension AppDelegate {
+    
+    func application(_ application: NSApplication, open urls: [URL]) {
+        print(urls)
+    }
+    
+}
+

phpmon/Domain/Core/AppDelegate+MenuOutlets.swift

@@ -0,0 +1,40 @@
+//
+//  AppDelegate+MenuOutlets.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 05/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+/**
+ Any outlets connected to the app's main menu (not the menu that shows when the icon in
+ the menu bar is clicked, but the regular app's main menu) are configured here.
+ 
+ Default interactions like copy/paste, select all, close window etc. are wired up by
+ default in the storyboard and do not need to be manually added.
+ 
+ Extra functionality (like the menu item to reload the list of sites) does, however.
+ 
+ - Note: This menu is only displayed when the app is NOT running in accessory mode.
+ For more information about this, please see the ActivationPolicy-related extension.
+ */
+extension AppDelegate {
+    
+    // MARK: - Menu Interactions
+    
+    @IBAction func reloadSiteListPressed(_ sender: Any) {
+        let vc = App.shared.siteListWindowController?
+            .window?.contentViewController as? SiteListVC
+        
+        if vc != nil {
+            // If the view exists, directly reload the list of sites
+            vc!.reloadSites()
+        } else {
+            // If the view does not exist, reload the cached data that was populated when the app initially launched.
+            Valet.shared.reloadSites()
+        }
+    }
+    
+}

phpmon/Domain/Core/AppDelegate+Notifications.swift

@@ -0,0 +1,42 @@
+//
+//  AppDelegate+Notifications.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 06/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import UserNotifications
+
+extension AppDelegate {
+    
+    // MARK: - Notifications
+    
+    public func setupNotifications() {
+        let notificationCenter = UNUserNotificationCenter.current()
+        notificationCenter.delegate = self
+        notificationCenter.requestAuthorization(options: [.alert], completionHandler: { granted, error in
+            if !granted {
+                Log.warn("PHP Monitor does not have permission to show notifications.")
+            }
+            if let error = error {
+                Log.err("PHP Monitor encounted an error determining notification permissions:")
+                Log.err(error)
+            }
+        })
+    }
+    
+    /**
+     Ensure that the application displays notifications even when the app is active.
+     */
+    func userNotificationCenter(
+        _ center: UNUserNotificationCenter,
+        willPresent notification: UNNotification,
+        withCompletionHandler completionHandler:
+        @escaping (UNNotificationPresentationOptions) -> Void
+    ) {
+        completionHandler([.banner])
+    }
+    
+}

phpmon/Domain/Core/AppDelegate.swift

@@ -9,7 +9,7 @@ import Cocoa
 import UserNotifications
 
 @NSApplicationMain
-class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDelegate {
+class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDelegate {
     
     // MARK: - Variables
     
@@ -38,44 +38,57 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
      */
     let paths: Paths
     
+    /**
+     The Valet singleton that determines all information
+     about Valet and its current configuration.
+     */
+    let valet: Valet
+    
+    /**
+     The PhpSwitcher singleton that handles PHP version
+     detection, as well as switching. It is initialized
+     when the app is ready and passed all checks.
+     */
+    var switcher: PhpEnv! = nil
+    
+    var logger = Log.shared
+    
     // MARK: - Initializer
     
     /**
      When the application initializes, create all singletons.
      */
     override init() {
+        logger.verbosity = .performance
+        Log.info("==================================")
+        Log.info("PHP MONITOR by Nico Verbruggen")
+        Log.info("Version \(App.version)")
+        Log.info("==================================")
         self.sharedShell = Shell.user
         self.state = App.shared
         self.menu = MainMenu.shared
         self.paths = Paths.shared
+        self.valet = Valet.shared
         super.init()
     }
     
+    func initializeSwitcher() {
+        self.switcher = PhpEnv.shared
+        self.switcher.delegate = self.state
+    }
+    
     // MARK: - Lifecycle
     
     /**
      When the application has finished launching, we'll want to set up
-     the user notification center delegate, and kickoff the menu
+     the user notification center permissions, and kickoff the menu
      startup procedure.
      */
     func applicationDidFinishLaunching(_ aNotification: Notification) {
-        NSUserNotificationCenter.default.delegate = self
-        self.menu.startup()
-    }
-    
-    // MARK: - NSUserNotificationCenterDelegate
-    
-    /**
-     When a notification is sent, the delegate of the notification center
-     is asked whether the notification should be presented or not. Since
-     the user can now disable notifications per application since macOS
-     Catalina, any and all notifications should be displayed.
-     */
-    func userNotificationCenter(
-        _ center: NSUserNotificationCenter,
-        shouldPresent notification: NSUserNotification
-    ) -> Bool {
-        return true
+        // Make sure notifications will work
+        setupNotifications()
+        // Make sure the menu performs its initial checks
+        menu.startup()
     }
     
 }

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

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
+        <capability name="Image references" minToolsVersion="12.0"/>
+        <capability name="Search Toolbar Item" minToolsVersion="12.0" minSystemVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -31,6 +33,249 @@
                                     </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">
+                                    <items>
+                                        <menuItem title="Reload Site List" keyEquivalent="r" id="Ema-AU-Nbr">
+                                            <connections>
+                                                <action selector="reloadSiteListPressed:" target="Voe-Tx-rLC" id="geC-Ld-haX"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Edit" id="r2Z-pR-umI">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Edit" id="8Pm-83-BlM">
+                                    <items>
+                                        <menuItem title="Undo" 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">
+                                            <connections>
+                                                <action selector="redo:" target="Ady-hI-5gd" id="utE-Bv-fdY"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="7Ja-wX-Yyy"/>
+                                        <menuItem title="Cut" keyEquivalent="x" id="wud-nd-1nZ">
+                                            <connections>
+                                                <action selector="cut:" target="Ady-hI-5gd" id="C3e-e7-Z50"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Copy" keyEquivalent="c" id="V42-o1-WHL">
+                                            <connections>
+                                                <action selector="copy:" target="Ady-hI-5gd" id="ec3-KB-YgV"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste" keyEquivalent="v" id="aBF-dz-Blf">
+                                            <connections>
+                                                <action selector="paste:" target="Ady-hI-5gd" id="BHd-PO-XsH"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste and Match Style" keyEquivalent="V" id="EgA-GE-99p">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteAsPlainText:" target="Ady-hI-5gd" id="ls4-pp-hcL"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Delete" id="smI-vK-hCc">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="delete:" target="Ady-hI-5gd" id="iNe-gC-rFo"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Select All" keyEquivalent="a" id="29b-s6-UmK">
+                                            <connections>
+                                                <action selector="selectAll:" target="Ady-hI-5gd" id="b6J-NN-IIc"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="uFh-RS-XNP"/>
+                                        <menuItem title="Find" id="Dvh-pB-nbE">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Find" id="QlO-5L-pAZ">
+                                                <items>
+                                                    <menuItem title="Find…" tag="1" keyEquivalent="f" id="m08-yq-ZGg">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="W9P-aN-Jes"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="pjr-Fe-SEl">
+                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="XVP-he-TQd"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Find Next" tag="2" keyEquivalent="g" id="Zpc-8S-9bB">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="oRy-fc-1aa"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="GDM-nF-rG0">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="x6a-fg-4qv"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="6fa-55-D8I">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="EGI-VW-wxB"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Jump to Selection" keyEquivalent="j" id="H8e-pj-DLt">
+                                                        <connections>
+                                                            <action selector="centerSelectionInVisibleArea:" target="Ady-hI-5gd" id="oI9-dt-1tg"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Spelling and Grammar" id="RMo-NJ-dGJ">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Spelling" id="4PN-Vd-GBg">
+                                                <items>
+                                                    <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="2c8-04-pLg">
+                                                        <connections>
+                                                            <action selector="showGuessPanel:" target="Ady-hI-5gd" id="hyy-YK-6Bw"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Check Document Now" keyEquivalent=";" id="ZBj-z6-5YX">
+                                                        <connections>
+                                                            <action selector="checkSpelling:" target="Ady-hI-5gd" id="21B-wo-C7b"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="APF-Br-Trc"/>
+                                                    <menuItem title="Check Spelling While Typing" id="knZ-NA-0Jb">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleContinuousSpellChecking:" target="Ady-hI-5gd" id="32z-g2-SCz"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Check Grammar With Spelling" id="v6M-1d-el3">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleGrammarChecking:" target="Ady-hI-5gd" id="1YL-19-eUI"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Correct Spelling Automatically" id="qg8-Mm-AiQ">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticSpellingCorrection:" target="Ady-hI-5gd" id="zdy-r0-ioM"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Substitutions" id="SW4-hB-QOQ">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Substitutions" id="EmO-8n-AsV">
+                                                <items>
+                                                    <menuItem title="Show Substitutions" id="rvM-Vq-p0Y">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="orderFrontSubstitutionsPanel:" target="Ady-hI-5gd" id="SjT-fP-U8q"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="TTo-oL-4Pj"/>
+                                                    <menuItem title="Smart Copy/Paste" id="op9-oC-x65">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleSmartInsertDelete:" target="Ady-hI-5gd" id="82G-c7-eEX"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Smart Quotes" id="Sg4-Dr-IyH">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticQuoteSubstitution:" target="Ady-hI-5gd" id="tf9-2j-dbm"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Smart Dashes" id="Uop-B5-hKQ">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticDashSubstitution:" target="Ady-hI-5gd" id="2jO-5h-PhN"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Smart Links" id="G9f-Tv-imo">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticLinkDetection:" target="Ady-hI-5gd" id="ryX-Py-Jan"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Data Detectors" id="9sq-LY-oWc">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticDataDetection:" target="Ady-hI-5gd" id="ps3-Vn-32V"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Text Replacement" id="AQ0-Wh-nkQ">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticTextReplacement:" target="Ady-hI-5gd" id="nEj-vL-yg2"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Transformations" id="BLU-2S-dqL">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Transformations" id="lFI-Ry-XFg">
+                                                <items>
+                                                    <menuItem title="Make Upper Case" id="bx6-aZ-THy">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="uppercaseWord:" target="Ady-hI-5gd" id="tyN-SK-Cgt"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Make Lower Case" id="Ks8-z7-N7j">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="lowercaseWord:" target="Ady-hI-5gd" id="0fo-Fo-xfq"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Capitalize" id="Lv4-Up-dyv">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="capitalizeWord:" target="Ady-hI-5gd" id="Bqs-0x-WzX"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Speech" id="cTl-lQ-Mg9">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Speech" id="4c5-we-5Vo">
+                                                <items>
+                                                    <menuItem title="Start Speaking" id="YPC-zf-2Xh">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="startSpeaking:" target="Ady-hI-5gd" id="VRy-Kb-4cG"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Stop Speaking" id="4YM-9V-tLE">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="stopSpeaking:" target="Ady-hI-5gd" id="KHB-GE-En3"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </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">
@@ -49,11 +294,11 @@
                         <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
                     </connections>
                 </application>
-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="PHP_Monitor" customModuleProvider="target"/>
                 <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"/>
             </objects>
-            <point key="canvasLocation" x="-343" y="-16"/>
+            <point key="canvasLocation" x="-484" y="32"/>
         </scene>
         <!--Window Controller-->
         <scene sceneID="PQa-AT-b2a">
@@ -68,6 +313,10 @@
                             <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </view>
+                        <toolbar key="toolbar" implicitIdentifier="611E3485-DC7F-46A0-8528-11CF9366370C" autosavesConfiguration="NO" allowsUserCustomization="NO" showsBaselineSeparator="NO" displayMode="iconAndLabel" sizeMode="regular" id="fcq-wR-7iv">
+                            <allowedToolbarItems/>
+                            <defaultToolbarItems/>
+                        </toolbar>
                         <connections>
                             <outlet property="delegate" destination="hLJ-Fd-wRr" id="6HE-8Y-aCO"/>
                         </connections>
@@ -85,12 +334,139 @@
             <objects>
                 <viewController title="Preferences" storyboardIdentifier="preferences" showSeguePresentationStyle="single" id="AW2-rV-rbS" customClass="PrefsVC" customModule="PHP_Monitor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" wantsLayer="YES" id="Pf1-A5-3Xz">
-                        <rect key="frame" x="0.0" y="0.0" width="574" height="189"/>
+                        <rect key="frame" x="0.0" y="0.0" width="550" height="498"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GSr-K5-3yw">
-                                <rect key="frame" x="485" y="13" width="76" height="32"/>
-                                <buttonCell key="cell" type="push" title="CLOSE" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ocw-Rx-gyh">
+                            <stackView distribution="fillEqually" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k57-O3-Yyj">
+                                <rect key="frame" x="0.0" y="15" width="550" height="468"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="550" id="eOC-yS-nl6"/>
+                                </constraints>
+                            </stackView>
+                        </subviews>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="k57-O3-Yyj" secondAttribute="bottom" constant="15" id="ECF-1q-1zc"/>
+                            <constraint firstItem="k57-O3-Yyj" firstAttribute="top" secondItem="Pf1-A5-3Xz" secondAttribute="top" constant="15" id="HwH-HC-MSf"/>
+                            <constraint firstAttribute="trailing" secondItem="k57-O3-Yyj" secondAttribute="trailing" id="M7l-W4-EDv"/>
+                            <constraint firstItem="k57-O3-Yyj" firstAttribute="leading" secondItem="Pf1-A5-3Xz" secondAttribute="leading" id="ctd-MO-fe1"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="stackView" destination="k57-O3-Yyj" id="fF8-8n-bc9"/>
+                    </connections>
+                </viewController>
+                <customObject id="eQC-8B-FkX" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="251" y="205"/>
+        </scene>
+        <!--Window Controller-->
+        <scene sceneID="4XS-kY-YIS">
+            <objects>
+                <windowController storyboardIdentifier="siteListWindow" id="8Ec-9q-82s" customClass="SiteListWC" customModule="PHP_Monitor" customModuleProvider="target" sceneMemberID="viewController">
+                    <window key="window" title="Domains" subtitle="Linked &amp; Parked" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="raw-02-3Q1">
+                        <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+                        <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+                        <rect key="contentRect" x="425" y="461" width="550" height="263"/>
+                        <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+                        <view key="contentView" id="uVx-Da-x4I">
+                            <rect key="frame" x="0.0" y="0.0" width="550" height="263"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </view>
+                        <toolbar key="toolbar" implicitIdentifier="594015E3-8428-4926-9341-4B8CE4C7E373" autosavesConfiguration="NO" allowsUserCustomization="NO" showsBaselineSeparator="NO" displayMode="iconOnly" sizeMode="regular" id="OOz-oZ-vlN">
+                            <allowedToolbarItems>
+                                <toolbarItem implicitItemIdentifier="5B9DBBA8-D173-4EAF-807C-C6EA0B4D806A" label="Add Link" paletteLabel="Add Link" tag="-1" bordered="YES" sizingBehavior="auto" id="GsC-ra-40U">
+                                    <imageReference key="image" image="plus" catalog="system" symbolScale="medium"/>
+                                    <connections>
+                                        <action selector="pressedAddLink:" target="8Ec-9q-82s" id="H0o-No-x4M"/>
+                                    </connections>
+                                </toolbarItem>
+                                <toolbarItem implicitItemIdentifier="B734CDE2-70E9-45A8-B1B3-5A5DE156621D" label="Reload" paletteLabel="Reload" tag="-1" bordered="YES" sizingBehavior="auto" id="YtK-vM-5y7">
+                                    <imageReference key="image" image="arrow.clockwise" catalog="system" symbolScale="medium"/>
+                                    <connections>
+                                        <action selector="pressedReload:" target="8Ec-9q-82s" id="fLc-bD-oYQ"/>
+                                    </connections>
+                                </toolbarItem>
+                                <searchToolbarItem implicitItemIdentifier="629F0782-3C5F-4CD0-9396-3A054A422180" label="Search" paletteLabel="Search" visibilityPriority="1001" id="Q7Z-fw-lB9">
+                                    <nil key="toolTip"/>
+                                    <searchField key="view" verticalHuggingPriority="750" textCompletion="NO" id="oWA-TH-Pm7">
+                                        <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="3NO-6x-aLc">
+                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </searchFieldCell>
+                                    </searchField>
+                                </searchToolbarItem>
+                            </allowedToolbarItems>
+                            <defaultToolbarItems>
+                                <toolbarItem reference="GsC-ra-40U"/>
+                                <toolbarItem reference="YtK-vM-5y7"/>
+                                <searchToolbarItem reference="Q7Z-fw-lB9"/>
+                            </defaultToolbarItems>
+                        </toolbar>
+                        <connections>
+                            <outlet property="delegate" destination="8Ec-9q-82s" id="xEM-aj-eHL"/>
+                        </connections>
+                    </window>
+                    <connections>
+                        <outlet property="searchToolbarItem" destination="Q7Z-fw-lB9" id="J5o-oh-VhO"/>
+                        <segue destination="JZI-Vd-9oq" kind="relationship" relationship="window.shadowedContentViewController" id="9Gy-Gw-hPH"/>
+                    </connections>
+                </windowController>
+                <customObject id="VCP-dF-cqM" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-374" y="758"/>
+        </scene>
+        <!--Window Controller-->
+        <scene sceneID="HTI-x5-rOp">
+            <objects>
+                <windowController storyboardIdentifier="addSiteWindow" id="N1O-Nj-C2V" sceneMemberID="viewController">
+                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="yLy-XT-fuq">
+                        <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+                        <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+                        <rect key="contentRect" x="425" y="462" width="480" height="270"/>
+                        <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+                        <view key="contentView" id="7Is-aK-lDv">
+                            <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </view>
+                        <connections>
+                            <outlet property="delegate" destination="N1O-Nj-C2V" id="CvY-PZ-Y6C"/>
+                        </connections>
+                    </window>
+                    <connections>
+                        <segue destination="glS-wF-sEU" kind="relationship" relationship="window.shadowedContentViewController" id="6Sa-w0-Uov"/>
+                    </connections>
+                </windowController>
+                <customObject id="d2k-57-mLZ" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-339" y="1147"/>
+        </scene>
+        <!--Add SiteVC-->
+        <scene sceneID="6JC-H6-u4K">
+            <objects>
+                <viewController storyboardIdentifier="newSiteLink" id="glS-wF-sEU" customClass="AddSiteVC" customModule="PHP_Monitor" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" id="JJJ-T9-Yuv">
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="251"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PVw-cM-qAB">
+                                <rect key="frame" x="13" y="13" width="103" height="32"/>
+                                <buttonCell key="cell" type="push" title="Create Link" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="WwW-Wv-I8s">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                    <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="pressedCreateLink:" target="glS-wF-sEU" id="Vh7-K5-ubM"/>
+                                </connections>
+                            </button>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SwS-o8-pbl">
+                                <rect key="frame" x="391" y="13" width="76" height="32"/>
+                                <buttonCell key="cell" type="push" title="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"/>
                                     <string key="keyEquivalent" base64-UTF8="YES">
@@ -98,129 +474,314 @@ Gw
 </string>
                                 </buttonCell>
                                 <connections>
-                                    <action selector="pressed:" target="AW2-rV-rbS" id="8dA-y4-voq"/>
+                                    <action selector="pressedCancel:" target="glS-wF-sEU" id="MZS-Vg-Vjf"/>
                                 </connections>
                             </button>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MEf-MN-oXt">
-                                <rect key="frame" x="148" y="152" width="406" height="18"/>
-                                <buttonCell key="cell" type="check" title="DYN_ICON" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="m5s-qp-Iaj">
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZX9-s1-23i">
+                                <rect key="frame" x="20" y="156" width="440" height="21"/>
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Enter a potential domain name here." drawsBackground="YES" id="NFa-1D-Bi4">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                                <connections>
+                                    <outlet property="delegate" destination="glS-wF-sEU" id="Dyf-0M-Gwj"/>
+                                </connections>
+                            </textField>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VzR-5a-cmT">
+                                <rect key="frame" x="18" y="134" width="444" height="14"/>
+                                <textFieldCell key="cell" title="FOLDER_AVAILABLE" id="bJr-s6-tdP">
+                                    <font key="font" metaFont="smallSystem"/>
+                                    <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KZf-b0-9cm">
+                                <rect key="frame" x="18" y="101" width="227" height="18"/>
+                                <buttonCell key="cell" type="check" title="Secure this domain after creation" bezelStyle="regularSquare" imagePosition="left" inset="2" id="vFv-Of-2yZ">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                                 <connections>
-                                    <action selector="toggledDynamicIcon:" target="AW2-rV-rbS" id="cuJ-mt-agf"/>
+                                    <action selector="pressedSecure:" target="glS-wF-sEU" id="OIj-Pz-5Ea"/>
                                 </connections>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JrH-aa-AzL">
-                                <rect key="frame" x="148" y="131" width="408" height="14"/>
-                                <textFieldCell key="cell" title="DYN_ICON_DESC" id="MHA-Xt-xgF">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mmQ-7e-dlb">
+                                <rect key="frame" x="18" y="66" width="444" height="28"/>
+                                <textFieldCell key="cell" title="Securing a site requires administrative privileges. 
You will be prompted for your password or Touch ID." id="4gd-KM-5Fu">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="V7b-jv-oCB">
-                                <rect key="frame" x="143" y="75" width="184" height="32"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="170" id="9jD-Bf-T2M"/>
-                                </constraints>
-                                <backgroundFilters>
-                                    <ciFilter name="CIDotScreen">
-                                        <configuration>
-                                            <real key="inputAngle" value="0.0"/>
-                                            <ciVector key="inputCenter">
-                                                <real value="150"/>
-                                                <real value="150"/>
-                                            </ciVector>
-                                            <null key="inputImage"/>
-                                            <real key="inputSharpness" value="0.69999999999999996"/>
-                                            <real key="inputWidth" value="6"/>
-                                        </configuration>
-                                    </ciFilter>
-                                </backgroundFilters>
-                                <buttonCell key="cell" type="push" title="SET_SHORTCUT" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="R63-tN-KVQ">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="register:" target="AW2-rV-rbS" id="4Mj-eM-4eW"/>
-                                </connections>
-                            </button>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YsQ-AZ-Aei">
-                                <rect key="frame" x="325" y="75" width="138" height="32"/>
-                                <buttonCell key="cell" type="push" title="CLEAR_SHORTCUT" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="nvE-5d-VOS">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system" size="11"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="unregister:" target="AW2-rV-rbS" id="2RI-4w-6Td"/>
-                                </connections>
-                            </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5ZK-BG-o1t">
-                                <rect key="frame" x="42" y="85" width="100" height="16"/>
-                                <textFieldCell key="cell" lineBreakMode="clipping" title="PREF_GLOSHO:" id="xiD-8H-p5s">
+                            <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6JT-Vt-3q0">
+                                <rect key="frame" x="20" y="185" width="440" height="22"/>
+                                <pathCell key="cell" selectable="YES" refusesFirstResponder="YES" alignment="left" id="m8d-XF-kh9">
                                     <font key="font" metaFont="system"/>
+                                    <url key="url" string="file:///Users/nicoverbruggen/Code/nicoverbruggen.be/"/>
+                                </pathCell>
+                            </pathControl>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P0B-Ht-R8n">
+                                <rect key="frame" x="18" y="215" width="87" height="16"/>
+                                <textFieldCell key="cell" lineBreakMode="clipping" title="Link a Folder" id="S4j-ZC-ddT">
+                                    <font key="font" textStyle="headline" name=".SFNS-Bold"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="31d-gd-auR">
-                                <rect key="frame" x="18" y="153" width="124" height="16"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="120" id="8dt-Pg-wFI"/>
-                                </constraints>
-                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="PREF_DYN_ICON:" id="E10-ss-Cdz">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1TO-9H-z2d">
-                                <rect key="frame" x="148" y="60" width="101" height="14"/>
-                                <textFieldCell key="cell" title="SHORTCUT_DESC" id="nYP-yi-DBf">
+                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="900-Z2-tID">
+                                <rect key="frame" x="115" y="23" width="128" height="14"/>
+                                <textFieldCell key="cell" lineBreakMode="clipping" title="That link already exists." id="jOt-n6-TQf">
                                     <font key="font" metaFont="smallSystem"/>
-                                    <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
                         </subviews>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="JrH-aa-AzL" secondAttribute="trailing" constant="20" symbolic="YES" id="8iM-Xf-ShU"/>
-                            <constraint firstAttribute="trailing" secondItem="GSr-K5-3yw" secondAttribute="trailing" constant="20" symbolic="YES" id="AT9-5F-6g1"/>
-                            <constraint firstItem="YsQ-AZ-Aei" firstAttribute="leading" secondItem="V7b-jv-oCB" secondAttribute="trailing" constant="12" symbolic="YES" id="Bk6-4V-GLk"/>
-                            <constraint firstItem="31d-gd-auR" firstAttribute="top" secondItem="Pf1-A5-3Xz" secondAttribute="top" constant="20" symbolic="YES" id="C3K-NX-BBl"/>
-                            <constraint firstItem="YsQ-AZ-Aei" firstAttribute="top" secondItem="V7b-jv-oCB" secondAttribute="top" id="DY5-za-saX"/>
-                            <constraint firstItem="MEf-MN-oXt" firstAttribute="leading" secondItem="31d-gd-auR" secondAttribute="trailing" constant="10" id="G5S-JV-re3"/>
-                            <constraint firstItem="V7b-jv-oCB" firstAttribute="firstBaseline" secondItem="5ZK-BG-o1t" secondAttribute="firstBaseline" id="H5D-2D-DLH"/>
-                            <constraint firstItem="1TO-9H-z2d" firstAttribute="leading" secondItem="V7b-jv-oCB" secondAttribute="leading" id="Imk-o0-2fS"/>
-                            <constraint firstItem="JrH-aa-AzL" firstAttribute="leading" secondItem="MEf-MN-oXt" secondAttribute="leading" id="K2H-Af-2qK"/>
-                            <constraint firstItem="5ZK-BG-o1t" firstAttribute="top" secondItem="JrH-aa-AzL" secondAttribute="bottom" constant="30" id="NMk-yt-fha"/>
-                            <constraint firstItem="JrH-aa-AzL" firstAttribute="top" secondItem="MEf-MN-oXt" secondAttribute="bottom" constant="8" symbolic="YES" id="Vf8-fx-H50"/>
-                            <constraint firstItem="MEf-MN-oXt" firstAttribute="firstBaseline" secondItem="31d-gd-auR" secondAttribute="firstBaseline" id="W36-bE-iAT"/>
-                            <constraint firstItem="1TO-9H-z2d" firstAttribute="firstBaseline" secondItem="V7b-jv-oCB" secondAttribute="baseline" constant="25" id="bJG-ed-pch"/>
-                            <constraint firstItem="V7b-jv-oCB" firstAttribute="leading" secondItem="JrH-aa-AzL" secondAttribute="leading" id="bUY-uH-N7A"/>
-                            <constraint firstItem="5ZK-BG-o1t" firstAttribute="trailing" secondItem="31d-gd-auR" secondAttribute="trailing" id="c4g-jO-JUm"/>
-                            <constraint firstAttribute="bottom" secondItem="GSr-K5-3yw" secondAttribute="bottom" constant="20" symbolic="YES" id="dAS-yW-vua"/>
-                            <constraint firstItem="GSr-K5-3yw" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Pf1-A5-3Xz" secondAttribute="leading" constant="20" symbolic="YES" id="mTE-WD-54L"/>
-                            <constraint firstItem="31d-gd-auR" firstAttribute="leading" secondItem="Pf1-A5-3Xz" secondAttribute="leading" constant="20" symbolic="YES" id="o0J-yT-TDX"/>
-                            <constraint firstAttribute="trailing" secondItem="MEf-MN-oXt" secondAttribute="trailing" constant="20" symbolic="YES" id="pJg-zj-cBs"/>
-                            <constraint firstItem="GSr-K5-3yw" firstAttribute="top" secondItem="1TO-9H-z2d" secondAttribute="bottom" constant="20" id="pMZ-Gx-Jmm"/>
+                            <constraint firstItem="VzR-5a-cmT" firstAttribute="trailing" secondItem="ZX9-s1-23i" secondAttribute="trailing" id="06B-dj-IBU"/>
+                            <constraint firstItem="ZX9-s1-23i" firstAttribute="top" secondItem="6JT-Vt-3q0" secondAttribute="bottom" constant="8" symbolic="YES" id="0QU-nI-sYv"/>
+                            <constraint firstAttribute="bottom" secondItem="SwS-o8-pbl" secondAttribute="bottom" constant="20" symbolic="YES" id="24Z-vC-4E8"/>
+                            <constraint firstItem="900-Z2-tID" firstAttribute="centerY" secondItem="PVw-cM-qAB" secondAttribute="centerY" id="578-2f-4x8"/>
+                            <constraint firstItem="ZX9-s1-23i" firstAttribute="leading" secondItem="6JT-Vt-3q0" secondAttribute="trailing" constant="-440" id="6eF-GS-Xcn"/>
+                            <constraint firstItem="6JT-Vt-3q0" firstAttribute="top" secondItem="P0B-Ht-R8n" secondAttribute="bottom" constant="8" symbolic="YES" id="DGN-4k-X0h"/>
+                            <constraint firstItem="P0B-Ht-R8n" firstAttribute="top" secondItem="JJJ-T9-Yuv" secondAttribute="top" constant="20" symbolic="YES" id="F2r-6E-qxh"/>
+                            <constraint firstItem="mmQ-7e-dlb" firstAttribute="top" secondItem="KZf-b0-9cm" secondAttribute="bottom" constant="8" symbolic="YES" id="G21-Vd-tgl"/>
+                            <constraint firstItem="900-Z2-tID" firstAttribute="leading" secondItem="PVw-cM-qAB" secondAttribute="trailing" constant="8" symbolic="YES" id="QzV-vP-fbq"/>
+                            <constraint firstItem="VzR-5a-cmT" firstAttribute="leading" secondItem="ZX9-s1-23i" secondAttribute="leading" id="UPN-Ad-j3X"/>
+                            <constraint firstItem="KZf-b0-9cm" firstAttribute="leading" secondItem="JJJ-T9-Yuv" secondAttribute="leading" constant="20" symbolic="YES" id="Vab-wq-9Nc"/>
+                            <constraint firstAttribute="bottom" secondItem="PVw-cM-qAB" secondAttribute="bottom" constant="20" symbolic="YES" id="VsP-Q0-zRW"/>
+                            <constraint firstItem="ZX9-s1-23i" firstAttribute="leading" secondItem="JJJ-T9-Yuv" secondAttribute="leading" constant="20" symbolic="YES" id="bJ4-Yr-4ah"/>
+                            <constraint firstItem="KZf-b0-9cm" firstAttribute="top" secondItem="VzR-5a-cmT" secondAttribute="bottom" constant="16" id="bdw-P7-FLz"/>
+                            <constraint firstAttribute="trailing" secondItem="SwS-o8-pbl" secondAttribute="trailing" constant="20" symbolic="YES" id="bkx-g2-WCM"/>
+                            <constraint firstAttribute="trailing" secondItem="6JT-Vt-3q0" secondAttribute="trailing" constant="20" symbolic="YES" id="ctg-Gt-34Y"/>
+                            <constraint firstItem="PVw-cM-qAB" firstAttribute="leading" secondItem="JJJ-T9-Yuv" secondAttribute="leading" constant="20" symbolic="YES" id="fE5-T7-e8z"/>
+                            <constraint firstItem="mmQ-7e-dlb" firstAttribute="leading" secondItem="JJJ-T9-Yuv" secondAttribute="leading" constant="20" symbolic="YES" id="fKH-1r-MIf"/>
+                            <constraint firstAttribute="trailing" secondItem="mmQ-7e-dlb" secondAttribute="trailing" constant="20" symbolic="YES" id="hjv-Xq-cxV"/>
+                            <constraint firstItem="6JT-Vt-3q0" firstAttribute="leading" secondItem="P0B-Ht-R8n" secondAttribute="leading" id="jxP-vM-eA9"/>
+                            <constraint firstItem="P0B-Ht-R8n" firstAttribute="leading" secondItem="JJJ-T9-Yuv" secondAttribute="leading" constant="20" symbolic="YES" id="msC-eG-Fop"/>
+                            <constraint firstItem="VzR-5a-cmT" firstAttribute="top" secondItem="ZX9-s1-23i" secondAttribute="bottom" constant="8" symbolic="YES" id="sVP-EV-07F"/>
+                            <constraint firstAttribute="trailing" secondItem="ZX9-s1-23i" secondAttribute="trailing" constant="20" symbolic="YES" id="tZ3-2X-JC9"/>
                         </constraints>
                     </view>
                     <connections>
-                        <outlet property="buttonClearShortcut" destination="YsQ-AZ-Aei" id="1xo-hk-HgM"/>
-                        <outlet property="buttonClose" destination="GSr-K5-3yw" id="d4I-Cf-gXD"/>
-                        <outlet property="buttonDynamicIcon" destination="MEf-MN-oXt" id="qEN-Vg-EZS"/>
-                        <outlet property="buttonSetShortcut" destination="V7b-jv-oCB" id="2aS-S4-cKR"/>
-                        <outlet property="labelDynamicIcon" destination="JrH-aa-AzL" id="CFc-fF-oPq"/>
-                        <outlet property="labelShortcut" destination="1TO-9H-z2d" id="paF-hK-78x"/>
-                        <outlet property="leftLabelDynamicIcon" destination="31d-gd-auR" id="ANZ-Zs-4d7"/>
-                        <outlet property="leftLabelGlobalShortcut" destination="5ZK-BG-o1t" id="73E-9i-cg8"/>
+                        <outlet property="buttonCreateLink" destination="PVw-cM-qAB" id="0Oo-xW-He7"/>
+                        <outlet property="buttonSecure" destination="KZf-b0-9cm" id="5A7-Bn-NB7"/>
+                        <outlet property="linkName" destination="ZX9-s1-23i" id="yT6-80-Zr1"/>
+                        <outlet property="pathControl" destination="6JT-Vt-3q0" id="f5K-8h-VOd"/>
+                        <outlet property="pressedCancel" destination="SwS-o8-pbl" id="cLR-Yn-TSs"/>
+                        <outlet property="previewText" destination="VzR-5a-cmT" id="qwd-wX-645"/>
+                        <outlet property="textFieldError" destination="900-Z2-tID" id="qUk-FE-IKW"/>
+                        <outlet property="textFieldSecure" destination="mmQ-7e-dlb" id="LeA-YS-hRM"/>
+                        <outlet property="textFieldTitle" destination="P0B-Ht-R8n" id="Qh8-qv-6iR"/>
                     </connections>
                 </viewController>
-                <customObject id="eQC-8B-FkX" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+                <customObject id="6XV-bG-0N1" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="264" y="399.5"/>
+            <point key="canvasLocation" x="277" y="1137.5"/>
+        </scene>
+        <!--Site ListVC-->
+        <scene sceneID="aZt-6w-TFl">
+            <objects>
+                <viewController identifier="siteList" storyboardIdentifier="siteList" id="JZI-Vd-9oq" customClass="SiteListVC" customModule="PHP_Monitor" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" id="rIZ-4U-bhj">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="309"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <scrollView autohidesScrollers="YES" horizontalLineScroll="54" horizontalPageScroll="10" verticalLineScroll="54" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p0j-eB-I2i">
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="309"/>
+                                <clipView key="contentView" id="6IL-DW-37w">
+                                    <rect key="frame" x="1" y="1" width="598" height="307"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="54" rowSizeStyle="automatic" viewBased="YES" id="cp3-34-pQj">
+                                            <rect key="frame" x="0.0" y="0.0" width="598" height="307"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            <size key="intercellSpacing" width="17" height="0.0"/>
+                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                            <tableColumns>
+                                                <tableColumn width="586" minWidth="40" maxWidth="10000" id="oeH-B2-0rA">
+                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
+                                                        <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                                    </tableHeaderCell>
+                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="Ith-sv-3bo">
+                                                        <font key="font" metaFont="system"/>
+                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                    <prototypeCellViews>
+                                                        <tableCellView identifier="siteItem" wantsLayer="YES" id="5GY-nN-BWd" customClass="SiteListCell" customModule="PHP_Monitor" customModuleProvider="target">
+                                                            <rect key="frame" x="8" y="0.0" width="581" height="54"/>
+                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                            <subviews>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="XJL-Uw-frD">
+                                                                    <rect key="frame" x="38" 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"/>
+                                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                    </textFieldCell>
+                                                                </textField>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="CXK-Q9-CpO">
+                                                                    <rect key="frame" x="38" 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"/>
+                                                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                    </textFieldCell>
+                                                                </textField>
+                                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QPX-eu-eV8">
+                                                                    <rect key="frame" x="10" y="22" width="20" height="20"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="20" id="Bmk-CN-Yyn"/>
+                                                                        <constraint firstAttribute="height" constant="20" id="d4z-lb-Ww0"/>
+                                                                    </constraints>
+                                                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Lock" id="aJ0-ia-YrZ"/>
+                                                                </imageView>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jKi-Ls-7FZ">
+                                                                    <rect key="frame" x="474" y="28" width="64" height="11"/>
+                                                                    <textFieldCell key="cell" lineBreakMode="clipping" title="DRIVER TYPE" id="fjd-eb-itv">
+                                                                        <font key="font" metaFont="miniSystem"/>
+                                                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                    </textFieldCell>
+                                                                </textField>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TbX-e2-3QL">
+                                                                    <rect key="frame" x="474" y="15" width="36" height="14"/>
+                                                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Driver" id="GMt-SG-vFl">
+                                                                        <font key="font" metaFont="smallSystem"/>
+                                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                    </textFieldCell>
+                                                                </textField>
+                                                                <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="syz-LF-l6P">
+                                                                    <rect key="frame" x="0.0" y="-2" width="581" height="5"/>
+                                                                </box>
+                                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0NQ-ZD-CqD">
+                                                                    <rect key="frame" x="450" y="18" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="18" id="Suw-gm-AEi"/>
+                                                                        <constraint firstAttribute="height" constant="18" id="qO6-vg-5nC"/>
+                                                                    </constraints>
+                                                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="IconLinked" id="2ng-pK-kvv"/>
+                                                                    <color key="contentTintColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                                                </imageView>
+                                                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3xt-wC-hUJ">
+                                                                    <rect key="frame" x="363" y="18" width="75" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="75" id="VI8-MP-7Hv"/>
+                                                                    </constraints>
+                                                                    <buttonCell key="cell" type="inline" title=" PHP X.X" bezelStyle="inline" alignment="center" borderStyle="border" inset="2" id="anZ-hP-G0R">
+                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                        <font key="font" metaFont="smallSystemBold"/>
+                                                                    </buttonCell>
+                                                                    <color key="contentTintColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                                    <connections>
+                                                                        <action selector="pressedPhpVersion:" target="5GY-nN-BWd" id="mB5-WD-aZy"/>
+                                                                    </connections>
+                                                                </button>
+                                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5aN-ZI-D7U">
+                                                                    <rect key="frame" x="341" y="20" width="14" height="14"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="14" id="NKD-Pc-okU"/>
+                                                                        <constraint firstAttribute="width" constant="14" id="wrl-lJ-3eN"/>
+                                                                    </constraints>
+                                                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Checkmark" id="R5o-Cd-a91"/>
+                                                                    <color key="contentTintColor" name="systemGreenColor" catalog="System" colorSpace="catalog"/>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="0NQ-ZD-CqD" firstAttribute="leading" secondItem="3xt-wC-hUJ" secondAttribute="trailing" constant="12" id="2G8-Ow-FTu"/>
+                                                                <constraint firstItem="3xt-wC-hUJ" firstAttribute="leading" secondItem="5aN-ZI-D7U" secondAttribute="trailing" constant="8" symbolic="YES" id="39Z-nB-kXx"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="TbX-e2-3QL" secondAttribute="trailing" constant="20" symbolic="YES" id="3vE-LR-S7N"/>
+                                                                <constraint firstItem="TbX-e2-3QL" firstAttribute="leading" secondItem="0NQ-ZD-CqD" secondAttribute="trailing" constant="8" symbolic="YES" id="4cb-D9-8d1"/>
+                                                                <constraint firstItem="XJL-Uw-frD" firstAttribute="leading" secondItem="QPX-eu-eV8" secondAttribute="trailing" constant="10" id="55y-3V-RYt"/>
+                                                                <constraint firstItem="syz-LF-l6P" firstAttribute="leading" secondItem="5GY-nN-BWd" secondAttribute="leading" id="8QK-nf-Fiw"/>
+                                                                <constraint firstItem="QPX-eu-eV8" firstAttribute="top" secondItem="XJL-Uw-frD" secondAttribute="top" id="9QB-jZ-k1V"/>
+                                                                <constraint firstItem="QPX-eu-eV8" firstAttribute="leading" secondItem="5GY-nN-BWd" secondAttribute="leading" constant="10" id="GOj-sw-ZlZ"/>
+                                                                <constraint firstItem="TbX-e2-3QL" firstAttribute="top" secondItem="jKi-Ls-7FZ" secondAttribute="bottom" constant="-1" id="J29-wT-Uex"/>
+                                                                <constraint firstItem="CXK-Q9-CpO" firstAttribute="leading" secondItem="XJL-Uw-frD" secondAttribute="leading" id="Ojw-VZ-3EG"/>
+                                                                <constraint firstAttribute="trailing" secondItem="syz-LF-l6P" secondAttribute="trailing" id="PWd-5k-AlD"/>
+                                                                <constraint firstItem="XJL-Uw-frD" firstAttribute="top" secondItem="5GY-nN-BWd" secondAttribute="top" constant="12" id="QeE-c7-I9U"/>
+                                                                <constraint firstItem="0NQ-ZD-CqD" firstAttribute="centerY" secondItem="5GY-nN-BWd" secondAttribute="centerY" id="Utr-aa-tqX"/>
+                                                                <constraint firstItem="CXK-Q9-CpO" firstAttribute="top" secondItem="XJL-Uw-frD" secondAttribute="bottom" id="VKg-Vq-sYa"/>
+                                                                <constraint firstItem="5aN-ZI-D7U" firstAttribute="centerY" secondItem="3xt-wC-hUJ" secondAttribute="centerY" id="a6n-E2-i2x"/>
+                                                                <constraint firstItem="TbX-e2-3QL" firstAttribute="centerY" secondItem="5GY-nN-BWd" secondAttribute="centerY" constant="5" id="cN8-zO-fnc"/>
+                                                                <constraint firstAttribute="bottom" secondItem="syz-LF-l6P" secondAttribute="bottom" id="gj7-cJ-Lle"/>
+                                                                <constraint firstItem="0NQ-ZD-CqD" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="CXK-Q9-CpO" secondAttribute="trailing" constant="8" symbolic="YES" id="iEd-Y3-zhp"/>
+                                                                <constraint firstItem="0NQ-ZD-CqD" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="XJL-Uw-frD" secondAttribute="trailing" constant="8" symbolic="YES" id="lLA-Jx-Q4W"/>
+                                                                <constraint firstItem="3xt-wC-hUJ" firstAttribute="centerY" secondItem="5GY-nN-BWd" secondAttribute="centerY" id="vhb-WC-3NC"/>
+                                                                <constraint firstAttribute="trailing" secondItem="jKi-Ls-7FZ" secondAttribute="trailing" constant="45" id="vwD-Sg-Lzc"/>
+                                                                <constraint firstItem="jKi-Ls-7FZ" firstAttribute="leading" secondItem="TbX-e2-3QL" secondAttribute="leading" id="zjN-s3-2Ww"/>
+                                                            </constraints>
+                                                            <connections>
+                                                                <outlet property="buttonPhpVersion" destination="3xt-wC-hUJ" id="LpB-7n-qUr"/>
+                                                                <outlet property="imageViewLock" destination="QPX-eu-eV8" id="Nnh-kB-adG"/>
+                                                                <outlet property="imageViewPhpVersionOK" destination="5aN-ZI-D7U" id="ePz-Cb-dWk"/>
+                                                                <outlet property="imageViewType" destination="0NQ-ZD-CqD" id="Cph-FN-LaY"/>
+                                                                <outlet property="labelDriver" destination="TbX-e2-3QL" id="qJh-Ak-Dge"/>
+                                                                <outlet property="labelPathName" destination="CXK-Q9-CpO" id="iVZ-cL-azB"/>
+                                                                <outlet property="labelSiteName" destination="XJL-Uw-frD" id="f0t-vd-W68"/>
+                                                            </connections>
+                                                        </tableCellView>
+                                                    </prototypeCellViews>
+                                                </tableColumn>
+                                            </tableColumns>
+                                            <connections>
+                                                <outlet property="dataSource" destination="JZI-Vd-9oq" id="sbf-YF-ENF"/>
+                                                <outlet property="delegate" destination="JZI-Vd-9oq" id="kal-o7-c23"/>
+                                            </connections>
+                                        </tableView>
+                                    </subviews>
+                                </clipView>
+                                <constraints>
+                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="300" id="R3Z-g3-tYQ"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="600" id="iRQ-sz-oyv"/>
+                                </constraints>
+                                <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="TDE-ff-DQT">
+                                    <rect key="frame" x="1" y="293" width="598" height="15"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </scroller>
+                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="wFn-93-f10">
+                                    <rect key="frame" x="558" y="29" width="15" height="225"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </scroller>
+                            </scrollView>
+                            <progressIndicator maxValue="100" displayedWhenStopped="NO" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="ZiS-Gq-TLQ">
+                                <rect key="frame" x="285" y="150" width="30" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="30" id="XK3-AR-Oc0"/>
+                                    <constraint firstAttribute="height" constant="30" id="lfW-dB-Eu3"/>
+                                </constraints>
+                            </progressIndicator>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="p0j-eB-I2i" firstAttribute="leading" secondItem="rIZ-4U-bhj" secondAttribute="leading" id="2Tx-yb-xrv"/>
+                            <constraint firstItem="p0j-eB-I2i" firstAttribute="top" secondItem="rIZ-4U-bhj" secondAttribute="top" id="Pst-5A-dI0"/>
+                            <constraint firstAttribute="bottom" secondItem="p0j-eB-I2i" secondAttribute="bottom" id="QEw-5m-u1s"/>
+                            <constraint firstItem="ZiS-Gq-TLQ" firstAttribute="centerY" secondItem="rIZ-4U-bhj" secondAttribute="centerY" constant="-10" id="XqX-Tf-8ck"/>
+                            <constraint firstItem="ZiS-Gq-TLQ" firstAttribute="centerX" secondItem="rIZ-4U-bhj" secondAttribute="centerX" id="eD8-TV-7dF"/>
+                            <constraint firstAttribute="trailing" secondItem="p0j-eB-I2i" secondAttribute="trailing" id="zWH-TD-RZv"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="progressIndicator" destination="ZiS-Gq-TLQ" id="Ylb-Vk-uub"/>
+                        <outlet property="tableView" destination="cp3-34-pQj" id="sdw-Ac-27X"/>
+                    </connections>
+                </viewController>
+                <customObject id="HgD-aB-bQb" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="251" y="742"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="Checkmark" width="512" height="512"/>
+        <image name="IconLinked" width="512" height="512"/>
+        <image name="Lock" width="30" height="30"/>
+        <image name="arrow.clockwise" catalog="system" width="14" height="16"/>
+        <image name="plus" catalog="system" width="14" height="13"/>
+    </resources>
 </document>

phpmon/Domain/Core/Startup.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import AppKit
 
 class Startup {
     
@@ -26,7 +27,7 @@ class Startup {
         performEnvironmentCheck(
             !Shell.fileExists("\(Paths.binPath)/php"),
             messageText:        "startup.errors.php_binary.title".localized,
-            informativeText:    "startup.errors.php_binary_desc".localized,
+            informativeText:    "startup.errors.php_binary.desc".localized,
             breaking:           true
         )
         
@@ -56,10 +57,9 @@ class Startup {
         )
         
         performEnvironmentCheck(
-            // Check for Valet; it can be symlinked or in .composer/vendor/bin
+            // Check for Valet; it MUST be symlinked thanks to sudoers
             !(Shell.pipe("cat /private/etc/sudoers.d/valet").contains("/usr/local/bin/valet")
                 || Shell.pipe("cat /private/etc/sudoers.d/valet").contains("/opt/homebrew/bin/valet")
-                || Shell.pipe("cat /private/etc/sudoers.d/valet").contains(".composer/vendor/bin/valet")
             ),
             messageText:        "startup.errors.sudoers_valet.title".localized,
             informativeText:    "startup.errors.sudoers_valet.desc".localized,
@@ -75,37 +75,30 @@ class Startup {
         )
         
         if (!failed) {
-            determineBrewAliasVersion()
+            initializeSwitcher()
+            Log.info("PHP Monitor has determined the application has successfully passed all checks.")
             success()
         }
     }
     
     /**
-     * In order to avoid having to hard-code which version of PHP is aliased to what specific subversion,
-     * PHP Monitor now determines the alias by checking the user's system.
+     Because the Switcher requires various environment guarantees, the switcher is only
+     initialized when it is done working.
      */
-    private func determineBrewAliasVersion()
-    {
-        print("PHP Monitor has determined the application has successfully passed all checks.")
-        print("Determining which version of PHP is aliased to `php` via Homebrew...")
-        
-        let brewPhpAlias = Shell.pipe("\(Paths.brew) info php --json");
-        
-        App.shared.brewPhpPackage = try! JSONDecoder().decode(
-            [HomebrewPackage].self,
-            from: brewPhpAlias.data(using: .utf8)!
-        ).first!
-        
-        print("When on your system, the `php` formula means version \(App.shared.brewPhpVersion)!")
+    private func initializeSwitcher() {
+        DispatchQueue.main.async {
+            let appDelegate = NSApplication.shared.delegate as! AppDelegate
+            appDelegate.initializeSwitcher()
+        }
     }
-    
+
     /**
-     * Perform an environment check. Will cause the application to terminate, if `breaking` is set to true.
-     *
-     * - Parameter condition: Fail condition to check for; if this returns `true`, the alert will be shown
-     * - Parameter messageText: Short description of what is wrong
-     * - Parameter informativeText: Expanded description of the environment check that failed
-     * - Parameter breaking: If the application should terminate afterwards
+     Perform an environment check. Will cause the application to terminate, if `breaking` is set to true.
+     
+     - Parameter condition: Fail condition to check for; if this returns `true`, the alert will be shown
+     - Parameter messageText: Short description of what is wrong
+     - Parameter informativeText: Expanded description of the environment check that failed
+     - Parameter breaking: If the application should terminate afterwards
      */
     private func performEnvironmentCheck(
         _ condition: Bool,
@@ -119,7 +112,11 @@ class Startup {
 
         DispatchQueue.main.async { [self] in
             // Present the information to the user
-            Alert.notify(message: messageText, info: informativeText)
+            Alert.notify(
+                message: messageText,
+                info: informativeText,
+                style: breaking ? .critical : .warning
+            )
             // Only breaking issues will throw the extra retry modal
             breaking ? failureCallback() : ()
         }

phpmon/Domain/Extensions/StringExtension.swift

@@ -12,6 +12,10 @@ extension String {
         return NSLocalizedString(self, tableName: nil, bundle: Bundle.main, value: "", comment: "")
     }
     
+    func localized(_ args: CVarArg...) -> String {
+        String(format: self.localized, arguments: args)
+    }
+    
     func countInstances(of stringToFind: String) -> Int {
         if (stringToFind.isEmpty) {
             return 0
@@ -34,4 +38,37 @@ extension String {
         return String(self[start ..< end])
     }
     
+    // Code taken from: https://sarunw.com/posts/how-to-compare-two-app-version-strings-in-swift/
+    /*
+     <1> We split the version by period (.).
+     <2> Then, we find the difference of digit that we will zero pad.
+     <3> If there are no differences, we don't need to do anything and use simple .compare.
+     <4> We populate an array of missing zero.
+     <5> We add zero pad array to a version with a fewer period and zero.
+     <6> We user array components to build back our versions from components and compare them.
+         This time it will have the same period and number of digit.
+     */
+    func versionCompare(_ otherVersion: String) -> ComparisonResult {
+        let versionDelimiter = "."
+        
+        var versionComponents = self.components(separatedBy: versionDelimiter) // <1>
+        var otherVersionComponents = otherVersion.components(separatedBy: versionDelimiter)
+        
+        let zeroDiff = versionComponents.count - otherVersionComponents.count // <2>
+        
+        if zeroDiff == 0 { // <3>
+            // Same format, compare normally
+            return self.compare(otherVersion, options: .numeric)
+        } else {
+            let zeros = Array(repeating: "0", count: abs(zeroDiff)) // <4>
+            if zeroDiff > 0 {
+                otherVersionComponents.append(contentsOf: zeros) // <5>
+            } else {
+                versionComponents.append(contentsOf: zeros)
+            }
+            return versionComponents.joined(separator: versionDelimiter)
+                .compare(otherVersionComponents.joined(separator: versionDelimiter), options: .numeric) // <6>
+        }
+    }
+    
 }

phpmon/Domain/Helpers/Alert.swift

@@ -13,9 +13,11 @@ class Alert {
         messageText: String,
         informativeText: String,
         buttonTitle: String = "OK",
-        secondButtonTitle: String = ""
+        secondButtonTitle: String = "",
+        style: NSAlert.Style = .informational
     ) -> Bool {
         let alert = NSAlert.init()
+        alert.alertStyle = style
         alert.messageText = messageText
         alert.informativeText = informativeText
         alert.addButton(withTitle: buttonTitle)
@@ -25,8 +27,37 @@ class Alert {
         return alert.runModal() == .alertFirstButtonReturn
     }
     
-    public static func notify(message: String, info: String) {
-        _ = self.present(messageText: message, informativeText: info, buttonTitle: "OK", secondButtonTitle: "")
+    public static func confirm(
+        onWindow window: NSWindow,
+        messageText: String,
+        informativeText: String,
+        buttonTitle: String = "OK",
+        secondButtonTitle: String = "Cancel",
+        style: NSAlert.Style = .warning,
+        onFirstButtonPressed: @escaping (() -> Void)
+    ) {
+        let alert = NSAlert.init()
+        alert.alertStyle = style
+        alert.messageText = messageText
+        alert.informativeText = informativeText
+        alert.addButton(withTitle: buttonTitle)
+        if (!secondButtonTitle.isEmpty) {
+            alert.addButton(withTitle: secondButtonTitle)
+        }
+        alert.beginSheetModal(for: window) { response in
+            if response == .alertFirstButtonReturn {
+                onFirstButtonPressed()
+            }
+        }
     }
     
+    public static func notify(message: String, info: String, style: NSAlert.Style = .informational) {
+        _ = present(
+            messageText: message,
+            informativeText: info,
+            buttonTitle: "OK",
+            secondButtonTitle: "",
+            style: style
+        )
+    }    
 }

phpmon/Domain/Helpers/Application.swift

@@ -0,0 +1,63 @@
+//
+//  Editor.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 07/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+/// An application that is capable of opening a particular directory (usually of a PHP project).
+/// In most cases this is going to be a code editor, but it could also be another application
+/// that supports opening those directories, like a visual Git client or a terminal app.
+class Application {
+    
+    enum AppType {
+        case editor, browser, git_gui, terminal, user_supplied
+    }
+    
+    /// Name of the app. Used for display purposes and to determine `name.app` exists.
+    let name: String
+    
+    /// Application type. Depending on the type, a different action might occur.
+    let type: AppType
+    
+    /// Initializer. Used to detect a specific app of a specific type.
+    init(_ name: String, _ type: AppType) {
+        self.name = name
+        self.type = type
+    }
+    
+    /**
+     Attempt to open a specific directory in the app of choice.
+     (This will open the app if it isn't open yet.)
+     */
+    @objc public func openDirectory(file: String) {
+        return Shell.run("/usr/bin/open -a \"\(name)\" \"\(file)\"")
+    }
+    
+    /** Checks if the app is installed. */
+    func isInstalled() -> Bool {
+        // If this script does not complain, the app exists!
+        return Shell.user.executeSynchronously(
+            "/usr/bin/open -Ra \"\(name)\"",
+            requiresPath: false
+        ).task.terminationStatus == 0
+    }
+    
+    /**
+     Detect which apps are available to open a specific directory.
+     */
+    static public func detectPresetApplications() -> [Application] {
+        return [
+            Application("PhpStorm", .editor),
+            Application("Visual Studio Code", .editor),
+            Application("Sublime Text", .editor),
+            Application("Sublime Merge", .git_gui),
+            Application("iTerm", .terminal)
+        ].filter {
+            return $0.isInstalled()
+        }
+    }
+}

phpmon/Domain/Helpers/Async.swift

@@ -0,0 +1,20 @@
+//
+//  Async.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 23/01/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+public func runAsync(_ execute: @escaping () -> Void, completion: @escaping () -> Void = {})
+{
+    DispatchQueue.global(qos: .userInitiated).async {
+        execute()
+        
+        DispatchQueue.main.async {
+            completion()
+        }
+    }
+}

phpmon/Domain/Helpers/Filesystem.swift

@@ -0,0 +1,23 @@
+//
+//  FileSystem.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 07/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+class Filesystem {
+    
+    /**
+     Checks if a file exists at the provided path.
+     Uses `FileManager`.
+     */
+    public static func fileExists(_ path: String) -> Bool {
+        return FileManager.default.fileExists(
+            atPath: path.replacingOccurrences(of: "~", with: "/Users/\(Paths.whoami)")
+        )
+    }
+    
+}

phpmon/Domain/Helpers/HomebrewPackage.swift

@@ -1,20 +0,0 @@
-//
-//  HomebrewPackage.swift
-//  PHP Monitor
-//
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-struct HomebrewPackage : Decodable {
-    
-    let name: String
-    let full_name: String
-    let aliases: [String]
-    
-    public var version: String {
-        return aliases.first!.replacingOccurrences(of: "php@", with: "")
-    }
-    
-}

phpmon/Domain/Helpers/LocalNotification.swift

@@ -6,14 +6,28 @@
 //
 
 import Foundation
+import UserNotifications
 
 class LocalNotification {
     
     public static func send(title: String, subtitle: String) {
-        let notification = NSUserNotification()
-        notification.title = title
-        notification.subtitle = subtitle
-        NSUserNotificationCenter.default.deliver(notification)
+        let content = UNMutableNotificationContent()
+        content.title = title
+        content.body = subtitle
+        
+        let uuidString = UUID().uuidString
+        let request = UNNotificationRequest(
+            identifier: uuidString,
+            content: content,
+            trigger: nil
+        )
+        
+        let notificationCenter = UNUserNotificationCenter.current()
+        notificationCenter.add(request) { (error) in
+            if error != nil {
+                Log.err(error!)
+            }
+        }
     }
     
 }

phpmon/Domain/Helpers/MenuBarImageGenerator.swift

@@ -41,6 +41,7 @@ class MenuBarImageGenerator {
         let textRect = CGRect(x: padding, y: 0.5, width: image.size.width, height: image.size.height)
         
         let targetImage: NSImage = NSImage(size: image.size)
+        
         let rep: NSBitmapImageRep = NSBitmapImageRep(
             bitmapDataPlanes: nil,
             pixelsWide: Int(image.size.width),
@@ -56,7 +57,7 @@ class MenuBarImageGenerator {
         
         targetImage.addRepresentation(rep)
         targetImage.lockFocus()
-        
+
         image.draw(in: imageRect)
         text.draw(in: textRect, withAttributes: textFontAttributes)
         
@@ -64,4 +65,34 @@ class MenuBarImageGenerator {
         return targetImage
     }
     
+    public static func textToImageWithIcon(text: String) -> NSImage {
+        let textImage = self.textToImage(text: text)
+        let iconImage = NSImage(named: "StatusBarPHP")!
+        let iconWidthSize = iconImage.size.width
+        let divider = iconWidthSize
+        
+        let imageRect = CGRect(
+            x: 0,
+            y: 0,
+            width: textImage.size.width + divider,
+            height: textImage.size.height
+        )
+        
+        let image: NSImage = NSImage(size: imageRect.size)
+        image.lockFocus()
+        
+        let difference = imageRect.size.width - textImage.size.width
+        
+        textImage.draw(in: imageRect, from: NSRect(
+            x: -difference,
+            y: 0, width: textImage.size.width + difference,
+            height: textImage.size.height
+        ), operation: .overlay, fraction: 1)
+        
+        iconImage.draw(in: imageRect, from: NSRect(x: 0, y: 0, width: imageRect.size.width * 1.6, height: imageRect.size.height * 2.0), operation: .overlay, fraction: 1)
+        
+        image.unlockFocus()
+        return image
+    }
+    
 }

phpmon/Domain/Helpers/PMWindowController.swift

@@ -0,0 +1,52 @@
+//
+//  PMWindowController.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 05/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+/**
+ This window class keeps track of which windows are currently visible, and reports this info back to the App class.
+ For more information, check the `windows` property on `App`.
+ 
+ - Note: This class does make a simple assumption: each window controller corresponds to a single view.
+ */
+class PMWindowController: NSWindowController, NSWindowDelegate {
+    
+    public var windowName: String {
+        fatalError("Please specify a window name")
+    }
+    
+    override func showWindow(_ sender: Any?) {
+        super.showWindow(sender)
+        App.shared.register(window: windowName)
+    }
+    
+    func windowWillClose(_ notification: Notification) {
+        App.shared.remove(window: windowName)
+    }
+    
+    deinit {
+        Log.perf("Window controller '\(windowName)' was deinitialized")
+    }
+    
+}
+
+extension NSWindowController {
+    
+    public func positionWindowInTopLeftCorner() {
+        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,
+            width: window.frame.width,
+            height: window.frame.height
+        ), display: true)
+    }
+    
+}

phpmon/Domain/Helpers/Timer.swift

@@ -0,0 +1,32 @@
+//
+//  BenchmarkTimer.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 10/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class BenchmarkTimer {
+    let startTime: CFAbsoluteTime
+    var endTime: CFAbsoluteTime?
+
+    init() {
+        startTime = CFAbsoluteTimeGetCurrent()
+    }
+
+    func stop() -> CFAbsoluteTime {
+        endTime = CFAbsoluteTimeGetCurrent()
+
+        return duration!
+    }
+
+    var duration: CFAbsoluteTime? {
+        if let endTime = endTime {
+            return endTime - startTime
+        } else {
+            return nil
+        }
+    }
+}

phpmon/Domain/Helpers/VersionExtractor.swift

@@ -0,0 +1,37 @@
+//
+//  VersionExtractor.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 16/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class VersionExtractor {
+    
+    public static func from(_ string: String) -> String? {
+        let regex = try! NSRegularExpression(
+            pattern: #"Laravel Valet (?<version>(\d+)(.)(\d+)((.)(\d+))?)"#,
+            options: []
+        )
+        
+        let match = regex.matches(
+            in: string,
+            options: [],
+            range: NSMakeRange(0, string.count)
+        ).first
+        
+        guard let match = match else {
+            return nil
+        }
+        
+        let range = Range(
+            match.range(withName: "version"),
+            in: string
+        )!
+        
+        return String(string[range])
+    }
+    
+}

phpmon/Domain/Integrations/Composer/ComposerJson.swift

@@ -0,0 +1,59 @@
+//
+//  ComposerJson.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 04/01/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+struct ComposerJson: Decodable {
+    let dependencies: Dictionary<String, String>?
+    let devDependencies: Dictionary<String, String>?
+    let configuration: Config?
+    
+    public func getPhpVersion() -> (String, String) {
+        // Check if in platform
+        if configuration?.platform?.php != nil {
+            return (configuration!.platform!.php!, "platform")
+        }
+        
+        // Check if in dependencies
+        if dependencies?["php"] != nil {
+            return (dependencies!["php"]!, "require")
+        }
+        
+        // Unknown!
+        return ("", "unknown")
+    }
+    
+    public func getNotableDependencies() -> [String: String] {
+        var notable: [String: String] = [:]
+        let scan = ["php", "laravel/framework"]
+        
+        scan.forEach { dependency in
+            if dependencies?[dependency] != nil {
+                notable[dependency] = dependencies![dependency]
+            }
+        }
+
+        return notable
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case dependencies = "require"
+        case devDependencies = "require-dev"
+        case configuration = "config"
+    }
+    
+    struct Config: Decodable {
+        let platform: Platform?
+    }
+    
+    struct Platform: Decodable {
+        let php: String?
+    }
+}
+
+

phpmon/Domain/Integrations/Homebrew/HomebrewDiagnostics.swift

@@ -0,0 +1,70 @@
+//
+//  AliasConflict.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 28/11/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class HomebrewDiagnostics {
+    
+    enum Errors: String {
+        case aliasConflict = "alias_conflict"
+    }
+    
+    static let shared = HomebrewDiagnostics()
+    var errors: [HomebrewDiagnostics.Errors] = []
+
+    init() {
+        if determineAliasConflicts() {
+            errors.append(.aliasConflict)
+        }
+    }
+    
+    /**
+     It is possible to have the `shivammathur/php` tap installed, and for the core homebrew information to be outdated.
+     This will then result in two different aliases claiming to point to the same formula (`php`).
+     This will break all linking functionality in PHP Monitor, and the user needs to be informed of this.
+     
+     This check only needs to be performed if the `shivammathur/php` tap is active.
+     */
+    public func determineAliasConflicts() -> Bool
+    {
+        let tapAlias = Shell.pipe("\(Paths.brew) info shivammathur/php/php --json")
+        
+        if tapAlias.contains("brew tap shivammathur/php") || tapAlias.contains("Error") {
+            Log.info("The user does not appear to have tapped: shivammathur/php")
+            return false
+        } else {
+            Log.info("The user DOES have the following tapped: shivammathur/php")
+            Log.info("Checking for `php` formula conflicts...")
+            
+            let tapPhp = try! JSONDecoder().decode(
+                [HomebrewPackage].self,
+                from: tapAlias.data(using: .utf8)!
+            ).first!
+            
+            if tapPhp.version != PhpEnv.brewPhpVersion {
+                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.brewPhpVersion)
+                
+                if bothInstalled {
+                    Log.warn("Both conflicting aliases seem to be installed, warning the user!")
+                } else {
+                    Log.info("Conflicting aliases are not both installed, seems fine!")
+                }
+                
+                return bothInstalled
+            }
+            
+            Log.info("All seems to be OK. No conflicts, both are PHP \(tapPhp.version).")
+            
+            return false
+        }
+    }
+}

phpmon/Domain/Integrations/Valet/Valet.swift

@@ -0,0 +1,249 @@
+//
+//  Valet.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 29/11/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class Valet {
+    
+    static let shared = Valet()
+    
+    /// The version of Valet that was detected.
+    var version: String
+    
+    /// The Valet configuration file.
+    var config: Valet.Configuration
+    
+    /// A cached list of sites that were detected after analyzing the paths set up for Valet.
+    var sites: [Site] = []
+    
+    init() {
+        version = VersionExtractor.from(valet("--version"))
+            ?? "UNKNOWN"
+        
+        let file = FileManager.default.homeDirectoryForCurrentUser
+            .appendingPathComponent(".config/valet/config.json")
+        
+        config = try! JSONDecoder().decode(
+            Valet.Configuration.self,
+            from: try! String(contentsOf: file, encoding: .utf8).data(using: .utf8)!
+        )
+        
+        self.sites = []
+    }
+    
+    public func startPreloadingSites() {
+        let maximumPreload = 10
+        let foundSites = self.countPaths()
+        if foundSites <= maximumPreload {
+            // Preload the sites and their drivers
+            Log.info("Fewer than or \(maximumPreload) sites found, preloading list of sites...")
+            self.reloadSites()
+        } else {
+            Log.info("\(foundSites) sites found, exceeds \(maximumPreload) for preload at launch!")
+        }
+    }
+    
+    public func reloadSites() {
+        resolvePaths(tld: config.tld)
+    }
+    
+    public func validateVersion() -> Void {
+        if version == "UNKNOWN" {
+            return Log.warn("The Valet version could not be extracted... that does not bode well.")
+        }
+        
+        if version.versionCompare(Constants.MinimumRecommendedValetVersion) == .orderedAscending {
+            let version = version
+            Log.warn("Valet version \(version) is too old! (recommended: \(Constants.MinimumRecommendedValetVersion))")
+            DispatchQueue.main.async {
+                Alert.notify(message: "alert.min_valet_version.title".localized, info: "alert.min_valet_version.info".localized(version, Constants.MinimumRecommendedValetVersion))
+            }
+        } else {
+            Log.info("Valet version \(version) is recent enough, OK (recommended: \(Constants.MinimumRecommendedValetVersion))")
+        }
+    }
+    
+    /**
+     Returns a count of how many sites are linked and parked.
+     */
+    private func countPaths() -> Int {
+        var count = 0
+        for path in config.paths {
+            let entries = try! FileManager.default.contentsOfDirectory(atPath: path)
+            for entry in entries {
+                if resolveSite(entry, forPath: path) {
+                    count += 1
+                }
+            }
+        }
+        return count
+    }
+    
+    /**
+     Resolves all paths and creates linked or parked site instances that can be referenced later.
+     */
+    private func resolvePaths(tld: String) {
+        sites = []
+        
+        for path in config.paths {
+            let entries = try! FileManager.default.contentsOfDirectory(atPath: path)
+            for entry in entries {
+                resolvePath(entry, forPath: path, tld: tld)
+            }
+        }
+        
+        sites = sites.sorted { $0.absolutePath < $1.absolutePath }
+    }
+    
+    /**
+     Determines whether the site can be resolved as a symbolic link or as a directory.
+     Regular files are ignored. Returns true if the path can be parsed.
+     */
+    private func resolveSite(_ entry: String, forPath path: String) -> Bool {
+        let siteDir = path + "/" + entry
+
+        let attrs = try! FileManager.default.attributesOfItem(atPath: siteDir)
+        
+        let type = attrs[FileAttributeKey.type] as! FileAttributeType
+        
+        if type == FileAttributeType.typeSymbolicLink || type == FileAttributeType.typeDirectory {
+            return true
+        }
+        
+        return false
+    }
+    
+    /**
+     Determines whether the site can be resolved as a symbolic link or as a directory.
+     Regular files are ignored, and the site is added to Valet's list of sites.
+     */
+    private func resolvePath(_ entry: String, forPath path: String, tld: String) {
+        let siteDir = path + "/" + entry
+        
+        // See if the file is a symlink, if so, resolve it
+        let attrs = try! FileManager.default.attributesOfItem(atPath: siteDir)
+        
+        // We can also determine whether the thing at the path is a directory, too
+        let type = attrs[FileAttributeKey.type] as! FileAttributeType
+        
+        // We should also check that we can interpret the path correctly
+        if URL(fileURLWithPath: siteDir).lastPathComponent == "" {
+            print("Warning: could not parse the site: \(siteDir), skipping!")
+            return
+        }
+        
+        if type == FileAttributeType.typeSymbolicLink {
+            sites.append(Site(aliasPath: siteDir, tld: tld))
+        } else if type == FileAttributeType.typeDirectory {
+            sites.append(Site(absolutePath: siteDir, tld: tld))
+        }
+    }
+    
+    // MARK: - Structs
+    
+    class Site {
+        /// Name of the site. Does not include the TLD.
+        var name: String!
+        
+        /// The absolute path to the directory that is served.
+        var absolutePath: String!
+        
+        /// Location of the alias. If set, this is a linked domain.
+        var aliasPath: String?
+        
+        /// Whether the site has been secured.
+        var secured: Bool!
+        
+        /// What driver is currently in use. If not detected, defaults to nil.
+        var driver: String? = nil
+        
+        /// A list of notable Composer dependencies.
+        var notableComposerDependencies: [String: String] = [:]
+        
+        /// The PHP version as discovered in composer.json.
+        var composerPhp: String = "???"
+        
+        /// How the PHP version was determined.
+        var composerPhpSource: String = "unknown"
+        
+        init() {}
+        
+        convenience init(absolutePath: String, tld: String) {
+            self.init()
+            self.absolutePath = absolutePath
+            self.name = URL(fileURLWithPath: absolutePath).lastPathComponent
+            self.aliasPath = nil
+            determineSecured(tld)
+            determineDriver()
+            determineComposerPhpVersion()
+        }
+        
+        convenience init(aliasPath: String, tld: String) {
+            self.init()
+            self.absolutePath = try! FileManager.default.destinationOfSymbolicLink(atPath: aliasPath)
+            self.name = URL(fileURLWithPath: aliasPath).lastPathComponent
+            self.aliasPath = aliasPath
+            determineSecured(tld)
+            determineDriver()
+            determineComposerPhpVersion()
+        }
+        
+        public func determineSecured(_ tld: String) {
+            secured = Shell.fileExists("~/.config/valet/Certificates/\(self.name!).\(tld).key")
+        }
+        
+        public func determineDriver() {
+            let driver = Shell.pipe("cd '\(absolutePath!)' && valet which", requiresPath: true)
+            if driver.contains("This site is served by") {
+                self.driver = driver
+                    // TODO: Use a regular expression to retrieve the driver instead?
+                    .replacingOccurrences(of: "This site is served by [", with: "")
+                    .replacingOccurrences(of: "ValetDriver].\n", with: "")
+            } else {
+                self.driver = nil
+            }
+        }
+        
+        public func determineComposerPhpVersion() {
+            let path = "\(absolutePath!)/composer.json"
+            do {
+                if Filesystem.fileExists(path) {
+                    let decoded = try JSONDecoder().decode(
+                        ComposerJson.self,
+                        from: String(contentsOf: URL(fileURLWithPath: path), encoding: .utf8).data(using: .utf8)!
+                    )
+                    
+                    (self.composerPhp, self.composerPhpSource) = decoded.getPhpVersion()
+                    self.notableComposerDependencies = decoded.getNotableDependencies()
+                }
+            } catch {
+                Log.err("Something went wrong reading the composer JSON file.")
+            }
+        }
+    }
+
+    struct Configuration: Decodable {
+        /// Top level domain suffix. Usually "test" but can be set to something else.
+        /// - Important: Does not include the actual dot. ("test", not ".test"!)
+        let tld: String
+        
+        /// The paths that need to be checked.
+        let paths: [String]
+        
+        /// The loopback address.
+        let loopback: String
+        
+        /// The default site that is served if the domain is not found. Optional.
+        let defaultSite: String?
+        
+        private enum CodingKeys: String, CodingKey {
+            case tld, paths, loopback, defaultSite = "default"
+        }
+    }
+    
+}

phpmon/Domain/Menu/MainMenu+Startup.swift

@@ -0,0 +1,112 @@
+//
+//  MainMenu+Startup.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 03/01/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+extension MainMenu {
+    /**
+     Kick off the startup of the rendering of the main menu.
+     */
+    func startup() {
+        // Start with the icon
+        setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+        
+        // Perform environment boot checks
+        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
+            Startup().checkEnvironment(success: { onEnvironmentPass() },
+                                       failure: { onEnvironmentFail() }
+            )
+        }
+    }
+    
+    /**
+     When the environment is all clear and the app can run, let's go.
+     */
+    private func onEnvironmentPass() {
+        PhpEnv.detectPhpVersions()
+        
+        if HomebrewDiagnostics.shared.errors.contains(.aliasConflict) {
+            DispatchQueue.main.async {
+                Alert.notify(
+                    message: "alert.php_alias_conflict.title".localized,
+                    info: "alert.php_alias_conflict.info".localized,
+                    style: .critical
+                )
+            }
+        }
+        
+        updatePhpVersionInStatusBar()
+        
+        Log.info("Determining broken PHP-FPM...")
+        // Attempt to find out if PHP-FPM is broken
+        let installation = PhpEnv.phpInstall
+        installation.notifyAboutBrokenPhpFpm()
+        
+        // Set up the config watchers on launch (these are automatically updated via delegate methods if the user switches)
+        Log.info("Setting up watchers...")
+        App.shared.handlePhpConfigWatcher()
+        
+        // Detect applications (preset + custom)
+        Log.info("Detecting applications...")
+        App.shared.detectedApplications = Application.detectPresetApplications()
+        let customApps = Preferences.custom.scanApps.map { appName in
+            return Application(appName, .user_supplied)
+        }.filter { app in
+            return app.isInstalled()
+        }
+        App.shared.detectedApplications.append(contentsOf: customApps)
+        let appNames = App.shared.detectedApplications.map { app in
+            return app.name
+        }
+        Log.info("Detected applications: \(appNames)")
+        
+        // Load the global hotkey
+        App.shared.loadGlobalHotkey()
+        
+        // Attempt to find out more info about Valet
+        Log.info("PHP Monitor has extracted the version number of Valet: \(Valet.shared.version)")
+        
+        Valet.shared.validateVersion()
+        Valet.shared.startPreloadingSites()
+        
+        NotificationCenter.default.post(name: Events.ServicesUpdated, object: nil)
+        
+        Log.info("PHP Monitor is ready to serve!")
+        
+        // Schedule a request to fetch the PHP version every 60 seconds
+        DispatchQueue.main.async { [self] in
+            App.shared.timer = Timer.scheduledTimer(
+                timeInterval: 60,
+                target: self,
+                selector: #selector(refreshActiveInstallation),
+                userInfo: nil,
+                repeats: true
+            )
+        }
+    }
+    
+    /**
+     When the environment is not OK, present an alert to inform the user.
+     */
+    private func onEnvironmentFail() {
+        DispatchQueue.main.async { [self] in
+            let close = Alert.present(
+                messageText: "alert.cannot_start.title".localized,
+                informativeText: "alert.cannot_start.info".localized,
+                buttonTitle: "alert.cannot_start.close".localized,
+                secondButtonTitle: "alert.cannot_start.retry".localized
+            )
+            
+            if (close) {
+                exit(1)
+            }
+            
+            startup()
+        }
+    }
+}

phpmon/Domain/Menu/MainMenu.swift

@@ -22,67 +22,11 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
     
     // MARK: - UI related
     
-    /**
-     Kick off the startup of the rendering of the main menu.
-     */
-    func startup() {
-        // Start with the icon
-        setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
-        
-        // Perform environment boot checks
-        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
-            Startup().checkEnvironment(success: { onEnvironmentPass() },
-                                       failure: { onEnvironmentFail() }
-            )
-        }
-    }
-    
-    /**
-     When the environment is all clear and the app can run, let's go.
-     */
-    private func onEnvironmentPass() {
-        App.shared.availablePhpVersions = Actions.detectPhpVersions()
-        updatePhpVersionInStatusBar()
-        
-        let installation = App.phpInstall!
-        installation.notifyAboutBrokenPhpFpm()
-        
-        // Schedule a request to fetch the PHP version every 60 seconds
-        DispatchQueue.main.async { [self] in
-            App.shared.timer = Timer.scheduledTimer(
-                timeInterval: 60,
-                target: self,
-                selector: #selector(updatePhpVersionInStatusBar),
-                userInfo: nil,
-                repeats: true
-            )
-        }
-    }
-    
-    /**
-     When the environment is not OK, present an alert to inform the user.
-     */
-    private func onEnvironmentFail() {
-        DispatchQueue.main.async { [self] in
-            let close = Alert.present(
-                messageText: "alert.cannot_start.title".localized,
-                informativeText: "alert.cannot_start.info".localized,
-                buttonTitle: "alert.cannot_start.close".localized,
-                secondButtonTitle: "alert.cannot_start.retry".localized
-            )
-            
-            if (close) {
-                exit(1)
-            }
-            
-            startup()
-        }
-    }
-    
     /**
      Update the menu's contents, based on what's going on.
+     This will rebuild the entire menu, so this can take a few moments.
      */
-    func update() {
+    func rebuild() {
         // Update the menu item on the main thread
         DispatchQueue.main.async { [self] in
             // Create a new menu
@@ -96,7 +40,11 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
             menu.addPhpActionMenuItems()
             menu.addItem(NSMenuItem.separator())
             
-            // Add information about services & actions
+            // Add Valet interactions
+            menu.addValetMenuItems()
+            menu.addItem(NSMenuItem.separator())
+            
+            // Add services
             menu.addPhpConfigurationMenuItems()
             menu.addItem(NSMenuItem.separator())
             
@@ -120,7 +68,9 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
      */
     func setStatusBarImage(version: String) {
         setStatusBar(
-            image: MenuBarImageGenerator.textToImage(text: version)
+            image: Preferences.isEnabled(.shouldDisplayPhpHintInIcon)
+                ? MenuBarImageGenerator.textToImageWithIcon(text: version)
+                : MenuBarImageGenerator.textToImage(text: version)
         )
     }
     
@@ -147,16 +97,15 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
      */
     private func waitAndExecute(_ execute: @escaping () -> Void, completion: @escaping () -> Void = {})
     {
-        App.shared.busy = true
+        PhpEnv.shared.isBusy = true
         setBusyImage()
         DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
-            update()
             execute()
-            App.shared.busy = false
+            PhpEnv.shared.isBusy = false
             
             DispatchQueue.main.async { [self] in
                 updatePhpVersionInStatusBar()
-                update()
+                NotificationCenter.default.post(name: Events.ServicesUpdated, object: nil)
                 completion()
             }
         }
@@ -164,10 +113,18 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
     
     // MARK: - User Interface
     
+    @objc func refreshActiveInstallation() {
+        if !PhpEnv.shared.isBusy {
+            PhpEnv.shared.currentInstall = ActivePhpInstallation()
+            updatePhpVersionInStatusBar()
+        } else {
+            Log.perf("Skipping version refresh due to busy status")
+        }
+    }
+    
     @objc func updatePhpVersionInStatusBar() {
-        App.shared.currentInstall = PhpInstallation()
         refreshIcon()
-        update()
+        rebuild()
     }
     
     func refreshIcon() {
@@ -180,22 +137,24 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
                     setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIconStatic"))!)
                 } else {
                     // The dynamic icon has been requested
-                    setStatusBarImage(version: App.phpInstall!.version.short)
+                    let long = Preferences.preferences[.fullPhpVersionDynamicIcon] as! Bool
+                    setStatusBarImage(version: long ? PhpEnv.phpInstall.version.long  : PhpEnv.phpInstall.version.short)
                 }
             }
         }
     }
     
+    @objc func reloadPhpMonitorMenuInBackground() {
+        waitAndExecute {
+            // This automatically reloads the menu
+            Log.info("Reloading information about the PHP installation (in the background)...")
+        }
+    }
+    
     @objc func reloadPhpMonitorMenu() {
         waitAndExecute {
             // This automatically reloads the menu
-            print("Reloading information about the PHP installation...")
-        } completion: {
-            // Add a slight delay to make sure it loads the new menu
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                // Open the menu again
-                MainMenu.shared.statusItem.button?.performClick(nil)
-            }
+            Log.info("Reloading information about the PHP installation...")
         }
     }
     
@@ -256,43 +215,55 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
     @objc func toggleExtension(sender: ExtensionMenuItem) {
         waitAndExecute {
             sender.phpExtension?.toggle()
+            
+            if Preferences.isEnabled(.autoServiceRestartAfterExtensionToggle) {
+                Actions.restartPhpFpm()
+            }
         }
     }
     
     @objc func openPhpInfo() {
+        var url: URL? = nil
+        
         waitAndExecute {
-            // Write a file called `phpmon_phpinfo.php` to /tmp
-            try! "<?php phpinfo();".write(toFile: "/tmp/phpmon_phpinfo.php", atomically: true, encoding: .utf8)
-            
-            // Tell php-cgi to run the PHP and output as an .html file
-            Shell.run("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
+            url = Actions.createTempPhpInfoFile()
         } completion: {
             // When this has been completed, open the URL to the file in the browser
-            NSWorkspace.shared.open(URL(string: "file:///private/tmp/phpmon_phpinfo.html")!)
+            NSWorkspace.shared.open(url!)
         }
     }
     
     @objc func forceRestartLatestPhp() {
         // Tell the user the switch is about to occur
-        Alert.notify(message: "alert.force_reload.title".localized, info: "alert.force_reload.info".localized)
+        Alert.notify(
+            message: "alert.force_reload.title".localized,
+            info: "alert.force_reload.info".localized
+        )
         
         // Start switching
         waitAndExecute {
             Actions.fixMyPhp()
         } completion: {
-            Alert.notify(message: "alert.force_reload_done.title".localized, info: "alert.force_reload_done.info".localized)
+            Alert.notify(
+                message: "alert.force_reload_done.title".localized,
+                info: "alert.force_reload_done.info".localized
+            )
         }
     }
     
+    @objc func updateGlobalComposerDependencies() {
+        self.updateGlobalDependencies(notify: true, completion: { _ in })
+    }
+    
     @objc func openActiveConfigFolder() {
-        if (App.phpInstall!.version.error) {
+        if (PhpEnv.phpInstall.version.error) {
             // php version was not identified
             Actions.openGenericPhpConfigFolder()
             return
         }
         
         // php version was identified
-        Actions.openPhpConfigFolder(version: App.phpInstall!.version.short)
+        Actions.openPhpConfigFolder(version: PhpEnv.phpInstall.version.short)
     }
     
     @objc func openGlobalComposerFolder() {
@@ -304,40 +275,51 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
     }
     
     @objc func switchToPhpVersion(sender: PhpMenuItem) {
+        self.switchToPhpVersion(sender.version)
+    }
+    
+    @objc func switchToPhpVersion(_ version: String) {
         setBusyImage()
-        App.shared.busy = true
+        PhpEnv.shared.isBusy = true
         
         DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
             // Update the PHP version in the status bar
             updatePhpVersionInStatusBar()
             
             // Update the menu
-            update()
+            rebuild()
             
             let completion = {
+                PhpEnv.shared.delegate?.switcherDidCompleteSwitch()
+                
                 // Mark as no longer busy
-                App.shared.busy = false
+                PhpEnv.shared.isBusy = false
                 
                 // Perform UI updates on main thread
                 DispatchQueue.main.async { [self] in
                     updatePhpVersionInStatusBar()
-                    update()
+                    rebuild()
                     
-                    // Send a notification that the switch has been completed
-                    LocalNotification.send(
-                        title: String(format: "notification.version_changed_title".localized, sender.version),
-                        subtitle: String(format: "notification.version_changed_desc".localized, sender.version)
-                    )
+                    let sendLocalNotification = {
+                        LocalNotification.send(
+                            title: String(format: "notification.version_changed_title".localized, version),
+                            subtitle: String(format: "notification.version_changed_desc".localized, version)
+                        )
+                        PhpEnv.phpInstall.notifyAboutBrokenPhpFpm()
+                    }
                     
-                    App.phpInstall?.notifyAboutBrokenPhpFpm()
+                    // Run composer updates
+                    if Preferences.isEnabled(.autoComposerGlobalUpdateAfterSwitch) {
+                        self.updateGlobalDependencies(notify: false, completion: { _ in sendLocalNotification() })
+                    } else {
+                        sendLocalNotification()
+                    }
                 }
             }
             
-            // Switch the PHP version
-            Actions.switchToPhpVersion(
-                version: sender.version,
-                availableVersions: App.shared.availablePhpVersions,
-                completed: completion
+            PhpEnv.switcher.performSwitch(
+                to: version,
+                completion: completion
             )
         }
     }
@@ -351,6 +333,10 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
         PrefsVC.show()
     }
     
+    @objc func openSiteList() {
+        SiteListVC.show()
+    }
+    
     @objc func terminateApp() {
         NSApplication.shared.terminate(nil)
     }
@@ -366,4 +352,85 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
         // When the menu is closed, allow the shortcut to work again
         App.shared.shortcutHotkey?.isPaused = false
     }
+    
+    // MARK: - Private Methods
+    
+    /**
+     
+     */
+    private func updateGlobalDependencies(notify: Bool, completion: @escaping (Bool) -> Void) {
+        PhpEnv.shared.isBusy = true
+        setBusyImage()
+        self.rebuild()
+        
+        let noLongerBusy = {
+            PhpEnv.shared.isBusy = false
+            DispatchQueue.main.async { [self] in
+                self.updatePhpVersionInStatusBar()
+                self.rebuild()
+            }
+        }
+        
+        var window: ProgressWindowController? = ProgressWindowController.display(
+            title: "alert.composer_progress.title".localized,
+            description: "alert.composer_progress.info".localized
+        )
+        window?.setType(info: true)
+        
+        DispatchQueue.global(qos: .userInitiated).async {
+            let output = Shell.user.executeSynchronously(
+                "composer global update", requiresPath: true
+            )
+            
+            let task = Shell.user.createTask(for: "composer global update", requiresPath: true)
+            
+            DispatchQueue.main.async {
+                window?.addToConsole("composer global update\n")
+            }
+            
+            Shell.captureOutput(
+                task,
+                didReceiveStdOutData: { string in
+                    DispatchQueue.main.async {
+                        window?.addToConsole(string)
+                    }
+                    Log.perf("\(string.trimmingCharacters(in: .newlines))")
+                },
+                didReceiveStdErrData: { string in
+                    DispatchQueue.main.async {
+                        window?.addToConsole(string)
+                    }
+                    Log.perf("\(string.trimmingCharacters(in: .newlines))")
+                }
+            )
+            
+            task.launch()
+            task.waitUntilExit()
+            Shell.haltCapturingOutput(task)
+            
+            DispatchQueue.main.async {
+                if output.task.terminationStatus <= 0 {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+                        window?.close()
+                        if (notify) {
+                            LocalNotification.send(
+                                title: "alert.composer_success.title".localized,
+                                subtitle: "alert.composer_success.info".localized
+                            )
+                        }
+                        window = nil
+                        noLongerBusy()
+                        completion(true)
+                    }
+                } else {
+                    window?.setType(info: false)
+                    window?.progressView?.labelTitle.stringValue = "alert.composer_failure.title".localized
+                    window?.progressView?.labelDescription.stringValue = "alert.composer_failure.info".localized
+                    window = nil
+                    noLongerBusy()
+                    completion(false)
+                }
+            }
+        }
+    }
 }

phpmon/Domain/Menu/ServicesView.swift

@@ -0,0 +1,93 @@
+//
+//  StatsView.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 04/02/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+
+class ServicesView: NSView, XibLoadable {
+    
+    @IBOutlet weak var imageViewPhp: NSImageView!
+    @IBOutlet weak var imageViewNginx: NSImageView!
+    @IBOutlet weak var imageViewDnsmasq: NSImageView!
+    
+    @IBOutlet weak var textFieldPhp: NSTextField!
+    
+    static var services: [String: HomebrewService] = [:]
+    
+    static func asMenuItem() -> NSMenuItem {
+        let view = Self.createFromXib()!
+        let item = NSMenuItem()
+        item.view = view
+        item.target = self
+        NotificationCenter.default.addObserver(
+            view, selector: #selector(self.updateInformation),
+            name: Events.ServicesUpdated,
+            object: nil
+        )
+        return item
+    }
+    
+    override func viewWillDraw() {
+        super.viewWillDraw()
+        self.loadData()
+    }
+
+    @objc func updateInformation() {
+        self.loadData()
+    }
+    
+    func loadData() {
+        // Use stale data
+        self.applyAllInfoFieldsFromCachedValue()
+        
+        // Re-fetch services
+        runAsync {
+            let servicesList = try! JSONDecoder().decode(
+                [HomebrewService].self,
+                from: Shell.pipe(
+                    "sudo \(Paths.brew) services info --all --json",
+                    requiresPath: true
+                ).data(using: .utf8)!
+            ).filter({ service in
+                return [PhpEnv.phpInstall.formula, "nginx", "dnsmasq"].contains(service.name)
+            })
+            
+            ServicesView.services = Dictionary(uniqueKeysWithValues: servicesList.map{ ($0.name, $0) })
+        } completion: {
+            // Use fresh data
+            self.applyAllInfoFieldsFromCachedValue()
+        }
+    }
+    
+    func applyAllInfoFieldsFromCachedValue() {
+        if ServicesView.services.keys.isEmpty {
+            return
+        }
+        
+        DispatchQueue.main.async {
+            self.textFieldPhp.stringValue = PhpEnv.phpInstall.formula.uppercased()
+            self.applyServiceStyling(PhpEnv.phpInstall.formula, self.imageViewPhp)
+            self.applyServiceStyling("nginx", self.imageViewNginx)
+            self.applyServiceStyling("dnsmasq", self.imageViewDnsmasq)
+        }
+    }
+    
+    func applyServiceStyling(_ serviceName: String, _ imageView: NSImageView) {
+        if ServicesView.services[serviceName] != nil && ServicesView.services[serviceName]!.running {
+            imageView.image = NSImage(named: "ServiceOn")
+            imageView.contentTintColor = NSColor.black
+        } else {
+            imageView.image = NSImage(named: "ServiceOff")
+            imageView.contentTintColor = NSColor.init(red: 246/255, green: 71/255, blue: 71/255, alpha: 1.0)
+        }
+    }
+    
+    deinit {
+        NotificationCenter.default.removeObserver(self, name: Events.ServicesUpdated, object: nil)
+    }
+}

phpmon/Domain/Menu/ServicesView.xib

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe" customClass="ServicesView" customModule="PHP_Monitor" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="340" height="46"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <stackView distribution="fillEqually" orientation="horizontal" alignment="top" spacing="20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TnH-dX-qaQ">
+                    <rect key="frame" x="30" y="3" width="280" height="40"/>
+                    <subviews>
+                        <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="doH-ww-BDw">
+                            <rect key="frame" x="0.0" y="4" width="80" height="32"/>
+                            <subviews>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="At1-ch-qv2">
+                                    <rect key="frame" x="25" y="18" width="31" height="14"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="PHP" id="LKe-C4-jxo">
+                                        <font key="font" metaFont="systemMedium" size="11"/>
+                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="tko-cP-XSz">
+                                    <rect key="frame" x="28" y="0.0" width="24" height="16"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="16" id="Fxu-6h-A2h"/>
+                                        <constraint firstAttribute="width" constant="24" id="hOc-Ur-dmA"/>
+                                    </constraints>
+                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ServiceLoading" id="vjB-6Z-3xR"/>
+                                    <color key="contentTintColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                </imageView>
+                            </subviews>
+                            <visibilityPriorities>
+                                <integer value="1000"/>
+                                <integer value="1000"/>
+                            </visibilityPriorities>
+                            <customSpacing>
+                                <real value="3.4028234663852886e+38"/>
+                                <real value="3.4028234663852886e+38"/>
+                            </customSpacing>
+                        </stackView>
+                        <stackView distribution="fillEqually" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="g4d-4N-NkC">
+                            <rect key="frame" x="100" y="4" width="80" height="32"/>
+                            <subviews>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7um-XA-djV">
+                                    <rect key="frame" x="20" y="18" width="40" height="14"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="NGINX" id="Qfq-Bl-yuh">
+                                        <font key="font" metaFont="systemMedium" size="11"/>
+                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ZqW-6d-vpe">
+                                    <rect key="frame" x="32" y="0.0" width="16" height="16"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="16" id="EPG-jm-7Xs"/>
+                                        <constraint firstAttribute="width" constant="16" id="iif-kT-phn"/>
+                                    </constraints>
+                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ServiceLoading" id="JmQ-dU-ip7"/>
+                                    <color key="contentTintColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                </imageView>
+                            </subviews>
+                            <visibilityPriorities>
+                                <integer value="1000"/>
+                                <integer value="1000"/>
+                            </visibilityPriorities>
+                            <customSpacing>
+                                <real value="3.4028234663852886e+38"/>
+                                <real value="3.4028234663852886e+38"/>
+                            </customSpacing>
+                        </stackView>
+                        <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nWj-33-m8Q">
+                            <rect key="frame" x="200" y="4" width="80" height="32"/>
+                            <subviews>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Oef-6n-9QI">
+                                    <rect key="frame" x="9" y="18" width="62" height="14"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="DNSMASQ" id="lGh-MT-TgI">
+                                        <font key="font" metaFont="systemMedium" size="11"/>
+                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DcG-x3-lvy">
+                                    <rect key="frame" x="32" y="0.0" width="16" height="16"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="16" id="AKl-Gq-RtM"/>
+                                        <constraint firstAttribute="height" constant="16" id="q2g-Ua-eIJ"/>
+                                    </constraints>
+                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ServiceLoading" id="Ign-Cq-DKf"/>
+                                    <color key="contentTintColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                </imageView>
+                            </subviews>
+                            <visibilityPriorities>
+                                <integer value="1000"/>
+                                <integer value="1000"/>
+                            </visibilityPriorities>
+                            <customSpacing>
+                                <real value="3.4028234663852886e+38"/>
+                                <real value="3.4028234663852886e+38"/>
+                            </customSpacing>
+                        </stackView>
+                    </subviews>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="40" id="2EU-Fd-hMg"/>
+                        <constraint firstItem="nWj-33-m8Q" firstAttribute="top" secondItem="TnH-dX-qaQ" secondAttribute="top" constant="4" id="CAY-Pw-B8n"/>
+                        <constraint firstAttribute="bottom" secondItem="doH-ww-BDw" secondAttribute="bottom" constant="4" id="Dq4-M6-1Wf"/>
+                        <constraint firstItem="g4d-4N-NkC" firstAttribute="top" secondItem="TnH-dX-qaQ" secondAttribute="top" constant="4" id="bls-fM-H4b"/>
+                        <constraint firstAttribute="bottom" secondItem="nWj-33-m8Q" secondAttribute="bottom" constant="4" id="f6j-eI-wiH"/>
+                        <constraint firstAttribute="bottom" secondItem="g4d-4N-NkC" secondAttribute="bottom" constant="4" id="faS-Mo-Qa2"/>
+                        <constraint firstItem="doH-ww-BDw" firstAttribute="top" secondItem="TnH-dX-qaQ" secondAttribute="top" constant="4" id="gL3-5S-OKo"/>
+                    </constraints>
+                    <visibilityPriorities>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                    </visibilityPriorities>
+                    <customSpacing>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                    </customSpacing>
+                </stackView>
+            </subviews>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="TnH-dX-qaQ" secondAttribute="trailing" constant="30" id="3dD-wf-5pS"/>
+                <constraint firstItem="TnH-dX-qaQ" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="3" id="JmY-D0-uAy"/>
+                <constraint firstItem="TnH-dX-qaQ" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="30" id="S8i-CD-j3h"/>
+                <constraint firstAttribute="bottom" secondItem="TnH-dX-qaQ" secondAttribute="bottom" constant="3" id="fDc-OY-YL0"/>
+                <constraint firstItem="TnH-dX-qaQ" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="fFF-rl-3s4"/>
+            </constraints>
+            <connections>
+                <outlet property="imageViewDnsmasq" destination="DcG-x3-lvy" id="XxJ-kZ-bdO"/>
+                <outlet property="imageViewNginx" destination="ZqW-6d-vpe" id="Wil-Ug-8Kb"/>
+                <outlet property="imageViewPhp" destination="tko-cP-XSz" id="q7L-HK-7Pj"/>
+                <outlet property="textFieldPhp" destination="At1-ch-qv2" id="Guk-hr-f1T"/>
+            </connections>
+            <point key="canvasLocation" x="-64" y="195"/>
+        </customView>
+    </objects>
+    <resources>
+        <image name="ServiceLoading" width="512" height="512"/>
+    </resources>
+</document>

phpmon/Domain/Menu/StatsView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -10,11 +10,11 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe" customClass="StatsView" customModule="PHP_Monitor" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="341" height="55"/>
+            <rect key="frame" x="0.0" y="0.0" width="340" height="55"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <stackView distribution="fillEqually" orientation="horizontal" alignment="top" spacing="20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TnH-dX-qaQ">
-                    <rect key="frame" x="30" y="6" width="281" height="43"/>
+                    <rect key="frame" x="30" y="6" width="280" height="43"/>
                     <subviews>
                         <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="doH-ww-BDw">
                             <rect key="frame" x="0.0" y="4" width="87" height="35"/>
@@ -75,10 +75,10 @@
                             </customSpacing>
                         </stackView>
                         <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nWj-33-m8Q">
-                            <rect key="frame" x="204" y="4" width="77" height="35"/>
+                            <rect key="frame" x="204" y="4" width="76" height="35"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Oef-6n-9QI">
-                                    <rect key="frame" x="-1" y="21" width="79" height="14"/>
+                                    <rect key="frame" x="-2" y="21" width="79" height="14"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="MAX UPLOAD" id="lGh-MT-TgI">
                                         <font key="font" metaFont="systemMedium" size="11"/>
                                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -86,7 +86,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eHT-tr-Kwx">
-                                    <rect key="frame" x="11" y="0.0" width="55" height="19"/>
+                                    <rect key="frame" x="10" y="0.0" width="55" height="19"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="1024M" id="1iA-Ri-zYY">
                                         <font key="font" metaFont="systemMedium" size="16"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -138,7 +138,7 @@
                 <outlet property="titleMaxUpload" destination="Oef-6n-9QI" id="Q61-JI-RJq"/>
                 <outlet property="titleMemLimit" destination="At1-ch-qv2" id="SQT-B9-sWS"/>
             </connections>
-            <point key="canvasLocation" x="-84.5" y="44"/>
+            <point key="canvasLocation" x="139" y="168"/>
         </customView>
     </objects>
 </document>

phpmon/Domain/Menu/StatusMenu.swift

@@ -9,18 +9,14 @@ import Cocoa
 
 class StatusMenu : NSMenu {
     func addPhpVersionMenuItems() {
-        if App.shared.currentInstall == nil {
-            return
-        }
-        
-        if App.phpInstall!.version.error {
+        if PhpEnv.phpInstall.version.error {
             for message in ["mi_php_broken_1", "mi_php_broken_2", "mi_php_broken_3", "mi_php_broken_4"] {
                 addItem(NSMenuItem(title: message.localized, action: nil, keyEquivalent: ""))
             }
             return
         }
     
-        let phpVersionText = "\("mi_php_version".localized) \(App.phpInstall!.version.long)"
+        let phpVersionText = "\("mi_php_version".localized) \(PhpEnv.phpInstall.version.long)"
         addItem(HeaderView.asMenuItem(text: phpVersionText))
     }
     
@@ -30,70 +26,82 @@ class StatusMenu : NSMenu {
             return
         }
         
-        if App.shared.availablePhpVersions.count == 0 {
+        if PhpEnv.shared.availablePhpVersions.count == 0 {
             return
         }
         
         self.addSwitchToPhpMenuItems()
         self.addItem(NSMenuItem.separator())
-        self.addServicesMenuItems()
-    }
-    
-    private func addSwitchToPhpMenuItems() {
-        var shortcutKey = 1
-        for index in (0..<App.shared.availablePhpVersions.count).reversed() {
-            let version = App.shared.availablePhpVersions[index]
-            let action = #selector(MainMenu.switchToPhpVersion(sender:))
-            let brew = (version == App.shared.brewPhpVersion) ? "php" : "php@\(version)"
-            let menuItem = PhpMenuItem(
-                title: "\("mi_php_switch".localized) \(version) (\(brew))",
-                action: (version == App.phpInstall?.version.short) ? nil : action, keyEquivalent: "\(shortcutKey)"
-            )
-            menuItem.version = version
-            shortcutKey = shortcutKey + 1
-            self.addItem(menuItem)
-        }
-    }
-    
-    private func addServicesMenuItems() {
-        self.addItem(HeaderView.asMenuItem(text: "mi_active_services".localized))
         
-        let services = NSMenuItem(title: "mi_manage_services".localized, action: nil, keyEquivalent: "")
+        self.addItem(ServicesView.asMenuItem())
+        self.addItem(NSMenuItem.separator())
+    }
+    
+    func addOtherMenuItems() {
+        let services = NSMenuItem(title: "mi_other".localized, action: nil, keyEquivalent: "")
         let servicesMenu = NSMenu()
+        
+        servicesMenu.addItem(NSMenuItem(title: "mi_help".localized, action: nil, keyEquivalent: ""))
+        
+        if !PhpEnv.shared.availablePhpVersions.contains(PhpEnv.brewPhpVersion) {
+            servicesMenu.addItem(NSMenuItem(
+                title: "mi_force_load_latest_unavailable".localized(PhpEnv.brewPhpVersion),
+                action: nil, keyEquivalent: "f"
+            ))
+        } else {
+            servicesMenu.addItem(NSMenuItem(
+                title: "mi_force_load_latest".localized(PhpEnv.brewPhpVersion),
+                action: #selector(MainMenu.forceRestartLatestPhp), keyEquivalent: "f"))
+        }
+        
+        servicesMenu.addItem(NSMenuItem(title: "mi_services".localized, action: nil, keyEquivalent: ""))
+        
         servicesMenu.addItem(NSMenuItem(title: "mi_restart_dnsmasq".localized, action: #selector(MainMenu.restartDnsMasq), keyEquivalent: "d"))
         servicesMenu.addItem(NSMenuItem(title: "mi_restart_php_fpm".localized, action: #selector(MainMenu.restartPhpFpm), keyEquivalent: "p"))
         servicesMenu.addItem(NSMenuItem(title: "mi_restart_nginx".localized, action: #selector(MainMenu.restartNginx), keyEquivalent: "n"))
+        
         servicesMenu.addItem(
             NSMenuItem(title: "mi_stop_all_services".localized, action: #selector(MainMenu.stopAllServices), keyEquivalent: "s"),
-            withKeyModifier: [.command, .shift]
-        )
+            withKeyModifier: [.command, .shift])
+        
+        servicesMenu.addItem(NSMenuItem(title: "mi_restart_all_services".localized, action: #selector(MainMenu.restartAllServices), keyEquivalent: "s"))
+        
+        servicesMenu.addItem(NSMenuItem(title: "mi_manual_actions".localized, action: nil, keyEquivalent: ""))
+        
+        servicesMenu.addItem(NSMenuItem(title: "mi_php_refresh".localized, action: #selector(MainMenu.reloadPhpMonitorMenu), keyEquivalent: "r"))
+        
         for item in servicesMenu.items {
             item.target = MainMenu.shared
         }
-        self.setSubmenu(servicesMenu, for: services)
         
-        self.addItem(NSMenuItem(title: "mi_force_load_latest".localized, action: #selector(MainMenu.forceRestartLatestPhp), keyEquivalent: "f"))
+        self.setSubmenu(servicesMenu, for: services)
         self.addItem(services)
-        self.addItem(NSMenuItem(title: "mi_restart_all_services".localized, action: #selector(MainMenu.restartAllServices), keyEquivalent: "s"))
+    }
+    
+    func addValetMenuItems() {
+        self.addItem(HeaderView.asMenuItem(text: "mi_valet".localized))
+        self.addItem(NSMenuItem(title: "mi_valet_config".localized, action: #selector(MainMenu.openValetConfigFolder), keyEquivalent: "v"))
+        self.addItem(NSMenuItem(title: "mi_sitelist".localized, action: #selector(MainMenu.openSiteList), keyEquivalent: "l"))
+        self.addItem(NSMenuItem.separator())
     }
     
     func addPhpConfigurationMenuItems() {
-        if App.shared.currentInstall == nil {
-            return
-        }
-        
         // Configuration
         self.addItem(HeaderView.asMenuItem(text: "mi_configuration".localized))
-        self.addItem(NSMenuItem(title: "mi_valet_config".localized, action: #selector(MainMenu.openValetConfigFolder), keyEquivalent: "v"))
-        self.addItem(NSMenuItem(title: "mi_global_composer".localized, action: #selector(MainMenu.openGlobalComposerFolder), keyEquivalent: "g"))
         self.addItem(NSMenuItem(title: "mi_php_config".localized, action: #selector(MainMenu.openActiveConfigFolder), keyEquivalent: "c"))
         self.addItem(NSMenuItem(title: "mi_phpinfo".localized, action: #selector(MainMenu.openPhpInfo), keyEquivalent: "i"))
         
-        if (App.shared.busy) {
+        // Composer
+        self.addItem(NSMenuItem.separator())
+        self.addItem(HeaderView.asMenuItem(text: "mi_composer".localized))
+        self.addItem(NSMenuItem(title: "mi_global_composer".localized, action: #selector(MainMenu.openGlobalComposerFolder), keyEquivalent: "g"))
+        self.addItem(NSMenuItem(title: "mi_update_global_composer".localized, action: PhpEnv.shared.isBusy ? nil : #selector(MainMenu.updateGlobalComposerDependencies), keyEquivalent: ""))
+        
+        if (PhpEnv.shared.isBusy) {
             return
         }
         
-        let stats = App.phpInstall!.configuration
+        let stats = PhpEnv.phpInstall.limits
         
         // Stats
         self.addItem(NSMenuItem.separator())
@@ -107,19 +115,44 @@ class StatusMenu : NSMenu {
         self.addItem(NSMenuItem.separator())
         self.addItem(HeaderView.asMenuItem(text: "mi_detected_extensions".localized))
         
-        if (App.phpInstall!.extensions.count == 0) {
+        if (PhpEnv.phpInstall.extensions.count == 0) {
             self.addItem(NSMenuItem(title: "mi_no_extensions_detected".localized, action: nil, keyEquivalent: ""))
         }
         
         var shortcutKey = 1
-        for phpExtension in App.phpInstall!.extensions {
+        for phpExtension in PhpEnv.phpInstall.extensions {
             self.addExtensionItem(phpExtension, shortcutKey)
             shortcutKey += 1
         }
         
+        // Other
         self.addItem(NSMenuItem.separator())
-        
-        self.addItem(NSMenuItem(title: "mi_php_refresh".localized, action: #selector(MainMenu.reloadPhpMonitorMenu), keyEquivalent: "r"))
+        self.addOtherMenuItems()
+    }
+    
+    private func addSwitchToPhpMenuItems() {
+        var shortcutKey = 1
+        for index in (0..<PhpEnv.shared.availablePhpVersions.count).reversed() {
+            
+            // Get the short and long version
+            let shortVersion = PhpEnv.shared.availablePhpVersions[index]
+            let longVersion = PhpEnv.shared.cachedPhpInstallations[shortVersion]!.longVersion
+            
+            let long = Preferences.preferences[.fullPhpVersionDynamicIcon] as! Bool
+            let versionString = long ? longVersion.homebrewVersion : shortVersion
+            
+            let action = #selector(MainMenu.switchToPhpVersion(sender:))
+            let brew = (shortVersion == PhpEnv.brewPhpVersion) ? "php" : "php@\(shortVersion)"
+            let menuItem = PhpMenuItem(
+                title: "\("mi_php_switch".localized) \(versionString) (\(brew))",
+                action: (shortVersion == PhpEnv.phpInstall.version.short) ? nil : action, keyEquivalent: "\(shortcutKey)"
+            )
+            
+            menuItem.version = shortVersion
+            shortcutKey = shortcutKey + 1
+            
+            self.addItem(menuItem)
+        }
     }
     
     private func addExtensionItem(_ phpExtension: PhpExtension, _ shortcutKey: Int) {
@@ -151,3 +184,7 @@ class PhpMenuItem: NSMenuItem {
 class ExtensionMenuItem: NSMenuItem {
     var phpExtension: PhpExtension? = nil
 }
+
+class EditorMenuItem: NSMenuItem {
+    var editor: Application? = nil
+}

phpmon/Domain/PHP/ActivePhpInstallation+Checks.swift

@@ -0,0 +1,33 @@
+//
+//  ActivePhpInstallation.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 21/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+extension ActivePhpInstallation {
+    
+    /**
+     It is always possible that the system configuration for PHP-FPM has not been set up for Valet.
+     This can occur when a user manually installs a new PHP version, but does not run `valet install`.
+     In that case, we should alert the user!
+     
+     - Important: The underlying check is `checkPhpFpmStatus`, which can be run multiple times.
+     This method actively presents a modal if said checks fails, so don't call this method too many times.
+     */
+    public func notifyAboutBrokenPhpFpm() {
+        if !self.checkPhpFpmStatus() {
+            DispatchQueue.main.async {
+                Alert.notify(
+                    message: "alert.php_fpm_broken.title".localized,
+                    info: "alert.php_fpm_broken.info".localized,
+                    style: .critical
+                )
+            }
+        }
+    }
+    
+}

phpmon/Domain/Preferences/CustomPrefs.swift

@@ -0,0 +1,17 @@
+//
+//  CustomPrefs.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 03/01/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+struct CustomPrefs: Decodable {
+    let scanApps: [String]
+
+    private enum CodingKeys: String, CodingKey {
+        case scanApps = "scan_apps"
+    }
+}