🚀 Version 5.1.1

Merge branch 'dev/5.x'
🔧 Prepare for maintenance release
2025-08-08 04:20:07 +02:00 · 2022-03-09 17:52:07 +01:00 · 2022-03-09 17:51:19 +01:00 · 2022-03-09 16:41:47 +01:00 · 2022-03-09 16:19:41 +01:00 · 2022-03-03 14:49:33 +01:00
165 changed files with 3807 additions and 1574 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1 +1,2 @@
-custom: ['https://nicoverbruggen.be/sponsor', 'https://paypal.me/nicoverbruggen']
+github: nicoverbruggen
+custom: ['https://nicoverbruggen.be/sponsor']
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Something going wrong? File a bug report!
+title: ''
+labels: bug
+assignees: nicoverbruggen
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Required information**
+ - Did you consult the FAQ in the README? [yes/no]
+ - Did you try "Fix My Valet"? [yes/no]
+ - OS: [e.g. macOS Monterey]
+ - PHP Monitor version [e.g. v5.0.1]
+
+**Additional context**
+Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an enhancement.
+title: ''
+labels: enhancement
+assignees: nicoverbruggen
+
+---
+
+_Enhancement requests that are not immediately approved will be moved to a discussion instead._
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@ -0,0 +1,60 @@
+# DEVELOPER README
+
+## 🔧 Build instructions
+
+<img src="./docs/build.png" width="404px" alt="build button in Xcode"/>
+
+If you'd like to build PHP Monitor yourself, you need:
+
+* Xcode (usually the latest version)
+* The contents of this repository
+
+Once you have downloaded this repository, open `PHP Monitor.xcodeproj`, and you should be able to immediately build the app for your system by pressing Cmd-R. This will create a debug build. (If Xcode complains about code signing, you can turn it off.)
+
+If you'd like to create a production build, choose "Any Mac" as the target and select Product > Archive.
+
+## 🚀 Release procedure
+
+1. Merge into `main`
+2. Create tag
+3. Add changes to changelog + update security document
+4. Archive
+5. Notarize and prepare for own distribution
+6. After notarization, export .app
+7. Create zipped version
+8. Calculate SHA256: `openssl dgst -sha256 phpmon.zip`
+9. Upload to GitHub and add to tagged release
+10. Update Cask with new version + hash
+11. Check new version can be installed via Cask
+
+## 🐛 Symbolication of crashes
+
+If you have an archived build of the app and exported the DSYM, it is possible to symbolicate .ips crash logs.
+
+For example, given the following crash (from an .ips file):
+
+```
+Thread 2 Crashed::  Dispatch queue: com.apple.root.user-initiated-qos
+0   libswiftDispatch.dylib        	    0x7ff82aa3ab8c static OS_dispatch_source.makeProcessSource(identifier:eventMask:queue:) + 28
+1   PHP Monitor                   	       0x1096907d8 0x10965e000 + 206808
+                                                |            |
+                                             address      load address
+2   PHP Monitor                   	       0x1096903ac 0x10965e000 + 205740
+3   PHP Monitor                   	       0x10968f88b 0x10965e000 + 202891
+```
+
+You must use the correct order for the the address and load address in the command below:
+
+```
+$ atos -arch x86_64 -o '/path/to/PHP Monitor.app.dSYM/Contents/Resources/DWARF/PHP Monitor' -l 0x10965e000 0x1096907d8
+             |                                           |                                       |              |
+             architecture                                path to DSYM                         load address    address
+```
+
+This will return the relevant information, for example:
+
+```
+FSWatcher.startMonitoring(_:behaviour:) (in PHP Monitor) (PhpConfigWatcher.swift:95)
+```
+
+For more information, see [Apple's documentation](https://developer.apple.com/documentation/xcode/adding-identifiable-symbol-names-to-a-crash-report).
--- a/Monitor.xcodeproj/project.pbxproj
+++ b/Monitor.xcodeproj/project.pbxproj
@ -9,13 +9,11 @@
 /* Begin PBXBuildFile section */
 		5420395926135DC100FB00FA /* PrefsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5420395826135DC100FB00FA /* PrefsVC.swift */; };
 		5420395F2613607600FB00FA /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5420395E2613607600FB00FA /* Preferences.swift */; };
-		54AB03262763858F00A29D5F /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54AB03252763858F00A29D5F /* Timer.swift */; };
-		54AB03272763858F00A29D5F /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54AB03252763858F00A29D5F /* Timer.swift */; };
 		54B48B5F275F66AE006D90C5 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54B48B5E275F66AE006D90C5 /* Application.swift */; };
 		54B48B60275F66AE006D90C5 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54B48B5E275F66AE006D90C5 /* Application.swift */; };
 		54EAC806262F212B0092D14E /* GlobalKeybindPreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41CD0282628D8EE0065BBED /* GlobalKeybindPreference.swift */; };
-		54FCFD26276C883F004CE748 /* CheckboxPreferenceView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 54FCFD25276C883F004CE748 /* CheckboxPreferenceView.xib */; };
-		54FCFD27276C883F004CE748 /* CheckboxPreferenceView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 54FCFD25276C883F004CE748 /* CheckboxPreferenceView.xib */; };
+		54FCFD26276C883F004CE748 /* SelectPreferenceView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 54FCFD25276C883F004CE748 /* SelectPreferenceView.xib */; };
+		54FCFD27276C883F004CE748 /* SelectPreferenceView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 54FCFD25276C883F004CE748 /* SelectPreferenceView.xib */; };
 		54FCFD2A276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54FCFD29276C8AA4004CE748 /* CheckboxPreferenceView.swift */; };
 		54FCFD2B276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54FCFD29276C8AA4004CE748 /* CheckboxPreferenceView.swift */; };
 		54FCFD2D276C8D67004CE748 /* HotkeyPreferenceView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 54FCFD2C276C8D67004CE748 /* HotkeyPreferenceView.xib */; };
@ -24,30 +22,34 @@
 		54FCFD31276C8DA4004CE748 /* HotkeyPreferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54FCFD2F276C8DA4004CE748 /* HotkeyPreferenceView.swift */; };
 		C405A4D024B9B9140062FAFA /* InternetAccessPolicy.strings in Resources */ = {isa = PBXBuildFile; fileRef = C405A4CE24B9B9130062FAFA /* InternetAccessPolicy.strings */; };
 		C405A4D124B9B9140062FAFA /* InternetAccessPolicy.plist in Resources */ = {isa = PBXBuildFile; fileRef = C405A4CF24B9B9140062FAFA /* InternetAccessPolicy.plist */; };
+		C4068CA427B0780A00544CD5 /* CheckboxPreferenceView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4068CA327B0780A00544CD5 /* CheckboxPreferenceView.xib */; };
+		C4068CA527B0780A00544CD5 /* CheckboxPreferenceView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4068CA327B0780A00544CD5 /* CheckboxPreferenceView.xib */; };
+		C4068CA727B07A1300544CD5 /* SelectPreferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4068CA627B07A1300544CD5 /* SelectPreferenceView.swift */; };
+		C4068CA827B07A1300544CD5 /* SelectPreferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4068CA627B07A1300544CD5 /* SelectPreferenceView.swift */; };
+		C4068CAA27B0890D00544CD5 /* MenuBarIcons.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4068CA927B0890D00544CD5 /* MenuBarIcons.swift */; };
+		C4068CAB27B0890D00544CD5 /* MenuBarIcons.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4068CA927B0890D00544CD5 /* MenuBarIcons.swift */; };
+		C4080FF627BD8C6400BF2C6B /* BetterAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4080FF527BD8C6400BF2C6B /* BetterAlert.swift */; };
+		C4080FF727BD8C6400BF2C6B /* BetterAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4080FF527BD8C6400BF2C6B /* BetterAlert.swift */; };
+		C4080FFA27BD956700BF2C6B /* BetterAlertVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4080FF927BD956700BF2C6B /* BetterAlertVC.swift */; };
+		C4080FFB27BD956700BF2C6B /* BetterAlertVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4080FF927BD956700BF2C6B /* BetterAlertVC.swift */; };
+		C40B24F127A3106D0018C7D2 /* ServicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EC1E67279DE0540010F296 /* ServicesView.swift */; };
+		C40B24F227A310770018C7D2 /* Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EC1E72279DFCF40010F296 /* Events.swift */; };
+		C40B24F427A310830018C7D2 /* StatusMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C47331A1247093B7009A0597 /* StatusMenu.swift */; };
 		C40C7F1E2772136000DDDCDC /* PhpEnv.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F1D2772136000DDDCDC /* PhpEnv.swift */; };
 		C40C7F1F2772136000DDDCDC /* PhpEnv.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F1D2772136000DDDCDC /* PhpEnv.swift */; };
-		C40C7F202772136000DDDCDC /* PhpEnv.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F1D2772136000DDDCDC /* PhpEnv.swift */; };
-		C40C7F2227721F8200DDDCDC /* PhpInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F2E4392752F7D00020E974 /* PhpInstallation.swift */; };
-		C40C7F2327721F8200DDDCDC /* ActivePhpInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4A22B019FF00E7CF16 /* ActivePhpInstallation.swift */; };
-		C40C7F2427721F8200DDDCDC /* PhpExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4ACA38E25C754C100060C66 /* PhpExtension.swift */; };
-		C40C7F2527721F9800DDDCDC /* HomebrewPackage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */; };
-		C40C7F2627721FA200DDDCDC /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE188322D3386B00E126E5 /* Constants.swift */; };
 		C40C7F2827721FF600DDDCDC /* ActivePhpInstallation+Checks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2727721FF600DDDCDC /* ActivePhpInstallation+Checks.swift */; };
 		C40C7F2927721FF600DDDCDC /* ActivePhpInstallation+Checks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2727721FF600DDDCDC /* ActivePhpInstallation+Checks.swift */; };
-		C40C7F2B2772201C00DDDCDC /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3B62770F294005EF286 /* Actions.swift */; };
 		C40C7F3027722E8D00DDDCDC /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2F27722E8D00DDDCDC /* Logger.swift */; };
 		C40C7F3127722E8D00DDDCDC /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2F27722E8D00DDDCDC /* Logger.swift */; };
-		C40C7F3227722E8D00DDDCDC /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2F27722E8D00DDDCDC /* Logger.swift */; };
 		C412E5FC25700D5300A1FB67 /* HomebrewPackage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */; };
+		C415937F27A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */; };
+		C415938027A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */; };
 		C415D3B72770F294005EF286 /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3B62770F294005EF286 /* Actions.swift */; };
 		C415D3B82770F294005EF286 /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3B62770F294005EF286 /* Actions.swift */; };
-		C415D3E12770F34D005EF286 /* AllowedArguments.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3DE2770F34D005EF286 /* AllowedArguments.swift */; };
-		C415D3E62770F540005EF286 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3E52770F540005EF286 /* main.swift */; };
 		C415D3E82770F692005EF286 /* AppDelegate+InterApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3E72770F692005EF286 /* AppDelegate+InterApp.swift */; };
 		C415D3E92770F692005EF286 /* AppDelegate+InterApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3E72770F692005EF286 /* AppDelegate+InterApp.swift */; };
 		C417DC74277614690015E6EE /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = C417DC73277614690015E6EE /* Helpers.swift */; };
 		C417DC75277614690015E6EE /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = C417DC73277614690015E6EE /* Helpers.swift */; };
-		C417DC76277614690015E6EE /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = C417DC73277614690015E6EE /* Helpers.swift */; };
 		C4188989275FE8CB001EF227 /* Filesystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4188988275FE8CB001EF227 /* Filesystem.swift */; };
 		C418898A275FE8CB001EF227 /* Filesystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4188988275FE8CB001EF227 /* Filesystem.swift */; };
 		C41C1B3722B0097F00E7CF16 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */; };
@ -63,6 +65,7 @@
 		C4232EE52612526500158FC6 /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = C4232EE42612526500158FC6 /* Credits.html */; };
 		C42759672627662800093CAE /* NSMenuExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42759662627662800093CAE /* NSMenuExtension.swift */; };
 		C42759682627662800093CAE /* NSMenuExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42759662627662800093CAE /* NSMenuExtension.swift */; };
+		C42C49DB27C2806F0074ABAC /* MainMenu+FixMyValet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42C49DA27C2806F0074ABAC /* MainMenu+FixMyValet.swift */; };
 		C43603A0275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */; };
 		C43603A1275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */; };
 		C43A8A1A25D9CD1000591B77 /* Utility.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43A8A1925D9CD1000591B77 /* Utility.swift */; };
@ -72,6 +75,10 @@
 		C44C198E276E3A1C0072762D /* ProgressWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44C198C276E3A1C0072762D /* ProgressWindow.swift */; };
 		C44C1991276E44CB0072762D /* ProgressWindow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C44C1990276E44CB0072762D /* ProgressWindow.storyboard */; };
 		C44C1992276E44CB0072762D /* ProgressWindow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C44C1990276E44CB0072762D /* ProgressWindow.storyboard */; };
+		C44CCD4027AFE2FC00CE40E5 /* AlertableError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44CCD3F27AFE2FC00CE40E5 /* AlertableError.swift */; };
+		C44CCD4127AFE2FC00CE40E5 /* AlertableError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44CCD3F27AFE2FC00CE40E5 /* AlertableError.swift */; };
+		C44CCD4927AFF3B700CE40E5 /* MainMenu+Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44CCD4827AFF3B700CE40E5 /* MainMenu+Async.swift */; };
+		C44CCD4A27AFF3BC00CE40E5 /* MainMenu+Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44CCD4827AFF3B700CE40E5 /* MainMenu+Async.swift */; };
 		C464ADAC275A7A3F003FCD53 /* SiteListWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAB275A7A3F003FCD53 /* SiteListWC.swift */; };
 		C464ADAD275A7A3F003FCD53 /* SiteListWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAB275A7A3F003FCD53 /* SiteListWC.swift */; };
 		C464ADAF275A7A69003FCD53 /* SiteListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAE275A7A69003FCD53 /* SiteListVC.swift */; };
@ -94,38 +101,41 @@
 		C48D0CA325CC992000CC7490 /* StatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0CA225CC992000CC7490 /* StatsView.swift */; };
 		C48D6C70279CD2AC00F26D7E /* PhpVersionNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D6C6F279CD2AC00F26D7E /* PhpVersionNumber.swift */; };
 		C48D6C71279CD2AC00F26D7E /* PhpVersionNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D6C6F279CD2AC00F26D7E /* PhpVersionNumber.swift */; };
-		C48D6C72279CD2AC00F26D7E /* PhpVersionNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D6C6F279CD2AC00F26D7E /* PhpVersionNumber.swift */; };
 		C48D6C75279CD3E400F26D7E /* PhpVersionNumberTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D6C73279CD3E400F26D7E /* PhpVersionNumberTest.swift */; };
+		C4927F0B27B2DFC200C55AFD /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4927F0A27B2DFC200C55AFD /* Errors.swift */; };
+		C4927F0C27B2DFC200C55AFD /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4927F0A27B2DFC200C55AFD /* Errors.swift */; };
 		C493084A279F331F009C240B /* AddSiteVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4930849279F331F009C240B /* AddSiteVC.swift */; };
 		C493084B279F331F009C240B /* AddSiteVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4930849279F331F009C240B /* AddSiteVC.swift */; };
 		C4998F0626175E7200B2526E /* HotKey in Frameworks */ = {isa = PBXBuildFile; productRef = C4998F0526175E7200B2526E /* HotKey */; };
 		C4998F0A2617633900B2526E /* PrefsWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4998F092617633900B2526E /* PrefsWC.swift */; };
 		C4998F0B2617633900B2526E /* PrefsWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4998F092617633900B2526E /* PrefsWC.swift */; };
+		C49E171F27A5736E00787921 /* PMServicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49E171E27A5736E00787921 /* PMServicesView.swift */; };
 		C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4ACA38E25C754C100060C66 /* PhpExtension.swift */; };
 		C4AF9F71275445FF00D44ED0 /* valet-config.json in Resources */ = {isa = PBXBuildFile; fileRef = C4AF9F70275445FF00D44ED0 /* valet-config.json */; };
 		C4AF9F72275445FF00D44ED0 /* valet-config.json in Resources */ = {isa = PBXBuildFile; fileRef = C4AF9F70275445FF00D44ED0 /* valet-config.json */; };
 		C4AF9F78275447F100D44ED0 /* ValetConfigParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F76275447F100D44ED0 /* ValetConfigParserTest.swift */; };
 		C4AF9F7A2754499000D44ED0 /* Valet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F792754499000D44ED0 /* Valet.swift */; };
 		C4AF9F7B2754499000D44ED0 /* Valet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F792754499000D44ED0 /* Valet.swift */; };
-		C4AF9F7D275454A900D44ED0 /* ValetTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F7C275454A900D44ED0 /* ValetTest.swift */; };
+		C4AF9F7D275454A900D44ED0 /* ValetVersionExtractorTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F7C275454A900D44ED0 /* ValetVersionExtractorTest.swift */; };
 		C4B5635E276AB09000F12CCB /* VersionExtractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5635D276AB09000F12CCB /* VersionExtractor.swift */; };
 		C4B5635F276AB09000F12CCB /* VersionExtractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5635D276AB09000F12CCB /* VersionExtractor.swift */; };
 		C4B56362276AB0A500F12CCB /* VersionExtractorTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B56360276AB0A500F12CCB /* VersionExtractorTest.swift */; };
 		C4B5853E2770FE3900DA4FBE /* Paths.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5853B2770FE3900DA4FBE /* Paths.swift */; };
 		C4B5853F2770FE3900DA4FBE /* Paths.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5853B2770FE3900DA4FBE /* Paths.swift */; };
-		C4B585402770FE3900DA4FBE /* Paths.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5853B2770FE3900DA4FBE /* Paths.swift */; };
 		C4B585412770FE3900DA4FBE /* Shell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5853C2770FE3900DA4FBE /* Shell.swift */; };
 		C4B585422770FE3900DA4FBE /* Shell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5853C2770FE3900DA4FBE /* Shell.swift */; };
-		C4B585432770FE3900DA4FBE /* Shell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5853C2770FE3900DA4FBE /* Shell.swift */; };
 		C4B585442770FE3900DA4FBE /* Command.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5853D2770FE3900DA4FBE /* Command.swift */; };
 		C4B585452770FE3900DA4FBE /* Command.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5853D2770FE3900DA4FBE /* Command.swift */; };
-		C4B585462770FE3900DA4FBE /* Command.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B5853D2770FE3900DA4FBE /* Command.swift */; };
 		C4B97B75275CF08C003F3378 /* AppDelegate+MenuOutlets.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B74275CF08C003F3378 /* AppDelegate+MenuOutlets.swift */; };
 		C4B97B76275CF08C003F3378 /* AppDelegate+MenuOutlets.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B74275CF08C003F3378 /* AppDelegate+MenuOutlets.swift */; };
 		C4B97B78275CF1B5003F3378 /* App+ActivationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B77275CF1B5003F3378 /* App+ActivationPolicy.swift */; };
 		C4B97B79275CF1B5003F3378 /* App+ActivationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B77275CF1B5003F3378 /* App+ActivationPolicy.swift */; };
 		C4B97B7B275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */; };
 		C4B97B7C275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */; };
+		C4BF90C127C57C220054E78C /* MainMenu+FixMyValet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42C49DA27C2806F0074ABAC /* MainMenu+FixMyValet.swift */; };
+		C4C1019627C659B7001FACC2 /* HotKey in Frameworks */ = {isa = PBXBuildFile; productRef = C4C1019527C659B7001FACC2 /* HotKey */; };
+		C4C1019B27C65C6F001FACC2 /* Process.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C1019A27C65C6F001FACC2 /* Process.swift */; };
+		C4C1019C27C65C6F001FACC2 /* Process.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C1019A27C65C6F001FACC2 /* Process.swift */; };
 		C4C3ED412783497000AB15D8 /* MainMenu+Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C3ED402783497000AB15D8 /* MainMenu+Startup.swift */; };
 		C4C3ED4327834C5200AB15D8 /* CustomPrefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C3ED4227834C5200AB15D8 /* CustomPrefs.swift */; };
 		C4C8E818276F54D8003AC782 /* App+ConfigWatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C8E817276F54D8003AC782 /* App+ConfigWatch.swift */; };
@ -134,39 +144,44 @@
 		C4C8E81C276F54E5003AC782 /* PhpConfigWatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C8E81A276F54E5003AC782 /* PhpConfigWatcher.swift */; };
 		C4CCBA6C275C567B008C7055 /* PMWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CCBA6B275C567B008C7055 /* PMWindowController.swift */; };
 		C4CCBA6D275C567B008C7055 /* PMWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CCBA6B275C567B008C7055 /* PMWindowController.swift */; };
+		C4CE3BB827B31F2E0086CA49 /* MainMenu+Switcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CE3BB727B31F2E0086CA49 /* MainMenu+Switcher.swift */; };
+		C4CE3BBA27B31F670086CA49 /* ComposerWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CE3BB927B31F670086CA49 /* ComposerWindow.swift */; };
+		C4CE3BBB27B324230086CA49 /* MainMenu+Switcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CE3BB727B31F2E0086CA49 /* MainMenu+Switcher.swift */; };
+		C4CE3BBC27B324250086CA49 /* ComposerWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CE3BB927B31F670086CA49 /* ComposerWindow.swift */; };
 		C4D8016622B1584700C6DA1B /* Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D8016522B1584700C6DA1B /* Startup.swift */; };
 		C4D89BC62783C99400A02B68 /* ComposerJson.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D89BC52783C99400A02B68 /* ComposerJson.swift */; };
 		C4D9ADBF277610E1007277F4 /* PhpSwitcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D9ADBE277610E1007277F4 /* PhpSwitcher.swift */; };
 		C4D9ADC0277610E1007277F4 /* PhpSwitcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D9ADBE277610E1007277F4 /* PhpSwitcher.swift */; };
-		C4D9ADC1277610E1007277F4 /* PhpSwitcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D9ADBE277610E1007277F4 /* PhpSwitcher.swift */; };
 		C4D9ADC8277611A0007277F4 /* InternalSwitcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D9ADC7277611A0007277F4 /* InternalSwitcher.swift */; };
 		C4D9ADC9277611A0007277F4 /* InternalSwitcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D9ADC7277611A0007277F4 /* InternalSwitcher.swift */; };
-		C4D9ADCA277611A0007277F4 /* InternalSwitcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D9ADC7277611A0007277F4 /* InternalSwitcher.swift */; };
+		C4DEB7D427A5D60B00834718 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DEB7D327A5D60B00834718 /* Stats.swift */; };
+		C4E0F7ED27BEBDA9007475F2 /* NSWindowExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E0F7EC27BEBDA9007475F2 /* NSWindowExtension.swift */; };
+		C4E0F7EE27BEBDA9007475F2 /* NSWindowExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E0F7EC27BEBDA9007475F2 /* NSWindowExtension.swift */; };
+		C4E4404627C56F4700D225E1 /* ValetSite.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E4404527C56F4700D225E1 /* ValetSite.swift */; };
+		C4E4404727C56F4700D225E1 /* ValetSite.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E4404527C56F4700D225E1 /* ValetSite.swift */; };
 		C4EC1E66279DE0380010F296 /* ServicesView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4EC1E65279DE0380010F296 /* ServicesView.xib */; };
 		C4EC1E68279DE0540010F296 /* ServicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EC1E67279DE0540010F296 /* ServicesView.swift */; };
-		C4EC1E6D279DF87A0010F296 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EC1E6C279DF87A0010F296 /* Async.swift */; };
-		C4EC1E6E279DF87A0010F296 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EC1E6C279DF87A0010F296 /* Async.swift */; };
 		C4EC1E73279DFCF40010F296 /* Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EC1E72279DFCF40010F296 /* Events.swift */; };
-		C4EC1E74279DFCF40010F296 /* Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EC1E72279DFCF40010F296 /* Events.swift */; };
 		C4EE188422D3386B00E126E5 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE188322D3386B00E126E5 /* Constants.swift */; };
 		C4EE55A927708B9E001DF387 /* PMHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE55A627708B9E001DF387 /* PMHeaderView.swift */; };
 		C4EE55AA27708B9E001DF387 /* PMHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE55A627708B9E001DF387 /* PMHeaderView.swift */; };
 		C4EE55AB27708B9E001DF387 /* Preview.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE55A727708B9E001DF387 /* Preview.swift */; };
-		C4EE55AC27708B9E001DF387 /* Preview.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE55A727708B9E001DF387 /* Preview.swift */; };
 		C4EE55AD27708B9E001DF387 /* PMStatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE55A827708B9E001DF387 /* PMStatsView.swift */; };
 		C4EE55AE27708B9E001DF387 /* PMStatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE55A827708B9E001DF387 /* PMStatsView.swift */; };
+		C4EED88927A48778006D7272 /* InterAppHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EED88827A48778006D7272 /* InterAppHandler.swift */; };
+		C4EED88A27A48778006D7272 /* InterAppHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EED88827A48778006D7272 /* InterAppHandler.swift */; };
 		C4F2E4372752F0870020E974 /* HomebrewDiagnostics.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F2E4362752F0870020E974 /* HomebrewDiagnostics.swift */; };
 		C4F2E4382752F08D0020E974 /* HomebrewDiagnostics.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F2E4362752F0870020E974 /* HomebrewDiagnostics.swift */; };
 		C4F2E43A2752F7D00020E974 /* PhpInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F2E4392752F7D00020E974 /* PhpInstallation.swift */; };
 		C4F2E43B27530F750020E974 /* PhpInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F2E4392752F7D00020E974 /* PhpInstallation.swift */; };
 		C4F30B03278E16BA00755FCE /* HomebrewService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F30B02278E16BA00755FCE /* HomebrewService.swift */; };
 		C4F30B04278E16BA00755FCE /* HomebrewService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F30B02278E16BA00755FCE /* HomebrewService.swift */; };
-		C4F30B05278E16BA00755FCE /* HomebrewService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F30B02278E16BA00755FCE /* HomebrewService.swift */; };
 		C4F30B07278E195800755FCE /* brew-services.json in Resources */ = {isa = PBXBuildFile; fileRef = C4F30B06278E195800755FCE /* brew-services.json */; };
 		C4F30B08278E195800755FCE /* brew-services.json in Resources */ = {isa = PBXBuildFile; fileRef = C4F30B06278E195800755FCE /* brew-services.json */; };
 		C4F30B09278E1A0E00755FCE /* CustomPrefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C3ED4227834C5200AB15D8 /* CustomPrefs.swift */; };
 		C4F30B0A278E1A1A00755FCE /* ComposerJson.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D89BC52783C99400A02B68 /* ComposerJson.swift */; };
 		C4F30B0B278E203C00755FCE /* MainMenu+Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C3ED402783497000AB15D8 /* MainMenu+Startup.swift */; };
+		C4F319C927B034A500AFF46F /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DEB7D327A5D60B00834718 /* Stats.swift */; };
 		C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F7809B25D80344000DBC97 /* CommandTest.swift */; };
 		C4F780A825D80AE8000DBC97 /* php.ini in Resources */ = {isa = PBXBuildFile; fileRef = C4F780A725D80AE8000DBC97 /* php.ini */; };
 		C4F780AE25D80B37000DBC97 /* ExtensionParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F780AD25D80B37000DBC97 /* ExtensionParserTest.swift */; };
@ -179,7 +194,6 @@
 		C4F780C425D80B75000DBC97 /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */; };
 		C4F780C525D80B75000DBC97 /* MenuBarImageGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */; };
 		C4F780C625D80B75000DBC97 /* XibLoadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0C9225CC804200CC7490 /* XibLoadable.swift */; };
-		C4F780C725D80B75000DBC97 /* StatusMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C47331A1247093B7009A0597 /* StatusMenu.swift */; };
 		C4F780C825D80B75000DBC97 /* DateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F8C0A322D4F12C002EFE61 /* DateExtension.swift */; };
 		C4F780C925D80B75000DBC97 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46FA23E246C358E00944F05 /* StringExtension.swift */; };
 		C4F780CA25D80B75000DBC97 /* HomebrewPackage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */; };
@ -201,38 +215,29 @@
 		};
 /* End PBXContainerItemProxy section */

-/* Begin PBXCopyFilesBuildPhase section */
-		C415D3D42770F341005EF286 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		5420395826135DC100FB00FA /* PrefsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefsVC.swift; sourceTree = "<group>"; };
 		5420395E2613607600FB00FA /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = "<group>"; };
-		54AB03252763858F00A29D5F /* Timer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Timer.swift; sourceTree = "<group>"; };
 		54B48B5E275F66AE006D90C5 /* Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; };
-		54FCFD25276C883F004CE748 /* CheckboxPreferenceView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CheckboxPreferenceView.xib; sourceTree = "<group>"; };
+		54FCFD25276C883F004CE748 /* SelectPreferenceView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SelectPreferenceView.xib; sourceTree = "<group>"; };
 		54FCFD29276C8AA4004CE748 /* CheckboxPreferenceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxPreferenceView.swift; sourceTree = "<group>"; };
 		54FCFD2C276C8D67004CE748 /* HotkeyPreferenceView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HotkeyPreferenceView.xib; sourceTree = "<group>"; };
 		54FCFD2F276C8DA4004CE748 /* HotkeyPreferenceView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HotkeyPreferenceView.swift; sourceTree = "<group>"; };
 		C405A4CE24B9B9130062FAFA /* InternetAccessPolicy.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = InternetAccessPolicy.strings; sourceTree = "<group>"; };
 		C405A4CF24B9B9140062FAFA /* InternetAccessPolicy.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = InternetAccessPolicy.plist; sourceTree = "<group>"; };
+		C4068CA327B0780A00544CD5 /* CheckboxPreferenceView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CheckboxPreferenceView.xib; sourceTree = "<group>"; };
+		C4068CA627B07A1300544CD5 /* SelectPreferenceView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectPreferenceView.swift; sourceTree = "<group>"; };
+		C4068CA927B0890D00544CD5 /* MenuBarIcons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarIcons.swift; sourceTree = "<group>"; };
+		C4080FF527BD8C6400BF2C6B /* BetterAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BetterAlert.swift; sourceTree = "<group>"; };
+		C4080FF927BD956700BF2C6B /* BetterAlertVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BetterAlertVC.swift; sourceTree = "<group>"; };
 		C40C7F1D2772136000DDDCDC /* PhpEnv.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpEnv.swift; sourceTree = "<group>"; };
 		C40C7F2727721FF600DDDCDC /* ActivePhpInstallation+Checks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ActivePhpInstallation+Checks.swift"; sourceTree = "<group>"; };
 		C40C7F2F27722E8D00DDDCDC /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
 		C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomebrewPackage.swift; sourceTree = "<group>"; };
+		C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpFrameworks.swift; sourceTree = "<group>"; };
 		C415D3B62770F294005EF286 /* Actions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Actions.swift; sourceTree = "<group>"; };
-		C415D3D62770F341005EF286 /* phpmon-cli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "phpmon-cli"; sourceTree = BUILT_PRODUCTS_DIR; };
-		C415D3DE2770F34D005EF286 /* AllowedArguments.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AllowedArguments.swift; sourceTree = "<group>"; };
-		C415D3E52770F540005EF286 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
 		C415D3E72770F692005EF286 /* AppDelegate+InterApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+InterApp.swift"; sourceTree = "<group>"; };
+		C4168F4427ADB4A3003B6C39 /* DEVELOPER.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = DEVELOPER.md; sourceTree = "<group>"; };
 		C417DC73277614690015E6EE /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = "<group>"; };
 		C4188988275FE8CB001EF227 /* Filesystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Filesystem.swift; sourceTree = "<group>"; };
 		C41C1B3322B0097F00E7CF16 /* PHP Monitor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "PHP Monitor.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@ -248,12 +253,15 @@
 		C41E87192763D42300161EE0 /* SiteListVC+ContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SiteListVC+ContextMenu.swift"; sourceTree = "<group>"; };
 		C4232EE42612526500158FC6 /* Credits.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = Credits.html; sourceTree = "<group>"; };
 		C42759662627662800093CAE /* NSMenuExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSMenuExtension.swift; sourceTree = "<group>"; };
+		C42C49DA27C2806F0074ABAC /* MainMenu+FixMyValet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+FixMyValet.swift"; sourceTree = "<group>"; };
 		C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Notifications.swift"; sourceTree = "<group>"; };
 		C43A8A1925D9CD1000591B77 /* Utility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utility.swift; sourceTree = "<group>"; };
 		C43A8A1F25D9D1D700591B77 /* brew.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = brew.json; sourceTree = "<group>"; };
 		C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrewJsonParserTest.swift; sourceTree = "<group>"; };
 		C44C198C276E3A1C0072762D /* ProgressWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressWindow.swift; sourceTree = "<group>"; };
 		C44C1990276E44CB0072762D /* ProgressWindow.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ProgressWindow.storyboard; sourceTree = "<group>"; };
+		C44CCD3F27AFE2FC00CE40E5 /* AlertableError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertableError.swift; sourceTree = "<group>"; };
+		C44CCD4827AFF3B700CE40E5 /* MainMenu+Async.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+Async.swift"; sourceTree = "<group>"; };
 		C464ADAB275A7A3F003FCD53 /* SiteListWC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteListWC.swift; sourceTree = "<group>"; };
 		C464ADAE275A7A69003FCD53 /* SiteListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteListVC.swift; sourceTree = "<group>"; };
 		C464ADB1275A87CA003FCD53 /* SiteListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteListCell.swift; sourceTree = "<group>"; };
@ -271,13 +279,15 @@
 		C48D0CA225CC992000CC7490 /* StatsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatsView.swift; sourceTree = "<group>"; };
 		C48D6C6F279CD2AC00F26D7E /* PhpVersionNumber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpVersionNumber.swift; sourceTree = "<group>"; };
 		C48D6C73279CD3E400F26D7E /* PhpVersionNumberTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhpVersionNumberTest.swift; sourceTree = "<group>"; };
+		C4927F0A27B2DFC200C55AFD /* Errors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = "<group>"; };
 		C4930849279F331F009C240B /* AddSiteVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSiteVC.swift; sourceTree = "<group>"; };
 		C4998F092617633900B2526E /* PrefsWC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefsWC.swift; sourceTree = "<group>"; };
+		C49E171E27A5736E00787921 /* PMServicesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PMServicesView.swift; sourceTree = "<group>"; };
 		C4ACA38E25C754C100060C66 /* PhpExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpExtension.swift; sourceTree = "<group>"; };
 		C4AF9F70275445FF00D44ED0 /* valet-config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "valet-config.json"; sourceTree = "<group>"; };
 		C4AF9F76275447F100D44ED0 /* ValetConfigParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetConfigParserTest.swift; sourceTree = "<group>"; };
 		C4AF9F792754499000D44ED0 /* Valet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Valet.swift; sourceTree = "<group>"; };
-		C4AF9F7C275454A900D44ED0 /* ValetTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetTest.swift; sourceTree = "<group>"; };
+		C4AF9F7C275454A900D44ED0 /* ValetVersionExtractorTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetVersionExtractorTest.swift; sourceTree = "<group>"; };
 		C4B5635D276AB09000F12CCB /* VersionExtractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionExtractor.swift; sourceTree = "<group>"; };
 		C4B56360276AB0A500F12CCB /* VersionExtractorTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VersionExtractorTest.swift; sourceTree = "<group>"; };
 		C4B5853B2770FE3900DA4FBE /* Paths.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Paths.swift; sourceTree = "<group>"; };
@ -286,30 +296,35 @@
 		C4B97B74275CF08C003F3378 /* AppDelegate+MenuOutlets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+MenuOutlets.swift"; sourceTree = "<group>"; };
 		C4B97B77275CF1B5003F3378 /* App+ActivationPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "App+ActivationPolicy.swift"; sourceTree = "<group>"; };
 		C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "App+GlobalHotkey.swift"; sourceTree = "<group>"; };
+		C4C1019A27C65C6F001FACC2 /* Process.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Process.swift; sourceTree = "<group>"; };
 		C4C3ED402783497000AB15D8 /* MainMenu+Startup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+Startup.swift"; sourceTree = "<group>"; };
 		C4C3ED4227834C5200AB15D8 /* CustomPrefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPrefs.swift; sourceTree = "<group>"; };
 		C4C8E817276F54D8003AC782 /* App+ConfigWatch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "App+ConfigWatch.swift"; sourceTree = "<group>"; };
 		C4C8E81A276F54E5003AC782 /* PhpConfigWatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhpConfigWatcher.swift; sourceTree = "<group>"; };
 		C4CCBA6B275C567B008C7055 /* PMWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PMWindowController.swift; sourceTree = "<group>"; };
+		C4CE3BB727B31F2E0086CA49 /* MainMenu+Switcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+Switcher.swift"; sourceTree = "<group>"; };
+		C4CE3BB927B31F670086CA49 /* ComposerWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerWindow.swift; sourceTree = "<group>"; };
 		C4D8016522B1584700C6DA1B /* Startup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Startup.swift; sourceTree = "<group>"; };
 		C4D89BC52783C99400A02B68 /* ComposerJson.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerJson.swift; sourceTree = "<group>"; };
 		C4D9ADBE277610E1007277F4 /* PhpSwitcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpSwitcher.swift; sourceTree = "<group>"; };
 		C4D9ADC7277611A0007277F4 /* InternalSwitcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InternalSwitcher.swift; sourceTree = "<group>"; };
+		C4DEB7D327A5D60B00834718 /* Stats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stats.swift; sourceTree = "<group>"; };
+		C4E0F7EC27BEBDA9007475F2 /* NSWindowExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSWindowExtension.swift; sourceTree = "<group>"; };
+		C4E4404527C56F4700D225E1 /* ValetSite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetSite.swift; sourceTree = "<group>"; };
 		C4E713562570150F00007428 /* SECURITY.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = SECURITY.md; sourceTree = "<group>"; };
 		C4E713572570151400007428 /* docs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = docs; sourceTree = "<group>"; };
 		C4EC1E65279DE0380010F296 /* ServicesView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ServicesView.xib; sourceTree = "<group>"; };
 		C4EC1E67279DE0540010F296 /* ServicesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServicesView.swift; sourceTree = "<group>"; };
-		C4EC1E6C279DF87A0010F296 /* Async.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = "<group>"; };
 		C4EC1E72279DFCF40010F296 /* Events.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Events.swift; sourceTree = "<group>"; };
 		C4EE188322D3386B00E126E5 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		C4EE55A627708B9E001DF387 /* PMHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PMHeaderView.swift; sourceTree = "<group>"; };
 		C4EE55A727708B9E001DF387 /* Preview.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Preview.swift; sourceTree = "<group>"; };
 		C4EE55A827708B9E001DF387 /* PMStatsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PMStatsView.swift; sourceTree = "<group>"; };
+		C4EED88827A48778006D7272 /* InterAppHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InterAppHandler.swift; sourceTree = "<group>"; };
 		C4F2E4362752F0870020E974 /* HomebrewDiagnostics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomebrewDiagnostics.swift; sourceTree = "<group>"; };
 		C4F2E4392752F7D00020E974 /* PhpInstallation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpInstallation.swift; sourceTree = "<group>"; };
 		C4F30B02278E16BA00755FCE /* HomebrewService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomebrewService.swift; sourceTree = "<group>"; };
 		C4F30B06278E195800755FCE /* brew-services.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "brew-services.json"; sourceTree = "<group>"; };
-		C4F7807425D7F7E5000DBC97 /* RELEASE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = RELEASE.md; sourceTree = "<group>"; };
 		C4F7807925D7F84B000DBC97 /* phpmon-tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "phpmon-tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C4F7807D25D7F84B000DBC97 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		C4F7809B25D80344000DBC97 /* CommandTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandTest.swift; sourceTree = "<group>"; };
@ -321,13 +336,6 @@
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
-		C415D3D32770F341005EF286 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		C41C1B3022B0097F00E7CF16 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@ -340,6 +348,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C4C1019627C659B7001FACC2 /* HotKey in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -353,6 +362,8 @@
 				5420395826135DC100FB00FA /* PrefsVC.swift */,
 				5420395E2613607600FB00FA /* Preferences.swift */,
 				C4C3ED4227834C5200AB15D8 /* CustomPrefs.swift */,
+				C4068CA927B0890D00544CD5 /* MenuBarIcons.swift */,
+				C4DEB7D327A5D60B00834718 /* Stats.swift */,
 				C41CD0272628D8E20065BBED /* Keybinds */,
 				54FCFD28276C88C0004CE748 /* Views */,
 			);
@ -375,8 +386,10 @@
 		54FCFD28276C88C0004CE748 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				54FCFD25276C883F004CE748 /* CheckboxPreferenceView.xib */,
+				C4068CA327B0780A00544CD5 /* CheckboxPreferenceView.xib */,
 				54FCFD29276C8AA4004CE748 /* CheckboxPreferenceView.swift */,
+				54FCFD25276C883F004CE748 /* SelectPreferenceView.xib */,
+				C4068CA627B07A1300544CD5 /* SelectPreferenceView.swift */,
 				54FCFD2C276C8D67004CE748 /* HotkeyPreferenceView.xib */,
 				54FCFD2F276C8DA4004CE748 /* HotkeyPreferenceView.swift */,
 			);
@ -392,6 +405,15 @@
 			path = IAP;
 			sourceTree = "<group>";
 		};
+		C4080FF827BD955900BF2C6B /* Notice */ = {
+			isa = PBXGroup;
+			children = (
+				C4080FF527BD8C6400BF2C6B /* BetterAlert.swift */,
+				C4080FF927BD956700BF2C6B /* BetterAlertVC.swift */,
+			);
+			path = Notice;
+			sourceTree = "<group>";
+		};
 		C40C7F1C27720E1400DDDCDC /* Test Files */ = {
 			isa = PBXGroup;
 			children = (
@ -412,32 +434,22 @@
 				C4B5853D2770FE3900DA4FBE /* Command.swift */,
 				C4B5853B2770FE3900DA4FBE /* Paths.swift */,
 				C4B5853C2770FE3900DA4FBE /* Shell.swift */,
+				C4C1019A27C65C6F001FACC2 /* Process.swift */,
 				C40C7F2F27722E8D00DDDCDC /* Logger.swift */,
 				C417DC73277614690015E6EE /* Helpers.swift */,
 			);
 			path = Core;
 			sourceTree = "<group>";
 		};
-		C415D3D72770F341005EF286 /* phpmon-cli */ = {
-			isa = PBXGroup;
-			children = (
-				C415D3E52770F540005EF286 /* main.swift */,
-				C415D3DE2770F34D005EF286 /* AllowedArguments.swift */,
-			);
-			path = "phpmon-cli";
-			sourceTree = "<group>";
-		};
 		C41C1B2A22B0097F00E7CF16 = {
 			isa = PBXGroup;
 			children = (
 				C4F8C0A522D4FA41002EFE61 /* README.md */,
 				C4E713562570150F00007428 /* SECURITY.md */,
-				C4F7807425D7F7E5000DBC97 /* RELEASE.md */,
+				C4168F4427ADB4A3003B6C39 /* DEVELOPER.md */,
 				C4E713572570151400007428 /* docs */,
 				C41C1B3522B0097F00E7CF16 /* phpmon */,
 				C4F7807A25D7F84B000DBC97 /* phpmon-tests */,
-				C415D3D72770F341005EF286 /* phpmon-cli */,
-				C4B5853A2770FE2500DA4FBE /* phpmon-common */,
 				C41C1B3422B0097F00E7CF16 /* Products */,
 				C4D309E72770EF2F00958BCF /* Frameworks */,
 			);
@ -448,7 +460,6 @@
 			children = (
 				C41C1B3322B0097F00E7CF16 /* PHP Monitor.app */,
 				C4F7807925D7F84B000DBC97 /* phpmon-tests.xctest */,
-				C415D3D62770F341005EF286 /* phpmon-cli */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@ -456,6 +467,7 @@
 		C41C1B3522B0097F00E7CF16 /* phpmon */ = {
 			isa = PBXGroup;
 			children = (
+				C4B5853A2770FE2500DA4FBE /* Common */,
 				C41E181722CB61EB0072CF09 /* Domain */,
 				C41C1B3F22B0098000E7CF16 /* Info.plist */,
 				C4232EE42612526500158FC6 /* Credits.html */,
@ -478,16 +490,15 @@
 		C41E181722CB61EB0072CF09 /* Domain */ = {
 			isa = PBXGroup;
 			children = (
+				C4080FF827BD955900BF2C6B /* Notice */,
 				C4AF9F6B275445D300D44ED0 /* Integrations */,
-				C4B13B1D25C4915000548C3A /* Core */,
+				C4B13B1D25C4915000548C3A /* App */,
 				C4D9ADBD27761084007277F4 /* PHP */,
 				C47331A0247093AC009A0597 /* Menu */,
 				C464ADAA275A7A25003FCD53 /* SiteList */,
 				5420395726135DB800FB00FA /* Preferences */,
 				C44C198F276E3A380072762D /* Progress */,
 				C4C8E81D276F5686003AC782 /* Watcher */,
-				C4811D2822D70D9C00B5F6B3 /* Helpers */,
-				C4F8C0A222D4F100002EFE61 /* Extensions */,
 				C4EE55B027708BB2001DF387 /* SwiftUI */,
 			);
 			path = Domain;
@ -502,6 +513,15 @@
 			path = Progress;
 			sourceTree = "<group>";
 		};
+		C44CCD4327AFE93300CE40E5 /* Errors */ = {
+			isa = PBXGroup;
+			children = (
+				C44CCD3F27AFE2FC00CE40E5 /* AlertableError.swift */,
+				C4927F0A27B2DFC200C55AFD /* Errors.swift */,
+			);
+			path = Errors;
+			sourceTree = "<group>";
+		};
 		C464ADAA275A7A25003FCD53 /* SiteList */ = {
 			isa = PBXGroup;
 			children = (
@ -520,6 +540,9 @@
 			children = (
 				C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */,
 				C4C3ED402783497000AB15D8 /* MainMenu+Startup.swift */,
+				C44CCD4827AFF3B700CE40E5 /* MainMenu+Async.swift */,
+				C4CE3BB727B31F2E0086CA49 /* MainMenu+Switcher.swift */,
+				C42C49DA27C2806F0074ABAC /* MainMenu+FixMyValet.swift */,
 				C47331A1247093B7009A0597 /* StatusMenu.swift */,
 				C48D0C9525CC80B100CC7490 /* HeaderView.swift */,
 				C48D0C9925CC888B00CC7490 /* HeaderView.xib */,
@ -540,9 +563,7 @@
 				C474B00524C0E98C00066A22 /* LocalNotification.swift */,
 				C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */,
 				C4CCBA6B275C567B008C7055 /* PMWindowController.swift */,
-				54AB03252763858F00A29D5F /* Timer.swift */,
 				C4B5635D276AB09000F12CCB /* VersionExtractor.swift */,
-				C4EC1E6C279DF87A0010F296 /* Async.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@ -560,6 +581,7 @@
 			isa = PBXGroup;
 			children = (
 				C4AF9F792754499000D44ED0 /* Valet.swift */,
+				C4E4404527C56F4700D225E1 /* ValetSite.swift */,
 			);
 			path = Valet;
 			sourceTree = "<group>";
@ -582,7 +604,7 @@
 			path = Homebrew;
 			sourceTree = "<group>";
 		};
-		C4B13B1D25C4915000548C3A /* Core */ = {
+		C4B13B1D25C4915000548C3A /* App */ = {
 			isa = PBXGroup;
 			children = (
 				C41C1B3C22B0098000E7CF16 /* Main.storyboard */,
@ -593,18 +615,51 @@
 				C4811D2322D70A4700B5F6B3 /* App.swift */,
 				C4B97B77275CF1B5003F3378 /* App+ActivationPolicy.swift */,
 				C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */,
+				C4EED88827A48778006D7272 /* InterAppHandler.swift */,
 				C4D8016522B1584700C6DA1B /* Startup.swift */,
 			);
-			path = Core;
+			path = App;
 			sourceTree = "<group>";
 		};
-		C4B5853A2770FE2500DA4FBE /* phpmon-common */ = {
+		C4B5853A2770FE2500DA4FBE /* Common */ = {
 			isa = PBXGroup;
 			children = (
 				C40C7F2127721F7300DDDCDC /* Core */,
 				54B20EDF263AA22C00D3250E /* PHP */,
+				C44CCD4327AFE93300CE40E5 /* Errors */,
+				C4F8C0A222D4F100002EFE61 /* Extensions */,
+				C4811D2822D70D9C00B5F6B3 /* Helpers */,
 			);
-			path = "phpmon-common";
+			path = Common;
+			sourceTree = "<group>";
+		};
+		C4C1019727C65A11001FACC2 /* Parsers */ = {
+			isa = PBXGroup;
+			children = (
+				C4AF9F76275447F100D44ED0 /* ValetConfigParserTest.swift */,
+				C4F780AD25D80B37000DBC97 /* ExtensionParserTest.swift */,
+				C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.swift */,
+			);
+			path = Parsers;
+			sourceTree = "<group>";
+		};
+		C4C1019827C65A1A001FACC2 /* Versions */ = {
+			isa = PBXGroup;
+			children = (
+				C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */,
+				C48D6C73279CD3E400F26D7E /* PhpVersionNumberTest.swift */,
+				C4B56360276AB0A500F12CCB /* VersionExtractorTest.swift */,
+				C4AF9F7C275454A900D44ED0 /* ValetVersionExtractorTest.swift */,
+			);
+			path = Versions;
+			sourceTree = "<group>";
+		};
+		C4C1019927C65A4D001FACC2 /* Commands */ = {
+			isa = PBXGroup;
+			children = (
+				C4F7809B25D80344000DBC97 /* CommandTest.swift */,
+			);
+			path = Commands;
 			sourceTree = "<group>";
 		};
 		C4C8E81D276F5686003AC782 /* Watcher */ = {
@ -626,7 +681,9 @@
 		C4D89BC42783C98800A02B68 /* Composer */ = {
 			isa = PBXGroup;
 			children = (
+				C4CE3BB927B31F670086CA49 /* ComposerWindow.swift */,
 				C4D89BC52783C99400A02B68 /* ComposerJson.swift */,
+				C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */,
 			);
 			path = Composer;
 			sourceTree = "<group>";
@ -651,6 +708,7 @@
 		C4EE55B027708BB2001DF387 /* SwiftUI */ = {
 			isa = PBXGroup;
 			children = (
+				C49E171E27A5736E00787921 /* PMServicesView.swift */,
 				C4EE55A627708B9E001DF387 /* PMHeaderView.swift */,
 				C4EE55A827708B9E001DF387 /* PMStatsView.swift */,
 				C4EE55A727708B9E001DF387 /* Preview.swift */,
@ -671,16 +729,11 @@
 			isa = PBXGroup;
 			children = (
 				C4F7807D25D7F84B000DBC97 /* Info.plist */,
-				C40C7F1C27720E1400DDDCDC /* Test Files */,
-				C4F7809B25D80344000DBC97 /* CommandTest.swift */,
-				C4F780AD25D80B37000DBC97 /* ExtensionParserTest.swift */,
-				C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.swift */,
-				C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */,
-				C48D6C73279CD3E400F26D7E /* PhpVersionNumberTest.swift */,
 				C43A8A1925D9CD1000591B77 /* Utility.swift */,
-				C4AF9F76275447F100D44ED0 /* ValetConfigParserTest.swift */,
-				C4AF9F7C275454A900D44ED0 /* ValetTest.swift */,
-				C4B56360276AB0A500F12CCB /* VersionExtractorTest.swift */,
+				C40C7F1C27720E1400DDDCDC /* Test Files */,
+				C4C1019927C65A4D001FACC2 /* Commands */,
+				C4C1019827C65A1A001FACC2 /* Versions */,
+				C4C1019727C65A11001FACC2 /* Parsers */,
 			);
 			path = "phpmon-tests";
 			sourceTree = "<group>";
@ -692,6 +745,7 @@
 				C46FA23E246C358E00944F05 /* StringExtension.swift */,
 				C48D0C9225CC804200CC7490 /* XibLoadable.swift */,
 				C42759662627662800093CAE /* NSMenuExtension.swift */,
+				C4E0F7EC27BEBDA9007475F2 /* NSWindowExtension.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@ -699,23 +753,6 @@
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
-		C415D3D52770F341005EF286 /* phpmon-cli */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = C415D3DA2770F341005EF286 /* Build configuration list for PBXNativeTarget "phpmon-cli" */;
-			buildPhases = (
-				C415D3D22770F341005EF286 /* Sources */,
-				C415D3D32770F341005EF286 /* Frameworks */,
-				C415D3D42770F341005EF286 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "phpmon-cli";
-			productName = "phpmon-cli";
-			productReference = C415D3D62770F341005EF286 /* phpmon-cli */;
-			productType = "com.apple.product-type.tool";
-		};
 		C41C1B3222B0097F00E7CF16 /* PHP Monitor */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = C41C1B4322B0098000E7CF16 /* Build configuration list for PBXNativeTarget "PHP Monitor" */;
@ -750,6 +787,9 @@
 				C4F7807F25D7F84B000DBC97 /* PBXTargetDependency */,
 			);
 			name = "phpmon-tests";
+			packageProductDependencies = (
+				C4C1019527C659B7001FACC2 /* HotKey */,
+			);
 			productName = "phpmon-tests";
 			productReference = C4F7807925D7F84B000DBC97 /* phpmon-tests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
@ -764,15 +804,11 @@
 				LastUpgradeCheck = 1320;
 				ORGANIZATIONNAME = "Nico Verbruggen";
 				TargetAttributes = {
-					C415D3D52770F341005EF286 = {
-						CreatedOnToolsVersion = 13.2.1;
-					};
 					C41C1B3222B0097F00E7CF16 = {
 						CreatedOnToolsVersion = 10.2.1;
 					};
 					C4F7807825D7F84B000DBC97 = {
 						CreatedOnToolsVersion = 12.4;
-						TestTargetID = C41C1B3222B0097F00E7CF16;
 					};
 				};
 			};
@ -794,7 +830,6 @@
 			targets = (
 				C41C1B3222B0097F00E7CF16 /* PHP Monitor */,
 				C4F7807825D7F84B000DBC97 /* phpmon-tests */,
-				C415D3D52770F341005EF286 /* phpmon-cli */,
 			);
 		};
 /* End PBXProject section */
@ -811,9 +846,10 @@
 				C405A4D124B9B9140062FAFA /* InternetAccessPolicy.plist in Resources */,
 				C44C1991276E44CB0072762D /* ProgressWindow.storyboard in Resources */,
 				C4232EE52612526500158FC6 /* Credits.html in Resources */,
-				54FCFD26276C883F004CE748 /* CheckboxPreferenceView.xib in Resources */,
+				54FCFD26276C883F004CE748 /* SelectPreferenceView.xib in Resources */,
 				C473319F2470923A009A0597 /* Localizable.strings in Resources */,
 				C4F30B07278E195800755FCE /* brew-services.json in Resources */,
+				C4068CA427B0780A00544CD5 /* CheckboxPreferenceView.xib in Resources */,
 				C4EC1E66279DE0380010F296 /* ServicesView.xib in Resources */,
 				54FCFD2D276C8D67004CE748 /* HotkeyPreferenceView.xib in Resources */,
 				C405A4D024B9B9140062FAFA /* InternetAccessPolicy.strings in Resources */,
@ -825,9 +861,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				54FCFD27276C883F004CE748 /* CheckboxPreferenceView.xib in Resources */,
+				54FCFD27276C883F004CE748 /* SelectPreferenceView.xib in Resources */,
 				54FCFD2E276C8D67004CE748 /* HotkeyPreferenceView.xib in Resources */,
 				C4F780A825D80AE8000DBC97 /* php.ini in Resources */,
+				C4068CA527B0780A00544CD5 /* CheckboxPreferenceView.xib in Resources */,
 				C43A8A2025D9D1D700591B77 /* brew.json in Resources */,
 				C4AF9F72275445FF00D44ED0 /* valet-config.json in Resources */,
 				C44C1992276E44CB0072762D /* ProgressWindow.storyboard in Resources */,
@ -838,39 +875,13 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
-		C415D3D22770F341005EF286 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				C40C7F2427721F8200DDDCDC /* PhpExtension.swift in Sources */,
-				C40C7F2627721FA200DDDCDC /* Constants.swift in Sources */,
-				C4B585402770FE3900DA4FBE /* Paths.swift in Sources */,
-				C415D3E62770F540005EF286 /* main.swift in Sources */,
-				C40C7F2227721F8200DDDCDC /* PhpInstallation.swift in Sources */,
-				C4B585432770FE3900DA4FBE /* Shell.swift in Sources */,
-				C4D9ADC1277610E1007277F4 /* PhpSwitcher.swift in Sources */,
-				C4F30B05278E16BA00755FCE /* HomebrewService.swift in Sources */,
-				C4EC1E6E279DF87A0010F296 /* Async.swift in Sources */,
-				C40C7F2327721F8200DDDCDC /* ActivePhpInstallation.swift in Sources */,
-				C4B585462770FE3900DA4FBE /* Command.swift in Sources */,
-				C4D9ADCA277611A0007277F4 /* InternalSwitcher.swift in Sources */,
-				C4EC1E74279DFCF40010F296 /* Events.swift in Sources */,
-				C48D6C72279CD2AC00F26D7E /* PhpVersionNumber.swift in Sources */,
-				C40C7F2527721F9800DDDCDC /* HomebrewPackage.swift in Sources */,
-				C417DC76277614690015E6EE /* Helpers.swift in Sources */,
-				C40C7F3227722E8D00DDDCDC /* Logger.swift in Sources */,
-				C40C7F2B2772201C00DDDCDC /* Actions.swift in Sources */,
-				C415D3E12770F34D005EF286 /* AllowedArguments.swift in Sources */,
-				C40C7F202772136000DDDCDC /* PhpEnv.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		C41C1B2F22B0097F00E7CF16 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */,
 				C4D8016622B1584700C6DA1B /* Startup.swift in Sources */,
+				C42C49DB27C2806F0074ABAC /* MainMenu+FixMyValet.swift in Sources */,
 				C48D6C70279CD2AC00F26D7E /* PhpVersionNumber.swift in Sources */,
 				C4B585412770FE3900DA4FBE /* Shell.swift in Sources */,
 				C4998F0A2617633900B2526E /* PrefsWC.swift in Sources */,
@ -878,9 +889,14 @@
 				C4AF9F7A2754499000D44ED0 /* Valet.swift in Sources */,
 				5420395926135DC100FB00FA /* PrefsVC.swift in Sources */,
 				C43603A0275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */,
+				C4068CA727B07A1300544CD5 /* SelectPreferenceView.swift in Sources */,
+				C4080FF627BD8C6400BF2C6B /* BetterAlert.swift in Sources */,
+				C4E0F7ED27BEBDA9007475F2 /* NSWindowExtension.swift in Sources */,
+				C49E171F27A5736E00787921 /* PMServicesView.swift in Sources */,
 				C4EE55AD27708B9E001DF387 /* PMStatsView.swift in Sources */,
 				C4C8E818276F54D8003AC782 /* App+ConfigWatch.swift in Sources */,
 				54FCFD30276C8DA4004CE748 /* HotkeyPreferenceView.swift in Sources */,
+				C4E4404627C56F4700D225E1 /* ValetSite.swift in Sources */,
 				C4EC1E68279DE0540010F296 /* ServicesView.swift in Sources */,
 				C4F2E43A2752F7D00020E974 /* PhpInstallation.swift in Sources */,
 				C41E871A2763D42300161EE0 /* SiteListVC+ContextMenu.swift in Sources */,
@ -897,6 +913,8 @@
 				C4C3ED4327834C5200AB15D8 /* CustomPrefs.swift in Sources */,
 				54B48B5F275F66AE006D90C5 /* Application.swift in Sources */,
 				C4B97B78275CF1B5003F3378 /* App+ActivationPolicy.swift in Sources */,
+				C4CE3BB827B31F2E0086CA49 /* MainMenu+Switcher.swift in Sources */,
+				C415937F27A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */,
 				C4811D2422D70A4700B5F6B3 /* App.swift in Sources */,
 				C41C1B4922B00A9800E7CF16 /* MenuBarImageGenerator.swift in Sources */,
 				C4F30B03278E16BA00755FCE /* HomebrewService.swift in Sources */,
@ -908,24 +926,30 @@
 				C41CA5ED2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */,
 				C412E5FC25700D5300A1FB67 /* HomebrewPackage.swift in Sources */,
 				C4D9ADBF277610E1007277F4 /* PhpSwitcher.swift in Sources */,
-				54AB03262763858F00A29D5F /* Timer.swift in Sources */,
+				C4068CAA27B0890D00544CD5 /* MenuBarIcons.swift in Sources */,
 				C4C8E81B276F54E5003AC782 /* PhpConfigWatcher.swift in Sources */,
 				C417DC74277614690015E6EE /* Helpers.swift in Sources */,
 				C415D3E82770F692005EF286 /* AppDelegate+InterApp.swift in Sources */,
 				C41C1B3722B0097F00E7CF16 /* AppDelegate.swift in Sources */,
 				C42759672627662800093CAE /* NSMenuExtension.swift in Sources */,
 				C464ADAF275A7A69003FCD53 /* SiteListVC.swift in Sources */,
-				C4EC1E6D279DF87A0010F296 /* Async.swift in Sources */,
+				C44CCD4927AFF3B700CE40E5 /* MainMenu+Async.swift in Sources */,
+				C4C1019B27C65C6F001FACC2 /* Process.swift in Sources */,
 				C4EC1E73279DFCF40010F296 /* Events.swift in Sources */,
+				C4927F0B27B2DFC200C55AFD /* Errors.swift in Sources */,
 				C4B5853E2770FE3900DA4FBE /* Paths.swift in Sources */,
 				C41C1B4B22B019FF00E7CF16 /* ActivePhpInstallation.swift in Sources */,
+				C44CCD4027AFE2FC00CE40E5 /* AlertableError.swift in Sources */,
 				C4188989275FE8CB001EF227 /* Filesystem.swift in Sources */,
 				C4B97B7B275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */,
+				C4EED88927A48778006D7272 /* InterAppHandler.swift in Sources */,
 				C40C7F1E2772136000DDDCDC /* PhpEnv.swift in Sources */,
 				C476FF9822B0DD830098105B /* Alert.swift in Sources */,
 				C474B00624C0E98C00066A22 /* LocalNotification.swift in Sources */,
 				C48D0C9625CC80B100CC7490 /* HeaderView.swift in Sources */,
+				C4CE3BBA27B31F670086CA49 /* ComposerWindow.swift in Sources */,
 				C4D9ADC8277611A0007277F4 /* InternalSwitcher.swift in Sources */,
+				C4080FFA27BD956700BF2C6B /* BetterAlertVC.swift in Sources */,
 				C4B5635E276AB09000F12CCB /* VersionExtractor.swift in Sources */,
 				C47331A2247093B7009A0597 /* StatusMenu.swift in Sources */,
 				C4C3ED412783497000AB15D8 /* MainMenu+Startup.swift in Sources */,
@ -936,6 +960,7 @@
 				C464ADB2275A87CA003FCD53 /* SiteListCell.swift in Sources */,
 				C4EE188422D3386B00E126E5 /* Constants.swift in Sources */,
 				C493084A279F331F009C240B /* AddSiteVC.swift in Sources */,
+				C4DEB7D427A5D60B00834718 /* Stats.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -947,31 +972,34 @@
 				C4EE55AE27708B9E001DF387 /* PMStatsView.swift in Sources */,
 				C41CA5EE2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */,
 				C4F780C425D80B75000DBC97 /* MainMenu.swift in Sources */,
-				54AB03272763858F00A29D5F /* Timer.swift in Sources */,
 				54FCFD2B276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */,
 				C415D3B82770F294005EF286 /* Actions.swift in Sources */,
-				C4EE55AC27708B9E001DF387 /* Preview.swift in Sources */,
 				54B48B60275F66AE006D90C5 /* Application.swift in Sources */,
 				C4F780C825D80B75000DBC97 /* DateExtension.swift in Sources */,
 				C493084B279F331F009C240B /* AddSiteVC.swift in Sources */,
 				C4D9ADC0277610E1007277F4 /* PhpSwitcher.swift in Sources */,
+				C4080FFB27BD956700BF2C6B /* BetterAlertVC.swift in Sources */,
 				C4F780CC25D80B75000DBC97 /* ActivePhpInstallation.swift in Sources */,
 				C4F780B125D80B4D000DBC97 /* PhpExtension.swift in Sources */,
+				C4068CA827B07A1300544CD5 /* SelectPreferenceView.swift in Sources */,
 				C4F780CE25D80B75000DBC97 /* LocalNotification.swift in Sources */,
 				C40C7F2927721FF600DDDCDC /* ActivePhpInstallation+Checks.swift in Sources */,
 				C4FBFC532616485F00CDB8E1 /* PhpVersionDetectionTest.swift in Sources */,
 				C43A8A2425D9D20D00591B77 /* BrewJsonParserTest.swift in Sources */,
 				C4F780CA25D80B75000DBC97 /* HomebrewPackage.swift in Sources */,
 				C4C8E81C276F54E5003AC782 /* PhpConfigWatcher.swift in Sources */,
+				C4F319C927B034A500AFF46F /* Stats.swift in Sources */,
 				C4F30B04278E16BA00755FCE /* HomebrewService.swift in Sources */,
 				C4AF9F7B2754499000D44ED0 /* Valet.swift in Sources */,
+				C4C1019C27C65C6F001FACC2 /* Process.swift in Sources */,
 				C4F780C025D80B6E000DBC97 /* Startup.swift in Sources */,
 				C4CCBA6D275C567B008C7055 /* PMWindowController.swift in Sources */,
 				C4B5635F276AB09000F12CCB /* VersionExtractor.swift in Sources */,
+				C4BF90C127C57C220054E78C /* MainMenu+FixMyValet.swift in Sources */,
 				C4F2E4382752F08D0020E974 /* HomebrewDiagnostics.swift in Sources */,
 				C4F780AE25D80B37000DBC97 /* ExtensionParserTest.swift in Sources */,
-				C4F780C725D80B75000DBC97 /* StatusMenu.swift in Sources */,
 				C4C8E819276F54D8003AC782 /* App+ConfigWatch.swift in Sources */,
+				C4EED88A27A48778006D7272 /* InterAppHandler.swift in Sources */,
 				C48D6C75279CD3E400F26D7E /* PhpVersionNumberTest.swift in Sources */,
 				C43603A1275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */,
 				C42759682627662800093CAE /* NSMenuExtension.swift in Sources */,
@ -980,14 +1008,20 @@
 				C481F79726164A78004FBCFF /* PrefsVC.swift in Sources */,
 				C41E871B2763D42300161EE0 /* SiteListVC+ContextMenu.swift in Sources */,
 				C40C7F3127722E8D00DDDCDC /* Logger.swift in Sources */,
+				C4068CAB27B0890D00544CD5 /* MenuBarIcons.swift in Sources */,
 				C4F30B09278E1A0E00755FCE /* CustomPrefs.swift in Sources */,
 				C464ADB3275A87CA003FCD53 /* SiteListCell.swift in Sources */,
 				C415D3E92770F692005EF286 /* AppDelegate+InterApp.swift in Sources */,
 				C4AF9F78275447F100D44ED0 /* ValetConfigParserTest.swift in Sources */,
+				C4CE3BBC27B324250086CA49 /* ComposerWindow.swift in Sources */,
+				C40B24F427A310830018C7D2 /* StatusMenu.swift in Sources */,
 				C417DC75277614690015E6EE /* Helpers.swift in Sources */,
+				C4080FF727BD8C6400BF2C6B /* BetterAlert.swift in Sources */,
 				C4B97B7C275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */,
 				C4B97B79275CF1B5003F3378 /* App+ActivationPolicy.swift in Sources */,
+				C4CE3BBB27B324230086CA49 /* MainMenu+Switcher.swift in Sources */,
 				C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */,
+				C44CCD4127AFE2FC00CE40E5 /* AlertableError.swift in Sources */,
 				C4F780BA25D80B62000DBC97 /* AppDelegate.swift in Sources */,
 				54FCFD31276C8DA4004CE748 /* HotkeyPreferenceView.swift in Sources */,
 				C4998F0B2617633900B2526E /* PrefsWC.swift in Sources */,
@ -995,18 +1029,25 @@
 				C4F780BD25D80B65000DBC97 /* Constants.swift in Sources */,
 				C4F780C325D80B75000DBC97 /* HeaderView.swift in Sources */,
 				C44C198E276E3A1C0072762D /* ProgressWindow.swift in Sources */,
+				C415938027A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */,
 				C4D9ADC9277611A0007277F4 /* InternalSwitcher.swift in Sources */,
 				C4F30B0B278E203C00755FCE /* MainMenu+Startup.swift in Sources */,
+				C40B24F227A310770018C7D2 /* Events.swift in Sources */,
 				C4F30B0A278E1A1A00755FCE /* ComposerJson.swift in Sources */,
-				C4AF9F7D275454A900D44ED0 /* ValetTest.swift in Sources */,
+				C4AF9F7D275454A900D44ED0 /* ValetVersionExtractorTest.swift in Sources */,
 				C4B56362276AB0A500F12CCB /* VersionExtractorTest.swift in Sources */,
 				C4B585452770FE3900DA4FBE /* Command.swift in Sources */,
+				C40B24F127A3106D0018C7D2 /* ServicesView.swift in Sources */,
 				C4F780C525D80B75000DBC97 /* MenuBarImageGenerator.swift in Sources */,
 				C4F780B725D80B5D000DBC97 /* App.swift in Sources */,
+				C4927F0C27B2DFC200C55AFD /* Errors.swift in Sources */,
+				C4E4404727C56F4700D225E1 /* ValetSite.swift in Sources */,
+				C44CCD4A27AFF3BC00CE40E5 /* MainMenu+Async.swift in Sources */,
 				C48D6C71279CD2AC00F26D7E /* PhpVersionNumber.swift in Sources */,
 				C4F780C925D80B75000DBC97 /* StringExtension.swift in Sources */,
 				C4B5853F2770FE3900DA4FBE /* Paths.swift in Sources */,
 				C481F79A26164A7C004FBCFF /* Preferences.swift in Sources */,
+				C4E0F7EE27BEBDA9007475F2 /* NSWindowExtension.swift in Sources */,
 				C4B585422770FE3900DA4FBE /* Shell.swift in Sources */,
 				C464ADAD275A7A3F003FCD53 /* SiteListWC.swift in Sources */,
 				C40C7F1F2772136000DDDCDC /* PhpEnv.swift in Sources */,
@ -1041,34 +1082,6 @@
 /* End PBXVariantGroup section */

 /* Begin XCBuildConfiguration section */
-		C415D3DB2770F341005EF286 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
-				CODE_SIGN_IDENTITY = "-";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 8M54J5J787;
-				ENABLE_HARDENED_RUNTIME = YES;
-				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Debug;
-		};
-		C415D3DC2770F341005EF286 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
-				CODE_SIGN_IDENTITY = "-";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 8M54J5J787;
-				ENABLE_HARDENED_RUNTIME = YES;
-				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Release;
-		};
 		C41C1B4122B0098000E7CF16 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@ -1189,12 +1202,13 @@
 		C41C1B4422B0098000E7CF16 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconBeta;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = phpmon/phpmon.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 500;
+				CURRENT_PROJECT_VERSION = 717;
+				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = phpmon/Info.plist;
@ -1203,8 +1217,8 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = "5.0-b1";
-				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.beta;
+				MARKETING_VERSION = 5.1.1;
+				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@ -1214,12 +1228,13 @@
 		C41C1B4522B0098000E7CF16 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconBeta;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = phpmon/phpmon.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 500;
+				CURRENT_PROJECT_VERSION = 717;
+				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = phpmon/Info.plist;
@ -1228,8 +1243,8 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = "5.0-b1";
-				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.beta;
+				MARKETING_VERSION = 5.1.1;
+				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@ -1239,7 +1254,6 @@
 		C4F7808125D7F84B000DBC97 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@ -1253,14 +1267,12 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nicoverbruggen.phpmon-tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PHP Monitor.app/Contents/MacOS/PHP Monitor";
 			};
 			name = Debug;
 		};
 		C4F7808225D7F84B000DBC97 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@ -1274,22 +1286,12 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nicoverbruggen.phpmon-tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PHP Monitor.app/Contents/MacOS/PHP Monitor";
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
-		C415D3DA2770F341005EF286 /* Build configuration list for PBXNativeTarget "phpmon-cli" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C415D3DB2770F341005EF286 /* Debug */,
-				C415D3DC2770F341005EF286 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		C41C1B2E22B0097F00E7CF16 /* Build configuration list for PBXProject "PHP Monitor" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@ -1336,6 +1338,11 @@
 			package = C4998F0426175E7200B2526E /* XCRemoteSwiftPackageReference "HotKey" */;
 			productName = HotKey;
 		};
+		C4C1019527C659B7001FACC2 /* HotKey */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = C4998F0426175E7200B2526E /* XCRemoteSwiftPackageReference "HotKey" */;
+			productName = HotKey;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = C41C1B2B22B0097F00E7CF16 /* Project object */;
--- a/Monitor.xcodeproj/xcshareddata/xcschemes/PHP
+++ b/Monitor.xcodeproj/xcshareddata/xcschemes/PHP
@ -1,84 +0,0 @@
-<?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>
--- a/README.md
+++ b/README.md
@ -1,15 +1,17 @@
-# PHP Monitor
-
 > 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" />
+<h1 align="center"><b>PHP Monitor</b> (phpmon)</h1>

-**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.
+<p align="center">
+    <img src="./phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png" alt="phpmon icon" width="128px" />
+</p>

-<img src="./docs/screenshot41.jpg" width="800px" alt="phpmon screenshot (menu bar app)"/>
+**PHP Monitor** (or *phpmon*) is a lightweight macOS utility app that runs on your Mac and displays the active PHP version in your status bar. It's tightly integrated with [Laravel Valet](https://github.com/laravel/valet), so <u>you need to have it set up before you can use this</u>.

-<small><i>Screenshot: A menu showing all of the functionality of PHP Monitor.</i></small>
+<img src="./docs/screenshot50.jpg" width="1085px" alt="phpmon screenshot (menu bar app)"/>
+
+<small><i>Screenshot: Showing the key functionality of PHP Monitor. You can also add new domains as links, manage various services, and perform First Aid to fix all kinds of common PHP link issues.</i></small>

 It's super convenient to switch between different versions of PHP. You'll even get notifications (only if you choose to opt-in, of course)!

@ -19,7 +21,7 @@ PHP Monitor also gives you quick access to various useful functionality (like ac

 ## 🖥 System requirements

-PHP Monitor is a universal application that runs on Apple Silicon **and** Intel-based Macs.
+PHP Monitor is a universal application that runs natively on Apple Silicon **and** Intel-based Macs.

 * macOS 11 Big Sur or higher (supports macOS 12 Monterey)
 * Homebrew is installed in `/usr/local/homebrew` or `/opt/homebrew`
@ -30,7 +32,7 @@ _You may need to update your Valet installation to keep everything working if a

 ## 🚀 How to install

-You can install via Homebrew (recommended), or may download the latest release on GitHub.
+Again, make sure you have **Laravel Valet** installed first. Once that's done, you can install via Homebrew (recommended), or may download the latest release on GitHub.

 To install via Homebrew, run:

@ -41,7 +43,17 @@ To upgrade your existing installation, run:

 	brew upgrade phpmon

-_The app is signed and notarized, meaning all you have to do is approve its first launch._
+(You may need to run `brew update` or `brew update-reset` first in order to update the cask file if you ran a Homebrew operation recently.)
+
+## ⚡️ Launchers (Alfred, Raycast)
+
+If you would like to integrate with your launcher of choice, you can also download an [Alfred workflow](https://github.com/nicoverbruggen/phpmon/raw/main/integrations/phpmon.alfredworkflow) or [Raycast extension](https://www.raycast.com/nicoverbruggen/php-monitor) that works with PHP Monitor.
+
+The app must be running in the background for these to work, and the _Allow third-party integrations_ checkbox must be enabled in Preferences (it is by default).
+
+## 🔑 Is the app signed & notarized?
+
+Yes, the app is signed and notarized, meaning all you have to do is approve its first launch (or whenever it updates).

 ## 👨‍💻 Why build this?

@ -51,10 +63,12 @@ Initially, I had an Alfred workflow for this — but it has now been replaced wi

 ## 🤬 The app won't start?!

-PHP Monitor performs some integrity checks to ensure a good experience when using the app. You'll get a message telling you that PHP Monitor won't work correctly in a variety of scenarios. 
+PHP Monitor performs some integrity checks to ensure a good experience when using the app. You'll get a message telling you that PHP Monitor won't work correctly in a variety of scenarios.

 **Follow instructions as specified in the alert in order to resolve any issues.**

+(If the app crashes at launch without showing you any of these messages, you might have a non-standard Homebrew and Valet setup. Those are not supported.)
+
 ## 🙋‍♂️ FAQ & Troubleshooting

 > If you are having issues, the first thing you should be doing is installing the latest version of PHP Monitor _and_ Laravel Valet. This can resolve a variety of issues. To upgrade Valet, run `composer global update`. Don't forget to run `valet install` after upgrading.
@ -223,8 +237,15 @@ Since v3.4 all of the loaded .ini files are sourced to determine which extension
 <details>
 <summary><strong>I've got two Homebrew installations on my Apple Silicon Mac, can I choose which installation to use with PHP Monitor?</strong></summary>

-Not at this time, no. PHP Monitor will prefer the `/opt/homebrew` installation over the classic installation directory.
+If you are using PHP Monitor on an Intel machine or on an Apple Silicon machine with Rosetta enabled, PHP Monitor expects the main Homebrew binary in `/usr/local/bin/brew`.

+If you are using PHP Monitor on Apple Silicon without Rosetta, PHP Monitor expects the main Homebrew binary in `/opt/homebrew/bin/brew`.
+
+If there's an issue here, you'll get an alert at launch.
+
+Make sure that the version of Homebrew that you are running normally is the same as the one that PHP Monitor expects. If you are on M1 hardware for example, but still using Rosetta for Homebrew, you'll need to run PHP Monitor under Rosetta as well. 
+
+PHP Monitor is a universal app and supports both architectures, so [find out here](https://support.apple.com/en-us/HT211861) how to enable Rosetta with PHP Monitor.
 </details>

 <details>
@ -258,12 +279,65 @@ You can add your own apps by creating and editing a `~/.phpmon.conf.json` file,
 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>How can the app integrate with third party tools, like Alfred or Raycast?</strong></summary>
+
+PHP Monitor supports third party app integrations by default, and this feature is enabled in Preferences unless you disable it.
+
+You can grab the official [Alfred workflow](https://github.com/nicoverbruggen/phpmon/raw/main/integrations/phpmon.alfredworkflow) or [Raycast extension](https://www.raycast.com/nicoverbruggen/php-monitor).
+
+If you'd like to integrate something yourself, all you need to to is use the `phpmon://` protocol and ensure that third party app integrations are enabled in Preferences (in PHP Monitor).
+
+Using app callbacks, macOS and PHP Monitor allow for the following to be called:
+
+* phpmon://list
+* phpmon://services/stop
+* phpmon://services/restart/all
+* phpmon://services/restart/nginx
+* phpmon://services/restart/php
+* phpmon://services/restart/dnsmasq
+* phpmon://locate/config
+* phpmon://locate/composer
+* phpmon://locate/valet
+* phpmon://phpinfo
+* phpmon://switch/php/{version}
+
+</details>
+
+<details>
+<summary><strong>How does the app know what PHP version is required for my app?</strong></summary>
+
+The `composer.json` file in the root of the folder (if it exists) is scanned and interpreted.
+
+If the version is set in `platform`, it takes precendence.
+If the version is not set in `platform` but it is in `require` (most common) then that version is used.
+</details>
+
+<details>
+<summary><strong>What do the checkmarks next to the PHP version mean in the site list?</strong></summary>
+
+You'll see a checkmark next to the version number if the currently enabled PHP version is compatible with the version required to run the site. 
+
+This is determined by evaluating the PHP requirement constraint (e.g. `^8.0`, `~8.0` or a specific version: `8.0`).
+</details>
+
+<details>
+<summary><strong>Why can't I see the driver type any more? It says "Project Type" now.</strong></summary>
+
+PHP Monitor currently checks your `composer.json` file to try to figure out what project you are running. 
+
+This approach is a lot faster than asking for a driver when you have many sites linked, but is slightly less reliable since the framework or type of project inferred via `composer.json` might not be 100% accurate.
+
+You can always still ask Valet using the command line, should it be necessary. In my experience fetching the drivers slowed down the app unnecessarily.
+
+</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>
+You can now use **First Aid & Services > Restore Homebrew Permissions** to (temporarily) resolve this issue and allow for a clean and painless `brew upgrade` or `brew cleanup` process.

-**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).
+If you would like to know more, consult [this issue](https://github.com/nicoverbruggen/phpmon/issues/85) for more information about why this is needed.

 </details>

@ -272,6 +346,10 @@ You can put as many apps as you'd like in the `scan_apps` array, and PHP Monitor

 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!)

+If you would like to report a crash, please include the associated **log files** so I can find out what exactly went wrong.
+
+To find the logs, take a look in `~/Library/Logs/DiagnosticReports` (in Finder) and see if there's any (log) files that start with "PHP Monitor".
+
 </details>

 ## 📝 Having another issue?
@ -291,12 +369,10 @@ Donations really help with the Apple Developer Program cost, and keep me motivat
 While I did make this application during my own free time, I have been lucky enough to do various experiments during work hours at [DIVE](https://dive.be). I'd also like to shout out the following folks:

 * My colleagues at [DIVE](https://dive.be)
-* The [Homebrew](https://brew.sh/) team who maintain
-* The [developers & maintainers of Valet](https://github.com/laravel/valet/graphs/contributors)
+* The [Homebrew](https://brew.sh/) team & [Valet maintainers](https://github.com/laravel/valet/graphs/contributors)
+* Various folks who [reached](https://twitter.com/stauffermatt) [out](https://twitter.com/marcelpociot) when PHP Monitor was still very much a small app with a handful of stars or so
 * 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
+* Everyone who left feedback via issues & who donated to keep the project up and running

 Thank you very much for your contributions, kind words and support.

@ -326,7 +402,7 @@ If an extension or other process writes to a single file a bunch of times in a s

 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.
+1. **Project type**: PHP Monitor checks your `composer.json` file for "notable dependencies". If you have `laravel/framework` in your `require`, there's a good chance the project type is `Laravel`, after all.

 *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.

@ -334,15 +410,8 @@ If an extension or other process writes to a single file a bunch of times in a s

 If you want to know more about how this works, I recommend you check out the source code.

-## 🔧 Build instructions
+I have done my best to annotate as much as humanly possible, and have avoided using an overly complicated architecture to keep the code as easy to maintain as possible. The code isn't perfect by a long shot (lots of cleanup can still happen!) but the application works well.

-<img src="./docs/build.png" width="404px" alt="build button in Xcode"/>
+I also have a few tests for key parts of the application that I found needed to be tested. In the future, I would like to add even more tests for some of the UI stuff, but for now the tests are more unit tests than feature tests.

-If you'd like to build PHP Monitor yourself, you need:
-
-* Xcode (usually the latest version)
-* The contents of this repository
-
-Once you have downloaded this repository, open `PHP Monitor.xcodeproj`, and you should be able to immediately build the app for your system by pressing Cmd-R. This will create a debug build. (If Xcode complains about code signing, you can turn it off.)
-
-If you'd like to create a production build, choose "Any Mac" as the target and select Product > Archive.
+For more detailed information for developers, please see [the documentation file for developers](./DEVELOPER.md).
--- a/RELEASE.md
+++ b/RELEASE.md
@ -1,13 +0,0 @@
-# Release Procedure
-
-1. Merge into `main`
-2. Create tag
-3. Add changes to changelog + update security document
-4. Archive
-5. Notarize and prepare for own distribution
-6. After notarization, export .app
-7. Create zipped version
-8. Calculate SHA256: `openssl dgst -sha256 phpmon.zip`
-9. Upload to GitHub and add to tagged release
-10. Update Cask with new version + hash
-11. Check new version can be installed via Cask
--- a/SECURITY.md
+++ b/SECURITY.md
@ -4,15 +4,15 @@

 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 | Minimum Required Valet Version |
+| 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 |
+| 5       | ✅ Universal binary | ✅ Yes | Big Sur (11.0) and Monterey (12.0) | macOS 11+ | PHP 5.6—PHP 8.2 | 2.16.2 |

 ## 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 |
+| 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 |
--- a/assets/affinity/icon.afdesign
+++ b/assets/affinity/icon.afdesign
--- a/assets/affinity/icons.afdesign
+++ b/assets/affinity/icons.afdesign
--- a/docs/screenshot41.jpg
+++ b/docs/screenshot41.jpg
--- a/docs/screenshot50.jpg
+++ b/docs/screenshot50.jpg
--- a/integrations/phpmon.alfredworkflow
+++ b/integrations/phpmon.alfredworkflow
--- a/phpmon-cli/AllowedArguments.swift
+++ b/phpmon-cli/AllowedArguments.swift
@ -1,26 +0,0 @@
-//
-//  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 }
-    }
-}
--- a/phpmon-cli/main.swift
+++ b/phpmon-cli/main.swift
@ -1,103 +0,0 @@
-//
-//  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()
--- a/phpmon-common/Core/Paths.swift
+++ b/phpmon-common/Core/Paths.swift
@ -1,67 +0,0 @@
-//
-//  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"
-    }
-    
-}
--- a/phpmon-common/PHP/Homebrew/HomebrewService.swift
+++ b/phpmon-common/PHP/Homebrew/HomebrewService.swift
@ -1,21 +0,0 @@
-//
-//  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?
-}
--- a/phpmon-tests/Commands/CommandTest.swift
+++ b/phpmon-tests/Commands/CommandTest.swift
--- a/phpmon-tests/Parsers/BrewJsonParserTest.swift
+++ b/phpmon-tests/Parsers/BrewJsonParserTest.swift
--- a/phpmon-tests/Parsers/ExtensionParserTest.swift
+++ b/phpmon-tests/Parsers/ExtensionParserTest.swift
--- a/phpmon-tests/Parsers/ValetConfigParserTest.swift
+++ b/phpmon-tests/Parsers/ValetConfigParserTest.swift
--- a/phpmon-tests/Versions/PhpVersionDetectionTest.swift
+++ b/phpmon-tests/Versions/PhpVersionDetectionTest.swift
--- a/phpmon-tests/Versions/PhpVersionNumberTest.swift
+++ b/phpmon-tests/Versions/PhpVersionNumberTest.swift
@ -11,6 +11,10 @@ import XCTest
 class PhpVersionNumberTest: XCTestCase {

    func testCanDeconstructPhpVersion() throws {
+        XCTAssertEqual(
+            try! PhpVersionNumber.parse("PHP 8.1.0RC5-dev"),
+            PhpVersionNumber(major: 8, minor: 1, patch: 0)
+        )
        XCTAssertEqual(
            PhpVersionNumber.make(from: "8.0.11"),
            PhpVersionNumber(major: 8, minor: 0, patch: 11)
@ -29,6 +33,12 @@ class PhpVersionNumberTest: XCTestCase {
        )
    }
    
+    func testPhpVersionNumberParse() throws {
+        XCTAssertThrowsError(try PhpVersionNumber.parse("OOF")) { error in
+            XCTAssertTrue(error is VersionParseError)
+        }
+    }
+    
    func testCanCheckFixedConstraints() throws {
        XCTAssertEqual(
            PhpVersionNumberCollection
@ -191,4 +201,86 @@ class PhpVersionNumberTest: XCTestCase {
                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
        )
    }
+    
+    func testCanCheckGreaterThanOrEqualConstraints() throws {
+        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
+        )
+        
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: ">=7.0.0", strict: true),
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]).all
+        )
+        
+        // Strict check (>7.2.5 is too new for 7.2 which resolves to 7.2.0)
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: ">=7.2.5", strict: true),
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3"]).all
+        )
+        
+        // Non-strict check (ignoring patch, 7.2 resolves to 7.2.999)
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: ">=7.2.5", strict: false),
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2"]).all
+        )
+    }
+    
+    func testCanCheckGreaterThanConstraints() throws {
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: ">7.0"),
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1"]).all
+        )
+        
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: ">7.2.5"),
+            // 7.2 will be valid due to non-strict mode (resolves to 7.2.999)
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2"]).all
+        )
+        
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
+                .matching(constraint: ">7.2.5", strict: true),
+            // 7.2 will not be valid due to strict mode (resolves to 7.2.0)
+            PhpVersionNumberCollection
+                .make(from: ["7.4", "7.3"]).all
+        )
+        
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.3.1", "7.2.9", "7.2.8", "7.2.6", "7.2.5", "7.2"])
+                .matching(constraint: ">7.2.8"),
+            // 7.2 will be valid due to non-strict mode (resolves to 7.2.999)
+            PhpVersionNumberCollection
+                .make(from: ["7.3.1", "7.2.9", "7.2"]).all
+        )
+        
+        XCTAssertEqual(
+            PhpVersionNumberCollection
+                .make(from: ["7.3.1", "7.2.9", "7.2.8", "7.2.6", "7.2.5", "7.2"])
+                .matching(constraint: ">7.2.8", strict: true),
+            // 7.2 will not be valid due to strict mode (resolves to 7.2.0)
+            PhpVersionNumberCollection
+                .make(from: ["7.3.1", "7.2.9"]).all
+        )
+    }
 }
--- a/phpmon-tests/Versions/ValetVersionExtractorTest.swift
+++ b/phpmon-tests/Versions/ValetVersionExtractorTest.swift
@ -8,10 +8,10 @@

 import XCTest

-class ValetTest: XCTestCase {
+class ValetVersionExtractorTest: XCTestCase {

    func testDetermineValetVersion() {
-        let version = valet("--version")
+        let version = valet("--version", sudo: false)
        XCTAssert(version.contains("Laravel Valet 2."))
    }
    
--- a/phpmon-tests/Versions/VersionExtractorTest.swift
+++ b/phpmon-tests/Versions/VersionExtractorTest.swift
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_128x128.png
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_128x128.png
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_128x128@2x.png
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_128x128@2x.png
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_16x16.png
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_16x16.png
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_16x16@2x.png
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_16x16@2x.png
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_256x256.png
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_256x256.png
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_256x256@2x.png
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_256x256@2x.png
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_32x32.png
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_32x32.png
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_32x32@2x.png
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_32x32@2x.png
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_512x512.png
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_512x512.png
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_512x512@2x.png
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/icon_512x512@2x.png
--- a/phpmon/Assets.xcassets/AppIconBeta.appiconset/Contents.json
+++ b/phpmon/Assets.xcassets/AppIconBeta.appiconset/Contents.json
--- a/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_128x128.png
+++ b/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_128x128.png
--- a/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_128x128@2x.png
+++ b/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_128x128@2x.png
--- a/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_16x16.png
+++ b/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_16x16.png
--- a/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_16x16@2x.png
+++ b/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_16x16@2x.png
--- a/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_256x256.png
+++ b/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_256x256.png
--- a/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_256x256@2x.png
+++ b/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_256x256@2x.png
--- a/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_32x32.png
+++ b/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_32x32.png
--- a/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_32x32@2x.png
+++ b/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_32x32@2x.png
--- a/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_512x512.png
+++ b/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_512x512.png
--- a/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_512x512@2x.png
+++ b/phpmon/Assets.xcassets/AppIconDev.appiconset/icon_512x512@2x.png
--- a/phpmon/Assets.xcassets/IconColorGreen.colorset/Contents.json
+++ b/phpmon/Assets.xcassets/IconColorGreen.colorset/Contents.json
@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.501",
+          "green" : "0.697",
+          "red" : "0.247"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.501",
+          "green" : "0.765",
+          "red" : "0.247"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/phpmon/Assets.xcassets/IconColorNormal.colorset/Contents.json
+++ b/phpmon/Assets.xcassets/IconColorNormal.colorset/Contents.json
@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/phpmon/Assets.xcassets/IconColorRed.colorset/Contents.json
+++ b/phpmon/Assets.xcassets/IconColorRed.colorset/Contents.json
@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.180",
+          "green" : "0.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.426",
+          "green" : "0.363",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/phpmon/Assets.xcassets/IconLinked.imageset/Contents.json
+++ b/phpmon/Assets.xcassets/IconLinked.imageset/Contents.json
@ -1,11 +1,12 @@
 {
  "images" : [
    {
+      "filename" : "Linked.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
-      "filename" : "link.svg",
+      "filename" : "Linked@2x.png",
      "idiom" : "universal",
      "scale" : "2x"
    },
--- a/phpmon/Assets.xcassets/IconLinked.imageset/Linked.png
+++ b/phpmon/Assets.xcassets/IconLinked.imageset/Linked.png
--- a/phpmon/Assets.xcassets/IconLinked.imageset/Linked@2x.png
+++ b/phpmon/Assets.xcassets/IconLinked.imageset/Linked@2x.png
--- a/phpmon/Assets.xcassets/IconLinked.imageset/link.svg
+++ b/phpmon/Assets.xcassets/IconLinked.imageset/link.svg
@ -1 +0,0 @@
-<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>
--- a/phpmon/Assets.xcassets/IconParked.imageset/Contents.json
+++ b/phpmon/Assets.xcassets/IconParked.imageset/Contents.json
@ -1,11 +1,12 @@
 {
  "images" : [
    {
+      "filename" : "Parked.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
-      "filename" : "car-alt.svg",
+      "filename" : "Parked@2x.png",
      "idiom" : "universal",
      "scale" : "2x"
    },
--- a/phpmon/Assets.xcassets/IconParked.imageset/Parked.png
+++ b/phpmon/Assets.xcassets/IconParked.imageset/Parked.png
--- a/phpmon/Assets.xcassets/IconParked.imageset/Parked@2x.png
+++ b/phpmon/Assets.xcassets/IconParked.imageset/Parked@2x.png
--- a/phpmon/Assets.xcassets/IconParked.imageset/car-alt.svg
+++ b/phpmon/Assets.xcassets/IconParked.imageset/car-alt.svg
@ -1 +0,0 @@
-<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>
--- a/phpmon/Assets.xcassets/Menu
+++ b/phpmon/Assets.xcassets/Menu
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Icons/MenuBar_elephant.imageset/Contents.json
+++ b/Icons/MenuBar_elephant.imageset/Contents.json
@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "Menu Bar Elephant.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Menu Bar Elephant@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Icons/MenuBar_elephant.imageset/Menu
+++ b/Icons/MenuBar_elephant.imageset/Menu
--- a/Icons/MenuBar_elephant.imageset/Menu
+++ b/Icons/MenuBar_elephant.imageset/Menu
--- a/phpmon/Assets.xcassets/StatusBarPHP.imageset/Contents.json
+++ b/phpmon/Assets.xcassets/StatusBarPHP.imageset/Contents.json
@ -1,11 +1,12 @@
 {
  "images" : [
    {
+      "filename" : "Menu Bar.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
-      "filename" : "php@2x.png",
+      "filename" : "Menu Bar@2x.png",
      "idiom" : "universal",
      "scale" : "2x"
    },
--- a/Icons/MenuBar_php.imageset/Menu
+++ b/Icons/MenuBar_php.imageset/Menu
--- a/Icons/MenuBar_php.imageset/Menu
+++ b/Icons/MenuBar_php.imageset/Menu
--- a/phpmon/Assets.xcassets/ServiceLoading.imageset/Contents.json
+++ b/phpmon/Assets.xcassets/ServiceLoading.imageset/Contents.json
@ -1,11 +1,12 @@
 {
  "images" : [
    {
+      "filename" : "ServiceLoading.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
-      "filename" : "question-circle.svg",
+      "filename" : "ServiceLoading@2x.png",
      "idiom" : "universal",
      "scale" : "2x"
    },
--- a/phpmon/Assets.xcassets/ServiceLoading.imageset/ServiceLoading.png
+++ b/phpmon/Assets.xcassets/ServiceLoading.imageset/ServiceLoading.png
--- a/phpmon/Assets.xcassets/ServiceLoading.imageset/ServiceLoading@2x.png
+++ b/phpmon/Assets.xcassets/ServiceLoading.imageset/ServiceLoading@2x.png
--- a/phpmon/Assets.xcassets/ServiceLoading.imageset/question-circle.svg
+++ b/phpmon/Assets.xcassets/ServiceLoading.imageset/question-circle.svg
@ -1 +0,0 @@
-<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>
--- a/phpmon/Assets.xcassets/ServiceOff.imageset/Contents.json
+++ b/phpmon/Assets.xcassets/ServiceOff.imageset/Contents.json
@ -1,11 +1,12 @@
 {
  "images" : [
    {
+      "filename" : "ServiceOff.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
-      "filename" : "times-circle.svg",
+      "filename" : "ServiceOff@2x.png",
      "idiom" : "universal",
      "scale" : "2x"
    },
--- a/phpmon/Assets.xcassets/ServiceOff.imageset/ServiceOff.png
+++ b/phpmon/Assets.xcassets/ServiceOff.imageset/ServiceOff.png
--- a/phpmon/Assets.xcassets/ServiceOff.imageset/ServiceOff@2x.png
+++ b/phpmon/Assets.xcassets/ServiceOff.imageset/ServiceOff@2x.png
--- a/phpmon/Assets.xcassets/ServiceOff.imageset/times-circle.svg
+++ b/phpmon/Assets.xcassets/ServiceOff.imageset/times-circle.svg
@ -1 +0,0 @@
-<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>
--- a/phpmon/Assets.xcassets/ServiceOn.imageset/Contents.json
+++ b/phpmon/Assets.xcassets/ServiceOn.imageset/Contents.json
@ -1,11 +1,12 @@
 {
  "images" : [
    {
+      "filename" : "ServiceOn.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
-      "filename" : "check-circle.svg",
+      "filename" : "ServiceOn@2x.png",
      "idiom" : "universal",
      "scale" : "2x"
    },
--- a/phpmon/Assets.xcassets/ServiceOn.imageset/ServiceOn.png
+++ b/phpmon/Assets.xcassets/ServiceOn.imageset/ServiceOn.png
--- a/phpmon/Assets.xcassets/ServiceOn.imageset/ServiceOn@2x.png
+++ b/phpmon/Assets.xcassets/ServiceOn.imageset/ServiceOn@2x.png
--- a/phpmon/Assets.xcassets/ServiceOn.imageset/check-circle.svg
+++ b/phpmon/Assets.xcassets/ServiceOn.imageset/check-circle.svg
@ -1 +0,0 @@
-<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>
--- a/phpmon/Assets.xcassets/StatusBarPHP.imageset/php@2x.png
+++ b/phpmon/Assets.xcassets/StatusBarPHP.imageset/php@2x.png
--- a/phpmon/Common/Core/Actions.swift
+++ b/phpmon/Common/Core/Actions.swift
@ -34,17 +34,39 @@ class Actions {
        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()
+    public static func fixHomebrewPermissions() throws
+    {
+        var servicesCommands = [
+            "\(Paths.brew) services stop nginx",
+            "\(Paths.brew) services stop dnsmasq",
+        ]
+        var cellarCommands = [
+            "chown -R \(Paths.whoami):staff \(Paths.cellarPath)/nginx",
+            "chown -R \(Paths.whoami):staff \(Paths.cellarPath)/dnsmasq"
+        ]
+        
+        PhpEnv.shared.availablePhpVersions.forEach { version in
+            let formula = version == PhpEnv.brewPhpVersion
+                ? "php"
+                : "php@\(version)"
+            servicesCommands.append("\(Paths.brew) services stop \(formula)")
+            cellarCommands.append("chown -R \(Paths.whoami):staff \(Paths.cellarPath)/\(formula)")
+        }
+        
+        let script =
+            servicesCommands.joined(separator: " && ")
+            + " && "
+            + cellarCommands.joined(separator: " && ")
+        
+        let appleScript = NSAppleScript(
+            source: "do shell script \"\(script)\" with administrator privileges"
+        )
+        
+        let eventResult: NSAppleEventDescriptor? = appleScript?.executeAndReturnError(nil)
+        
+        if (eventResult == nil) {
+            throw HomebrewPermissionError(kind: .applescriptNilError)
+        }
    }
    
    // MARK: - Finding Config Files
@ -88,19 +110,21 @@ class Actions {
        return URL(string: "file:///private/tmp/phpmon_phpinfo.html")!
    }
    
-    // MARK: - Quick Fix
+    // MARK: - Fix My Valet
    
    /**
     Detects all currently available PHP versions,
     and unlinks each and every one of them.
     
+     This all happens in sequence, nothing runs in parallel.
+     
     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()
+    public static func fixMyValet()
    {
        brew("services restart dnsmasq", sudo: true)
        
@ -111,11 +135,14 @@ class Actions {
            brew("services stop \(formula)", sudo: true)
        }
        
+        brew("services stop dnsmasq")
        brew("services stop php")
        brew("services stop nginx")
-        brew("link php")
+        
+        brew("link php --overwrite --force")
+        
        brew("services restart dnsmasq", sudo: true)
-        brew("services stop php", sudo: true)
-        brew("services stop nginx", sudo: true)
+        brew("services restart php", sudo: true)
+        brew("services restart nginx", sudo: true)
    }
 }
--- a/phpmon/Common/Core/Command.swift
+++ b/phpmon/Common/Core/Command.swift
--- a/phpmon/Common/Core/Constants.swift
+++ b/phpmon/Common/Core/Constants.swift
@ -7,7 +7,7 @@

 import Cocoa

-class Constants {
+struct Constants {
    
    /**
     * The latest PHP version that is considered to be stable at the time of release.
@ -50,5 +50,19 @@ class Constants {
        // dev release. In this case, that means that the version below is detected.
        "8.2"
    ]
+    
+    struct Urls {
+        
+        static let DonationPayment = URL(
+            string: "https://nicoverbruggen.be/sponsor#pay-now"
+        )!
+        static let DonationPage = URL(
+            string: "https://nicoverbruggen.be/sponsor"
+        )!
+        static let FrequentlyAskedQuestions = URL(
+            string: "https://github.com/nicoverbruggen/phpmon#%EF%B8%8F-faq--troubleshooting"
+        )!
+        
+    }

 }
--- a/phpmon/Common/Core/Events.swift
+++ b/phpmon/Common/Core/Events.swift
--- a/phpmon/Common/Core/Helpers.swift
+++ b/phpmon/Common/Core/Helpers.swift
@ -9,11 +9,11 @@
 // MARK: Common Shell Commands

 /**
- Runs a `valet` command.
+ Runs a `valet` command. Defaults to running as superuser.
 */
-func valet(_ command: String) -> String
+func valet(_ command: String, sudo: Bool = true) -> String
 {
-    return Shell.pipe("sudo \(Paths.valet) \(command)", requiresPath: true)
+    return Shell.pipe("\(sudo ? "sudo " : "")" + "\(Paths.valet) \(command)", requiresPath: true)
 }

 /**
@ -35,7 +35,7 @@ func sed(file: String, original: String, replacement: String)
    
    // 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") {
+    if Filesystem.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)")
--- a/phpmon/Common/Core/Logger.swift
+++ b/phpmon/Common/Core/Logger.swift
@ -27,25 +27,31 @@ class Log {
    
    static func err(_ item: Any) {
        if Verbosity.error.isApplicable() {
-            print(item)
+            print("[E] \(item)")
        }
    }
    
    static func warn(_ item: Any) {
        if Verbosity.warning.isApplicable() {
-            print(item)
+            print("[W] \(item)")
        }
    }
    
    static func info(_ item: Any) {
        if Verbosity.info.isApplicable() {
-            print(item)
+            print("\(item)")
        }
    }
    
    static func perf(_ item: Any) {
        if Verbosity.performance.isApplicable() {
-            print(item)
+            print("[P] \(item)")
+        }
+    }
+    
+    static func separator(as verbosity: Verbosity = .info) {
+        if verbosity.isApplicable() {
+            print("==================================")
        }
    }
    
--- a/phpmon/Common/Core/Paths.swift
+++ b/phpmon/Common/Core/Paths.swift
@ -0,0 +1,98 @@
+//
+//  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.
+ The path to the Homebrew directory and the user's name are fetched only once, at boot.
+ */
+public class Paths {
+    
+    public static let shared = Paths()
+    
+    internal var baseDir: Paths.HomebrewDir
+    
+    private var userName: String
+    
+    init() {
+        baseDir = App.architecture != "x86_64" ? .opt : .usr
+        userName = String(Shell.pipe("whoami").split(separator: "\n")[0])
+    }
+    
+    public func detectBinaryPaths() {
+        detectComposerBinary()
+    }
+
+    // - 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: Detected Binaries
+    
+    /** The path to the Composer binary. Can be in multiple locations, so is detected instead. */
+    public static var composer: String? = nil
+    
+    // - MARK: Paths
+    
+    public static var whoami: String {
+        return shared.userName
+    }
+    
+    public static var cellarPath: String {
+        return "\(shared.baseDir.rawValue)/Cellar"
+    }
+    
+    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: - Flexible Binaries
+    // (these can be in multiple locations, so we scan common places because)
+    // (PHP Monitor will not use the user's own PATH)
+    
+    private func detectComposerBinary() {
+        if Filesystem.fileExists("/usr/local/bin/composer") {
+            Paths.composer = "/usr/local/bin/composer"
+        } else if Filesystem.fileExists("/opt/homebrew/bin/composer") {
+            Paths.composer = "/opt/homebrew/bin/composer"
+        } else {
+            Paths.composer = nil
+            Log.warn("Composer was not found.")
+        }
+    }
+    
+    // MARK: - Enum
+    
+    public enum HomebrewDir: String {
+        case opt = "/opt/homebrew"
+        case usr = "/usr/local"
+    }
+    
+}
--- a/phpmon/Common/Core/Process.swift
+++ b/phpmon/Common/Core/Process.swift
@ -0,0 +1,59 @@
+//
+//  Process.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 23/02/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+extension Process {
+    
+    /**
+     When a process is running in the background, it can send content to standard
+     output or standard error, just like it would in a terminal. Using `listen`
+     allows us to react whenever data is received by running a particular closure,
+     depending on which type of data is received.
+     */
+    public func listen(
+        didReceiveStandardOutputData: @escaping (String) -> Void,
+        didReceiveStandardErrorData: @escaping (String) -> Void
+    ) {
+        let outputPipe = Pipe()
+        let errorPipe = Pipe()
+        
+        self.standardOutput = outputPipe
+        self.standardError = errorPipe
+        
+        [
+         (outputPipe, didReceiveStandardOutputData),
+         (errorPipe, didReceiveStandardErrorData)
+        ].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()
+            }
+        }
+    }
+    
+    /**
+     After the process is done running, you'll want to stop listening.
+     */
+    public func haltListening() {
+        if let pipe = self.standardOutput as? Pipe {
+            NotificationCenter.default.removeObserver(pipe.fileHandleForReading)
+        }
+        if let pipe = self.standardError as? Pipe {
+            NotificationCenter.default.removeObserver(pipe.fileHandleForReading)
+        }
+    }
+    
+}
--- a/phpmon/Common/Core/Shell.swift
+++ b/phpmon/Common/Core/Shell.swift
@ -104,15 +104,6 @@ public class Shell {
        )
    }
    
-    /**
-     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.
     */
@ -123,47 +114,11 @@ public class Shell {
        
        let task = Process()
        task.launchPath = self.shell
-        task.arguments = ["--login", "-c", tailoredCommand]
+        task.arguments = ["--noprofile", "-norc", "--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
--- a/phpmon/Common/Errors/AlertableError.swift
+++ b/phpmon/Common/Errors/AlertableError.swift
@ -0,0 +1,13 @@
+//
+//  Errors.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 06/02/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+protocol AlertableError {
+    func getErrorMessageKey() -> String
+}
--- a/phpmon/Common/Errors/Errors.swift
+++ b/phpmon/Common/Errors/Errors.swift
@ -0,0 +1,29 @@
+//
+//  VersionParseError.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 08/02/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+// MARK: - Alertable Errors
+// These errors must be resolved by the user.
+
+struct HomebrewPermissionError: Error, AlertableError {
+    enum Kind: String {
+        case applescriptNilError = "homebrew_permissions.applescript_returned_nil"
+    }
+    
+    let kind: Kind
+    
+    func getErrorMessageKey() -> String {
+        return "alert.errors.\(self.kind.rawValue)"
+    }
+}
+
+// MARK: - Errors that do not have an associated alert message
+// The errors must be resolved by the developer.
+
+struct VersionParseError: Error {}
--- a/phpmon/Common/Extensions/DateExtension.swift
+++ b/phpmon/Common/Extensions/DateExtension.swift
--- a/phpmon/Common/Extensions/NSMenuExtension.swift
+++ b/phpmon/Common/Extensions/NSMenuExtension.swift
@ -16,3 +16,14 @@ extension NSMenu {
    }
    
 }
+
+@IBDesignable class LocalizedMenuItem: NSMenuItem {
+    
+    @IBInspectable
+    var localizationKey: String? {
+        didSet {
+            self.title = localizationKey?.localized ?? self.title
+        }
+    }
+    
+}
--- a/phpmon/Common/Extensions/NSWindowExtension.swift
+++ b/phpmon/Common/Extensions/NSWindowExtension.swift
@ -0,0 +1,38 @@
+//
+//  NSWindowExtension.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 17/02/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+
+extension NSWindow {
+    
+    /**
+     Shakes a window. Inspired by: http://blog.ericd.net/2016/09/30/shaking-a-macos-window/
+     */
+    func shake(){
+        let numberOfShakes = 3, durationOfShake = 0.2, vigourOfShake: CGFloat = 0.03
+        
+        let frame: CGRect = self.frame
+        let shakeAnimation :CAKeyframeAnimation  = CAKeyframeAnimation()
+        
+        let shakePath = CGMutablePath()
+        shakePath.move( to: CGPoint(x:NSMinX(frame), y:NSMinY(frame)))
+        
+        for _ in 0...numberOfShakes-1 {
+            shakePath.addLine(to: CGPoint(x:NSMinX(frame) - frame.size.width * vigourOfShake, y:NSMinY(frame)))
+            shakePath.addLine(to: CGPoint(x:NSMinX(frame) + frame.size.width * vigourOfShake, y:NSMinY(frame)))
+        }
+        
+        shakePath.closeSubpath()
+        shakeAnimation.path = shakePath
+        shakeAnimation.duration = durationOfShake
+        
+        self.animations = ["frameOrigin":shakeAnimation]
+        self.animator().setFrameOrigin(self.frame.origin)
+    }
+}
--- a/phpmon/Common/Extensions/StringExtension.swift
+++ b/phpmon/Common/Extensions/StringExtension.swift
--- a/phpmon/Common/Extensions/XibLoadable.swift
+++ b/phpmon/Common/Extensions/XibLoadable.swift
--- a/phpmon/Common/Helpers/Alert.swift
+++ b/phpmon/Common/Helpers/Alert.swift
@ -9,24 +9,6 @@ import Cocoa

 class Alert {
    
-    public static func present(
-        messageText: String,
-        informativeText: String,
-        buttonTitle: String = "OK",
-        secondButtonTitle: String = "",
-        style: NSAlert.Style = .informational
-    ) -> Bool {
-        let alert = NSAlert.init()
-        alert.alertStyle = style
-        alert.messageText = messageText
-        alert.informativeText = informativeText
-        alert.addButton(withTitle: buttonTitle)
-        if (!secondButtonTitle.isEmpty) {
-            alert.addButton(withTitle: secondButtonTitle)
-        }
-        return alert.runModal() == .alertFirstButtonReturn
-    }
-    
    public static func confirm(
        onWindow window: NSWindow,
        messageText: String,
@ -36,6 +18,10 @@ class Alert {
        style: NSAlert.Style = .warning,
        onFirstButtonPressed: @escaping (() -> Void)
    ) {
+        if !Thread.isMainThread {
+            fatalError("You should always present alerts on the main thread!")
+        }
+        
        let alert = NSAlert.init()
        alert.alertStyle = style
        alert.messageText = messageText
@ -51,13 +37,4 @@ class Alert {
        }
    }
    
-    public static func notify(message: String, info: String, style: NSAlert.Style = .informational) {
-        _ = present(
-            messageText: message,
-            informativeText: info,
-            buttonTitle: "OK",
-            secondButtonTitle: "",
-            style: style
-        )
-    }    
 }
--- a/phpmon/Common/Helpers/Application.swift
+++ b/phpmon/Common/Helpers/Application.swift
--- a/phpmon/Common/Helpers/Filesystem.swift
+++ b/phpmon/Common/Helpers/Filesystem.swift
--- a/phpmon/Common/Helpers/LocalNotification.swift
+++ b/phpmon/Common/Helpers/LocalNotification.swift
--- a/phpmon/Common/Helpers/MenuBarImageGenerator.swift
+++ b/phpmon/Common/Helpers/MenuBarImageGenerator.swift
@ -42,7 +42,7 @@ class MenuBarImageGenerator {
        
        let targetImage: NSImage = NSImage(size: image.size)
        
-        let rep: NSBitmapImageRep = NSBitmapImageRep(
+        let representation: NSBitmapImageRep = NSBitmapImageRep(
            bitmapDataPlanes: nil,
            pixelsWide: Int(image.size.width),
            pixelsHigh: Int(image.size.height),
@ -55,7 +55,7 @@ class MenuBarImageGenerator {
            bitsPerPixel: 0
        )!
        
-        targetImage.addRepresentation(rep)
+        targetImage.addRepresentation(representation)
        targetImage.lockFocus()

        image.draw(in: imageRect)
@ -65,33 +65,73 @@ class MenuBarImageGenerator {
        return targetImage
    }
    
+    /**
+     The same as before, but also attempts to add an icon to the left.
+     */
    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
        
+        // We'll start out with the image containing the text
+        let textImage = self.textToImage(text: text)
+        
+        // Then we'll fetch the image we want on the left
+        var iconType = Preferences.preferences[.iconTypeToDisplay] as? String
+        if iconType == nil {
+            Log.warn("Invalid icon type found, using the default")
+            iconType = MenuBarIcon.iconPhp.rawValue
+        }
+        
+        let iconImage = NSImage(named: "MenuBar_\(iconType!)")!
+        
+        // We'll need to reference the width of the icon a bunch of times
+        let iconWidthSize = iconImage.size.width
+        
+        // There will also be an additional divider between the image and the text (image)
+        let divider: CGFloat = 3
+        
+        // Use a fixed size for the height of the menu bar (18pt)
        let imageRect = CGRect(
            x: 0,
            y: 0,
-            width: textImage.size.width + divider,
-            height: textImage.size.height
+            width: textImage.size.width + iconWidthSize + divider,
+            height: 18
        )
        
+        // Create a new image, we'll draw the text and our icon in there
        let image: NSImage = NSImage(size: imageRect.size)
        image.lockFocus()
+
+        // Calculate the offset between the image and the text
+        let offset = imageRect.size.width - textImage.size.width
        
-        let difference = imageRect.size.width - textImage.size.width
+        // Draw the text with a negative x offset (so there is room on the left for the icon)
+        textImage.draw(
+            in: imageRect,
+            from: NSRect(
+                x: -offset,
+                y: 0,
+                width: textImage.size.width + offset,
+                height: textImage.size.height
+            ),
+            operation: .overlay,
+            fraction: 1
+        )
        
-        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)
+        // Draw the icon directly in the left of the imageRect (where we left space)
+        iconImage.draw(
+            in: imageRect,
+            from: NSRect(
+                x: 0,
+                y: 0,
+                width: imageRect.size.width,
+                height: imageRect.size.height
+            ),
+            operation: .overlay,
+            fraction: 1
+        )
        
+        // We're done with this image
        image.unlockFocus()
+        
        return image
    }
    
--- a/phpmon/Common/Helpers/PMWindowController.swift
+++ b/phpmon/Common/Helpers/PMWindowController.swift
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nico Verbruggen	139e416c3b	🚀 Version 5.1.1 Merge branch 'dev/5.x'	2022-03-09 17:52:07 +01:00
Nico Verbruggen	ba4ed3b365	🔧 Prepare for maintenance release	2022-03-09 17:51:19 +01:00
Nico Verbruggen	06a8022265	📝 Annotate environment checks (#146 )	2022-03-09 16:41:47 +01:00
Nico Verbruggen	3b297e07dc	🐛 Adjust the order of startup checks (#146 )	2022-03-09 16:19:41 +01:00
Nico Verbruggen	68fa8e523e	👌 Fix string that made it into 5.1	2022-03-03 14:49:33 +01:00
Nico Verbruggen	768bf06a9d	🚀 Version 5.1 Merge branch 'dev/5.x'	2022-03-02 19:53:52 +01:00
Nico Verbruggen	6a8d66758a	🔧 Build 715 for the final 5.1 release	2022-03-02 19:52:24 +01:00
Nico Verbruggen	078e6e6f23	📝 Update README with Raycast extension	2022-03-01 09:32:01 +01:00
Nico Verbruggen	3f80bfb641	👌 Detect binary paths (#144 ) This change introduces binary detection to the app. PHP Monitor does not rely on the user's PATH because the output of a user's terminal can cause issues, so we will scan the two common locations for the Composer binary file. The text in the alert has been modified to accommodate the change (you could still not have Composer installed).	2022-02-26 18:24:02 +01:00
Nico Verbruggen	a34389c3a9	🔧 New dev build (RC)	2022-02-23 14:07:14 +01:00
Nico Verbruggen	692d3c143f	♻️ Refactor Composer window logic	2022-02-23 13:39:49 +01:00
Nico Verbruggen	bc86a45925	✅ Run tests in isolation	2022-02-23 13:03:04 +01:00
Nico Verbruggen	2a412b794a	✅ Fix tests	2022-02-22 21:16:50 +01:00
Nico Verbruggen	bf673263d8	👌 Extract method	2022-02-22 21:16:17 +01:00
Nico Verbruggen	ce498d3019	♻️ Cleanup	2022-02-22 20:49:13 +01:00
Nico Verbruggen	e398f089af	♻️ Refactor Valet structure, add #143	2022-02-22 20:39:35 +01:00
Nico Verbruggen	e8ba24e48b	👌 Improved alerts	2022-02-20 16:39:06 +01:00
Nico Verbruggen	e0f40be188	🐛 Fix issue with "Fix Homebrew Permissions"	2022-02-20 16:33:56 +01:00
Nico Verbruggen	42848764cf	👌 New icon for DEV builds	2022-02-20 16:08:04 +01:00
Nico Verbruggen	46ac0c339c	👌 Warn about custom TLD (#126 )	2022-02-20 15:46:51 +01:00
Nico Verbruggen	a0fe68f3ab	👌 Constants as struct	2022-02-20 15:29:24 +01:00
Nico Verbruggen	c952c3d031	👌 Link to FAQ	2022-02-20 15:29:15 +01:00
Nico Verbruggen	c05cdeda72	👌 Offer to switch back to prev version (#141 )	2022-02-20 15:12:30 +01:00
Nico Verbruggen	ae7b285eb0	🐛 Fix delay due to use of async	2022-02-20 14:26:56 +01:00
Nico Verbruggen	6b3c562af2	🐛 Fixes full PHP version (#142 )	2022-02-20 13:48:37 +01:00
Nico Verbruggen	e3ae878cae	👌 Various alerts updated	2022-02-18 22:01:05 +01:00
Nico Verbruggen	dd43c94e6e	👌 Handle errors	2022-02-18 20:38:40 +01:00
Nico Verbruggen	0e8fe1fcfb	👌 Updated all environment alerts	2022-02-18 20:13:43 +01:00
Nico Verbruggen	293b7f564e	🏗 Rearrange button order	2022-02-17 19:45:56 +01:00
Nico Verbruggen	634ffb4c57	🏗 Preparing for additional refactoring	2022-02-17 19:23:23 +01:00
Nico Verbruggen	9468a2e9f8	🚩 Break compilation Now missing labels will come up as Compiler Errors. This, along with the deprecations in the previous alert should allow me to replace all the alerts everywhere.	2022-02-17 19:21:03 +01:00
Nico Verbruggen	921ecd99d6	👌 Improve BetterAlert performance notices	2022-02-17 19:19:02 +01:00
Nico Verbruggen	d06f92051d	👌 Improved alert for sponsor encouragement	2022-02-17 19:07:20 +01:00
Nico Verbruggen	97d68f89f1	👌 Animate custom modal, fix constraints	2022-02-17 18:43:48 +01:00
Nico Verbruggen	115863f1ee	👌 Improve initial alert	2022-02-17 09:59:50 +01:00
Nico Verbruggen	bc27a4d25a	👌 Cleanup	2022-02-17 00:14:40 +01:00
Nico Verbruggen	5a0b2f319b	👌 Use BetterAlert API	2022-02-16 23:51:06 +01:00
Nico Verbruggen	50f003a2bd	✨ New notice alert API	2022-02-16 22:42:43 +01:00
Nico Verbruggen	bc0b50f5bf	👌 Fixed UI and added new notice view	2022-02-16 21:11:33 +01:00
Nico Verbruggen	dd20b25900	📝 Add issue templates	2022-02-14 13:56:01 +01:00
Nico Verbruggen	d0469467ac	📝 Add issue templates (#138 )	2022-02-14 13:55:16 +01:00
Nico Verbruggen	61427ec505	👌 Cleanup App.busy -> PhpEnv.shared.isBusy	2022-02-12 15:08:00 +01:00
Nico Verbruggen	6cd1d78572	👌 Tweak logger verbosity	2022-02-12 14:58:49 +01:00
Nico Verbruggen	0ad5049785	✨ Add `separator` to Log	2022-02-12 14:52:10 +01:00
Nico Verbruggen	b5c1960260	👌 Async / await support for loading services	2022-02-12 14:47:29 +01:00
Nico Verbruggen	e6fbe7c4a4	👀 First attempt at using async code in Swift	2022-02-12 13:17:17 +01:00
Nico Verbruggen	537536d443	👌 Improve initial logging during startup	2022-02-11 23:51:58 +01:00
Nico Verbruggen	f702d14749	👌 Move check list to bottom	2022-02-11 23:39:43 +01:00
Nico Verbruggen	74bb544f3c	♻️ Refactor (part 2)	2022-02-11 23:37:44 +01:00
Nico Verbruggen	dae47e3779	♻️ Refactor startup procedure	2022-02-11 23:24:38 +01:00
Nico Verbruggen	dc91d0e00c	👌 Path based on architecture (#134 )	2022-02-11 18:58:07 +01:00
Nico Verbruggen	6187eb3e4e	👌 Communicate why Fix My Valet is disabled (#135 ) A quick 5-minute fix. As raised in #135, it is not super obvious why Fix My Valet might be disabled. From now on, Fix My Valet is now always enabled, but it might throw up an alert if the required formula is missing.	2022-02-11 14:19:52 +01:00
Nico Verbruggen	0fa6d337f2	👌 Wrote down some notes during Deep Dive	2022-02-09 22:53:37 +01:00
Nico Verbruggen	a10e1cad11	🔥 Remove RELEASE.md (and move it to DEVELOPER.md)	2022-02-09 21:49:30 +01:00
Nico Verbruggen	7c252deede	📝 Update version to not specify minor version	2022-02-09 21:38:40 +01:00
Tadhg Boyle	224c5c4fe2	📝 Fix developers doc link (#133 )	2022-02-09 21:33:38 +01:00
Nico Verbruggen	e945b5fe94	👌 Add `version` to PhpSwitcherDelegate	2022-02-09 21:32:55 +01:00
Tadhg Boyle	23e534c5c9	📝 Fix developers doc link (#133 )	2022-02-09 21:31:50 +01:00
Nico Verbruggen	dcddf74830	🔧 New dev build	2022-02-08 23:51:16 +01:00
Nico Verbruggen	9baf69394e	🚩 Re-enabled "Restore Homebrew Permissions"	2022-02-08 23:50:45 +01:00
Nico Verbruggen	2e58bbb5e8	🚀 Version 5.0.1 🔀 Merge branch 'dev/5.x'	2022-02-08 23:40:10 +01:00
Nico Verbruggen	bb6abc5e9a	👌 Fix print statements	2022-02-08 23:37:17 +01:00
Nico Verbruggen	e4f9d491c3	🔥 Cleanup .afdesign file	2022-02-08 23:29:55 +01:00
Nico Verbruggen	1ba7ee37db	👌 Ensure target ownership is OK	2022-02-08 23:20:48 +01:00
Nico Verbruggen	34cfbae3a9	👌 Fix inconsistent capitalisation	2022-02-08 23:12:55 +01:00
Nico Verbruggen	9fabda545f	♻️ Big Cleanup	2022-02-08 23:07:23 +01:00
Nico Verbruggen	7cd50aed7b	🐛 Fix retain cycle due to threading issue	2022-02-08 22:19:32 +01:00
Nico Verbruggen	cdc082071d	♻️ Menu item method reordering	2022-02-08 21:52:17 +01:00
Nico Verbruggen	d1479672c8	♻️ Rework site list loading UI * 0.2 second delay for smooth UI (minimum) * > 0.5 second delay for operation = show spinner	2022-02-08 21:51:59 +01:00
Nico Verbruggen	ffb112cfb2	🚛 Reorganise Errors structs	2022-02-08 21:26:06 +01:00
Nico Verbruggen	f5af33c098	🐛 Correctly parse RC PHP version (#132 ) It'll be a while before a new release candidate is available, but this bug has now been resolved. A new `PhpVersionNumber.parse` method has been added which can throw. The `VersionExtractor` class is now capable of extracting version numbers from all strings now too, and isn't just used to determine the Valet version number. New tests have been added to handle these scenarios. This commit also removes the phpmon-cli component, which wasn't being updated or maintained (it was an experiment).	2022-02-08 18:51:16 +01:00
Nico Verbruggen	0f464f5814	🔥 Cleanup	2022-02-07 18:00:35 +01:00
Nico Verbruggen	776c2095e6	🚛 Move files around	2022-02-07 17:38:44 +01:00
Nico Verbruggen	82a2833161	👌 Improve separators (#128 )	2022-02-07 17:19:57 +01:00
Nico Verbruggen	b14d7bdf07	✨ Add multiple options for icons (#106 ) - PHP next to icon (default) - PHP Elephant - No icon If you chose "no PHP text next to icon" earlier, that preference is remembered and migrated over.	2022-02-07 00:46:00 +01:00
Nico Verbruggen	ffa22eea25	👌 Cleanup, ensure all tests pass	2022-02-06 17:56:16 +01:00
Nico Verbruggen	8220e6409d	🚛 Move async helpers to MainMenu+Async	2022-02-06 13:18:12 +01:00
Nico Verbruggen	927e1c02fa	♻️ Refactor `waitAndExecute` → `asyncExecution` This change allows for errors to be thrown during the `asyncExecution` initial callback, and if one is thrown, allows a `failure` callback to be used. Existing instances of `waitAndExecute` have been replaced. I also added the ability to tweak the behaviours of the actions that are always performed when the asyncExecution method is called: you can now specify limited behaviours (e.g. only set busy icon). For that use case I have already created a new method: `asyncWithBusyUI`. With this change, the handling of the Homebrew Permissions flow has also been modified: when the user does not get administrative permissions an error is now thrown which results in an alert being presented to the user once the error occurs. There is now an opportunity to further refactor other parts of the app to more gracefully handle failure states using the Error and AlertableError protocols.	2022-02-06 13:15:03 +01:00
Nico Verbruggen	a13a17b106	👌 Various improvements - Properly draw the menu bar icon (now with extra documentation) - Resolve Paths via FileManager.default - Updated DEV readme - Add PHP Elephant icon (TBD)	2022-02-05 00:42:10 +01:00
Nico Verbruggen	18d6d73f94	🐛 Fix for #124 ('valet --version' failing)	2022-02-04 20:17:10 +01:00
Nico Verbruggen	54d101acbe	🍱 Updated icons file (Affinity)	2022-02-04 18:29:52 +01:00
Nico Verbruggen	76f720cb71	📝 Updated README	2022-02-04 18:24:56 +01:00
Nico Verbruggen	033e485ce1	🔥 Cleanup icons	2022-02-04 18:20:56 +01:00
Nico Verbruggen	82ee830de1	🔧 New dev build for bugfixing purposes	2022-02-04 18:20:24 +01:00
Nico Verbruggen	55cd1cccee	🐛 Do not watch files that do not exist (#123 )	2022-02-04 18:10:30 +01:00
Nico Verbruggen	5f13ba3d1b	📝 Add section on symbolication	2022-02-04 17:54:30 +01:00
Nico Verbruggen	298aa0aa8d	🔧 Updated project	2022-02-04 17:30:41 +01:00
Nico Verbruggen	5d49be6f7e	🍱 Updated assets (#120 )	2022-02-04 17:30:22 +01:00
Nico Verbruggen	ab81bf5875	📝 Updated FUNDING.yml	2022-02-04 15:35:53 +01:00
Nico Verbruggen	5d8765683a	🔧 Use beta icon for 5.1 betas	2022-02-03 20:38:02 +01:00
Nico Verbruggen	6c22bc0145	🏗 Fix Homebrew Permissions (#86 )	2022-02-03 20:34:57 +01:00
Jason Varga	5c1908668f	✏️ Adjust path in composer symlink recommendation (#115 )	2022-02-03 17:07:22 +01:00
Nico Verbruggen	94da7fb255	🚀 Version 5.0 This release brings a plethora of new features to PHP Monitor. Please check out the release notes for more details. 🔀 Merge branch 'dev/5.x'	2022-02-01 19:59:56 +01:00
Nico Verbruggen	46d2d35c1a	👌 Detect Drupal and WordPress projects (#112 )	2022-02-01 18:36:37 +01:00
Nico Verbruggen	cba41b29bc	🐛 Fix storyboard issues	2022-02-01 17:58:06 +01:00
Nico Verbruggen	7a8f47b995	👌 Quality of life changes - Moved DonationUrl to Constants - Added additional menu items (visible if window is open) - Fixed capitalisation of "WordPress" in PhpFrameworks - Cleanup Stats - Add new translation strings for menu items	2022-02-01 17:51:23 +01:00
Nico Verbruggen	40062c5091	🔧 Bump version number for new RC	2022-01-31 18:17:15 +01:00
Nico Verbruggen	6081ef6b02	👌 Verify switch succeeded (#111 ) - Verify switch was successful - Suggest "Fix My Valet" - Restart nginx when switching PHP versions	2022-01-31 17:56:20 +01:00
Nico Verbruggen	4cffe5a662	👌 Rename "Force Load PHP" to "Fix My Valet" (#111 )	2022-01-31 12:41:41 +01:00
Nico Verbruggen	813aec2b42	👌 Disable message in beta builds	2022-01-30 19:32:32 +01:00
Nico Verbruggen	f2452bbc70	👌 Keep track of times (successfully) switched Some users might not reboot their computer and in that situation they will never see the message in `bba961269c`. This has been remedied by also checking how many times the version switch has occurred. The thresholds for the alert are now: - Must have launched the app at least 7 times OR - Must have switched PHP versions at least 40 times If the alert has been seen, it'll never be shown again. For more info please consult the linked commit for the rationale behind this change.	2022-01-30 19:27:44 +01:00
Nico Verbruggen	28fb685bfc	🐛 Fix refreshing of PHP version	2022-01-30 00:40:11 +01:00
Nico Verbruggen	0661ca00ff	📝 Update README and SECURITY	2022-01-29 23:03:19 +01:00
Nico Verbruggen	0b04619003	✏️ Update TODO for 5.1	2022-01-29 22:49:30 +01:00
Nico Verbruggen	85d7b6aa57	🔧 Switch to regular version (release candidate)	2022-01-29 21:36:55 +01:00
Nico Verbruggen	bba961269c	✨ Add successful launch count, sponsor alert Okay, so this commit adds a sponsor alert. I wanted to elaborate. Why? At this point I've invested so much of my free time in the app that any and all donations would be incredibly welcome. Of course, phpmon as it exists today must always remain free and open source. (I dislike it when an app goes open source and then becomes paid.) Obviously, I don't want to take useful features away from users: 1) usage of the old version is the only option for those who won't pay 2) piracy is an alternative and I don't want to deal with that 3) the positive sentiment around the app disappears ("sellout!") Instead, I will nicely ask for donations once the app has been successfully launched 7 times or more. This alert should only appear once. Fun fact: PHP Monitor started as a single menu item with only options to switch between version numbers. Thanks to all the support, it has now become so much more. To those who have already contributed: thank you very much. I hope you continue to use and enjoy the app. Cheers!	2022-01-29 21:29:51 +01:00
Nico Verbruggen	d0f7d2c5e9	✨ Handle >= and > constraints	2022-01-29 19:10:17 +01:00
Nico Verbruggen	eeeb3eb184	👌 Tweak strings to be completely accurate	2022-01-29 18:05:26 +01:00
Nico Verbruggen	f00f8d26f6	🐛 Enforce readable Valet version	2022-01-29 17:46:56 +01:00
Nico Verbruggen	74817beec6	🐛 Fix First Aid not working	2022-01-29 17:46:37 +01:00
Nico Verbruggen	7b6809245c	🐛 `loopback` might not exist (#104 )	2022-01-29 17:05:00 +01:00
Nico Verbruggen	5b40a8fd41	👌 Updated goals, new asset, SwiftUI integration	2022-01-29 14:15:39 +01:00
Nico Verbruggen	193f459be1	✏️ New comments	2022-01-29 14:13:38 +01:00
Nico Verbruggen	c4c19a5b47	📝 Updated README, new promo shot	2022-01-29 14:13:05 +01:00
Nico Verbruggen	7d103c70e7	📝 Updated README	2022-01-29 13:22:47 +01:00
Nico Verbruggen	2ffe90948e	✨ Add preference to disable integrations I like the idea of the exposed phpmon:// protocol, but for those who care about security it should be possible to disable the integrations.	2022-01-29 12:52:33 +01:00
Nico Verbruggen	8e61aaacde	🔧 Bump build	2022-01-29 00:12:38 +01:00
Nico Verbruggen	29c8fcbde2	👌 Force composer from /usr/local/bin (#102 )	2022-01-29 00:11:12 +01:00
Nico Verbruggen	8dd21f46aa	🍱 Fix colors for dark mode (#101 )	2022-01-28 23:40:00 +01:00
Nico Verbruggen	e688dde2aa	👌 Add example Alfred workflow	2022-01-28 22:12:35 +01:00
Nico Verbruggen	987e1e1bdb	🔧 Bump version number	2022-01-28 22:06:53 +01:00
Nico Verbruggen	510257c436	👌 Complete work on inter app handler Allowed commands: phpmon://list phpmon://services/stop phpmon://services/restart/all phpmon://services/restart/nginx phpmon://services/restart/php phpmon://services/restart/dnsmasq phpmon://locate/config phpmon://locate/composer phpmon://locate/valet phpmon://phpinfo phpmon://switch/php/{version}	2022-01-28 22:05:53 +01:00
Nico Verbruggen	bb1572f32a	✨ Allow switching PHP versions via callback	2022-01-28 17:42:40 +01:00
Nico Verbruggen	45276034b1	✨ Add initial start for scheme integration	2022-01-28 17:01:40 +01:00
Nico Verbruggen	0d4a144524	👌 Cleanup `HomebrewDiagnostics`	2022-01-28 16:42:46 +01:00
Nico Verbruggen	a0e5102ca7	👌 Add some comments for curious code readers	2022-01-28 16:30:07 +01:00
Nico Verbruggen	69c0f5ace9	✅ Have all tests pass, refactor comparison logic	2022-01-27 19:39:02 +01:00
Nico Verbruggen	d0962c2387	🐛 Show question mark if service not found	2022-01-27 18:23:12 +01:00
Nico Verbruggen	4670894cfd	👌 Driver not detected (localised)	2022-01-27 01:15:54 +01:00
Nico Verbruggen	a2f6c70a03	🔀 Merge branch 'dev/4.x'	2022-01-27 00:46:12 +01:00
Nico Verbruggen	ef469868d8	📝 Update README (no more Valet switcher in 5.0)	2022-01-27 00:44:36 +01:00
Nico Verbruggen	c9ba872529	⚡️ Fix laggy scrolling and search (Partial backport for the stable build.)	2022-01-27 00:43:08 +01:00
Nico Verbruggen	1e15042be2	🐛 Start a "clean" terminal every time (#99 ) (Backported for the stable build.)	2022-01-27 00:34:54 +01:00
Nico Verbruggen	7647978da5	🐛 Start a "clean" terminal every time (#99 )	2022-01-26 23:49:32 +01:00
Tadhg Boyle	f82f3052f2	✨ Add Flarum to framework list (#95 )	2022-01-26 21:56:27 +01:00
Nico Verbruggen	10b299ff65	🐛 Check if services command can run	2022-01-26 21:00:52 +01:00
Nico Verbruggen	e4ff0418fd	⚡️ Faster search, faster scrolling	2022-01-26 20:31:37 +01:00
Nico Verbruggen	a2b25e31ca	👌 Delayed loading of config.json	2022-01-26 19:47:00 +01:00
Nico Verbruggen	c4772db808	👌 Determine "driver" by reading composer file This is much faster than checking the actual driver, which might take a while if you have many sites. If we're just checking the actual composer file (which is already parsed) this should be much faster.	2022-01-26 19:06:57 +01:00
Nico Verbruggen	38c2d9131b	📝 PR template	2022-01-04 20:49:57 +01:00
Nico Verbruggen	1566323fca	📝 PR template	2022-01-04 20:49:44 +01:00
Tadhg Boyle	bf0a923eb2	👌 Add more detail to full PHP version setting name (#78 )	2022-01-04 19:41:01 +01:00
Nico Verbruggen	e372480249	🐛 Fix issue with Valet precedence (#77 )	2022-01-03 17:01:51 +01:00
				`@ -1 +0,0 @@`
				<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>