🔀 Merge branch 'dev/4.x'

(Partial backport for the stable build.)

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: ['https://nicoverbruggen.be/sponsor', 'https://paypal.me/nicoverbruggen']

.github/pull_request_template.md

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

PHP Monitor.xcodeproj/project.pbxproj

@@ -3,21 +3,57 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 52;
 	objects = {
 
 /* 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 */; };
+		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 */; };
+		54FCFD2E276C8D67004CE748 /* HotkeyPreferenceView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 54FCFD2C276C8D67004CE748 /* HotkeyPreferenceView.xib */; };
+		54FCFD30276C8DA4004CE748 /* HotkeyPreferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54FCFD2F276C8DA4004CE748 /* HotkeyPreferenceView.swift */; };
+		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 */; };
 		C412E5FC25700D5300A1FB67 /* HomebrewPackage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C412E5FB25700D5300A1FB67 /* HomebrewPackage.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 */; };
 		C41C1B3B22B0098000E7CF16 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C41C1B3A22B0098000E7CF16 /* Assets.xcassets */; };
 		C41C1B3E22B0098000E7CF16 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C41C1B3C22B0098000E7CF16 /* Main.storyboard */; };
 		C41C1B4722B009A400E7CF16 /* Shell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4622B009A400E7CF16 /* Shell.swift */; };
 		C41C1B4922B00A9800E7CF16 /* MenuBarImageGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */; };
-		C41C1B4B22B019FF00E7CF16 /* PhpInstall.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4A22B019FF00E7CF16 /* PhpInstall.swift */; };
+		C41C1B4B22B019FF00E7CF16 /* ActivePhpInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4A22B019FF00E7CF16 /* ActivePhpInstallation.swift */; };
 		C41C1B4D22B0215A00E7CF16 /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4C22B0215A00E7CF16 /* Actions.swift */; };
+		C41CA5ED2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41CA5EC2774F8EE00A2C80E /* SiteListVC+Actions.swift */; };
+		C41CA5EE2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41CA5EC2774F8EE00A2C80E /* SiteListVC+Actions.swift */; };
+		C41CD0292628D8EE0065BBED /* GlobalKeybindPreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41CD0282628D8EE0065BBED /* GlobalKeybindPreference.swift */; };
+		C41E871A2763D42300161EE0 /* SiteListVC+ContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41E87192763D42300161EE0 /* SiteListVC+ContextMenu.swift */; };
+		C41E871B2763D42300161EE0 /* SiteListVC+ContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41E87192763D42300161EE0 /* SiteListVC+ContextMenu.swift */; };
 		C42295DD2358D02000E263B2 /* Command.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42295DC2358D02000E263B2 /* Command.swift */; };
+		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 */; };
+		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 */; };
+		C43A8A2025D9D1D700591B77 /* brew.json in Resources */ = {isa = PBXBuildFile; fileRef = C43A8A1F25D9D1D700591B77 /* brew.json */; };
+		C43A8A2425D9D20D00591B77 /* BrewJsonParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.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 */; };
+		C464ADB0275A7A6A003FCD53 /* SiteListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAE275A7A69003FCD53 /* SiteListVC.swift */; };
+		C464ADB2275A87CA003FCD53 /* SiteListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADB1275A87CA003FCD53 /* SiteListCell.swift */; };
+		C464ADB3275A87CA003FCD53 /* SiteListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADB1275A87CA003FCD53 /* SiteListCell.swift */; };
 		C46FA23F246C358E00944F05 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46FA23E246C358E00944F05 /* StringExtension.swift */; };
 		C473319F2470923A009A0597 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C473319E2470923A009A0597 /* Localizable.strings */; };
 		C47331A2247093B7009A0597 /* StatusMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C47331A1247093B7009A0597 /* StatusMenu.swift */; };
@@ -25,22 +61,92 @@
 		C476FF9822B0DD830098105B /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = C476FF9722B0DD830098105B /* Alert.swift */; };
 		C4811D2422D70A4700B5F6B3 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4811D2322D70A4700B5F6B3 /* App.swift */; };
 		C4811D2A22D70F9A00B5F6B3 /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */; };
+		C481F79726164A78004FBCFF /* PrefsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5420395826135DC100FB00FA /* PrefsVC.swift */; };
+		C481F79A26164A7C004FBCFF /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5420395E2613607600FB00FA /* Preferences.swift */; };
 		C48D0C9025CC7FD000CC7490 /* StatsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C48D0C8F25CC7FD000CC7490 /* StatsView.xib */; };
 		C48D0C9325CC804200CC7490 /* XibLoadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0C9225CC804200CC7490 /* XibLoadable.swift */; };
 		C48D0C9625CC80B100CC7490 /* HeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0C9525CC80B100CC7490 /* HeaderView.swift */; };
 		C48D0C9A25CC888B00CC7490 /* HeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C48D0C9925CC888B00CC7490 /* HeaderView.xib */; };
 		C48D0CA325CC992000CC7490 /* StatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0CA225CC992000CC7490 /* StatsView.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 */; };
 		C49EAB46259FC305007F6C3B /* Paths.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EAB45259FC305007F6C3B /* Paths.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 */; };
+		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 */; };
+		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 */; };
+		C4CCBA6C275C567B008C7055 /* PMWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CCBA6B275C567B008C7055 /* PMWindowController.swift */; };
+		C4CCBA6D275C567B008C7055 /* PMWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CCBA6B275C567B008C7055 /* PMWindowController.swift */; };
 		C4D8016622B1584700C6DA1B /* Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D8016522B1584700C6DA1B /* Startup.swift */; };
 		C4EE188422D3386B00E126E5 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE188322D3386B00E126E5 /* Constants.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 */; };
+		C4F7809625D7FBF8000DBC97 /* Shell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4622B009A400E7CF16 /* Shell.swift */; };
+		C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F7809B25D80344000DBC97 /* CommandTest.swift */; };
+		C4F7809F25D8037C000DBC97 /* Command.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42295DC2358D02000E263B2 /* Command.swift */; };
+		C4F780A225D804AA000DBC97 /* Paths.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EAB45259FC305007F6C3B /* Paths.swift */; };
+		C4F780A825D80AE8000DBC97 /* php.ini in Resources */ = {isa = PBXBuildFile; fileRef = C4F780A725D80AE8000DBC97 /* php.ini */; };
+		C4F780AE25D80B37000DBC97 /* ExtensionParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F780AD25D80B37000DBC97 /* ExtensionParserTest.swift */; };
+		C4F780B125D80B4D000DBC97 /* PhpExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4ACA38E25C754C100060C66 /* PhpExtension.swift */; };
+		C4F780B425D80B51000DBC97 /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4C22B0215A00E7CF16 /* Actions.swift */; };
+		C4F780B725D80B5D000DBC97 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4811D2322D70A4700B5F6B3 /* App.swift */; };
+		C4F780BA25D80B62000DBC97 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */; };
+		C4F780BD25D80B65000DBC97 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE188322D3386B00E126E5 /* Constants.swift */; };
+		C4F780C025D80B6E000DBC97 /* Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D8016522B1584700C6DA1B /* Startup.swift */; };
+		C4F780C325D80B75000DBC97 /* HeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0C9525CC80B100CC7490 /* HeaderView.swift */; };
+		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 */; };
+		C4F780CB25D80B75000DBC97 /* StatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48D0CA225CC992000CC7490 /* StatsView.swift */; };
+		C4F780CC25D80B75000DBC97 /* ActivePhpInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4A22B019FF00E7CF16 /* ActivePhpInstallation.swift */; };
+		C4F780CD25D80B75000DBC97 /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = C476FF9722B0DD830098105B /* Alert.swift */; };
+		C4F780CE25D80B75000DBC97 /* LocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = C474B00524C0E98C00066A22 /* LocalNotification.swift */; };
 		C4F8C0A422D4F12C002EFE61 /* DateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F8C0A322D4F12C002EFE61 /* DateExtension.swift */; };
+		C4FBFC532616485F00CDB8E1 /* PhpVersionDetectionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		C4F7807E25D7F84B000DBC97 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = C41C1B2B22B0097F00E7CF16 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = C41C1B3222B0097F00E7CF16;
+			remoteInfo = "PHP Monitor";
+		};
+/* End PBXContainerItemProxy 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>"; };
+		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>"; };
 		C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomebrewPackage.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; };
 		C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		C41C1B3A22B0098000E7CF16 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -49,9 +155,21 @@
 		C41C1B4022B0098000E7CF16 /* phpmon.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = phpmon.entitlements; sourceTree = "<group>"; };
 		C41C1B4622B009A400E7CF16 /* Shell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shell.swift; sourceTree = "<group>"; };
 		C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarImageGenerator.swift; sourceTree = "<group>"; };
-		C41C1B4A22B019FF00E7CF16 /* PhpInstall.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpInstall.swift; sourceTree = "<group>"; };
+		C41C1B4A22B019FF00E7CF16 /* ActivePhpInstallation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivePhpInstallation.swift; sourceTree = "<group>"; };
 		C41C1B4C22B0215A00E7CF16 /* Actions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Actions.swift; sourceTree = "<group>"; };
+		C41CA5EC2774F8EE00A2C80E /* SiteListVC+Actions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SiteListVC+Actions.swift"; sourceTree = "<group>"; };
+		C41CD0282628D8EE0065BBED /* GlobalKeybindPreference.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalKeybindPreference.swift; sourceTree = "<group>"; };
+		C41E87192763D42300161EE0 /* SiteListVC+ContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SiteListVC+ContextMenu.swift"; sourceTree = "<group>"; };
 		C42295DC2358D02000E263B2 /* Command.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Command.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>"; };
+		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>"; };
+		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>"; };
 		C46FA23E246C358E00944F05 /* StringExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtension.swift; sourceTree = "<group>"; };
 		C473319E2470923A009A0597 /* Localizable.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
 		C47331A1247093B7009A0597 /* StatusMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusMenu.swift; sourceTree = "<group>"; };
@@ -64,18 +182,46 @@
 		C48D0C9525CC80B100CC7490 /* HeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderView.swift; sourceTree = "<group>"; };
 		C48D0C9925CC888B00CC7490 /* HeaderView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HeaderView.xib; sourceTree = "<group>"; };
 		C48D0CA225CC992000CC7490 /* StatsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatsView.swift; sourceTree = "<group>"; };
+		C4998F092617633900B2526E /* PrefsWC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefsWC.swift; sourceTree = "<group>"; };
 		C49EAB45259FC305007F6C3B /* Paths.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Paths.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>"; };
+		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>"; };
+		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>"; };
+		C4CCBA6B275C567B008C7055 /* PMWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PMWindowController.swift; sourceTree = "<group>"; };
 		C4D8016522B1584700C6DA1B /* Startup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Startup.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>"; };
 		C4EE188322D3386B00E126E5 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.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>"; };
+		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>"; };
+		C4F780A725D80AE8000DBC97 /* php.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = php.ini; sourceTree = "<group>"; };
+		C4F780AD25D80B37000DBC97 /* ExtensionParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionParserTest.swift; sourceTree = "<group>"; };
 		C4F8C0A322D4F12C002EFE61 /* DateExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateExtension.swift; sourceTree = "<group>"; };
 		C4F8C0A522D4FA41002EFE61 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+		C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhpVersionDetectionTest.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		C41C1B3022B0097F00E7CF16 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C4998F0626175E7200B2526E /* HotKey in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C4F7807625D7F84B000DBC97 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -85,6 +231,39 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		5420395726135DB800FB00FA /* Preferences */ = {
+			isa = PBXGroup;
+			children = (
+				C4998F092617633900B2526E /* PrefsWC.swift */,
+				5420395826135DC100FB00FA /* PrefsVC.swift */,
+				5420395E2613607600FB00FA /* Preferences.swift */,
+				C41CD0272628D8E20065BBED /* Keybinds */,
+				54FCFD28276C88C0004CE748 /* Views */,
+			);
+			path = Preferences;
+			sourceTree = "<group>";
+		};
+		54B20EDF263AA22C00D3250E /* PHP */ = {
+			isa = PBXGroup;
+			children = (
+				C41C1B4A22B019FF00E7CF16 /* ActivePhpInstallation.swift */,
+				C4F2E4392752F7D00020E974 /* PhpInstallation.swift */,
+				C4ACA38E25C754C100060C66 /* PhpExtension.swift */,
+			);
+			path = PHP;
+			sourceTree = "<group>";
+		};
+		54FCFD28276C88C0004CE748 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				54FCFD25276C883F004CE748 /* CheckboxPreferenceView.xib */,
+				54FCFD29276C8AA4004CE748 /* CheckboxPreferenceView.swift */,
+				54FCFD2C276C8D67004CE748 /* HotkeyPreferenceView.xib */,
+				54FCFD2F276C8DA4004CE748 /* HotkeyPreferenceView.swift */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 		C405A4CD24B9B9070062FAFA /* IAP */ = {
 			isa = PBXGroup;
 			children = (
@@ -99,8 +278,10 @@
 			children = (
 				C4F8C0A522D4FA41002EFE61 /* README.md */,
 				C4E713562570150F00007428 /* SECURITY.md */,
+				C4F7807425D7F7E5000DBC97 /* RELEASE.md */,
 				C4E713572570151400007428 /* docs */,
 				C41C1B3522B0097F00E7CF16 /* phpmon */,
+				C4F7807A25D7F84B000DBC97 /* phpmon-tests */,
 				C41C1B3422B0097F00E7CF16 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -109,6 +290,7 @@
 			isa = PBXGroup;
 			children = (
 				C41C1B3322B0097F00E7CF16 /* PHP Monitor.app */,
+				C4F7807925D7F84B000DBC97 /* phpmon-tests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -116,10 +298,10 @@
 		C41C1B3522B0097F00E7CF16 /* phpmon */ = {
 			isa = PBXGroup;
 			children = (
-				C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */,
 				C4EE188322D3386B00E126E5 /* Constants.swift */,
 				C41E181722CB61EB0072CF09 /* Domain */,
 				C41C1B3F22B0098000E7CF16 /* Info.plist */,
+				C4232EE42612526500158FC6 /* Credits.html */,
 				C41C1B4022B0098000E7CF16 /* phpmon.entitlements */,
 				C41C1B3A22B0098000E7CF16 /* Assets.xcassets */,
 				C473319E2470923A009A0597 /* Localizable.strings */,
@@ -128,22 +310,46 @@
 			path = phpmon;
 			sourceTree = "<group>";
 		};
+		C41CD0272628D8E20065BBED /* Keybinds */ = {
+			isa = PBXGroup;
+			children = (
+				C41CD0282628D8EE0065BBED /* GlobalKeybindPreference.swift */,
+			);
+			path = Keybinds;
+			sourceTree = "<group>";
+		};
 		C41E181722CB61EB0072CF09 /* Domain */ = {
 			isa = PBXGroup;
 			children = (
-				C4811D2622D70CEF00B5F6B3 /* Singletons */,
+				C4AF9F6B275445D300D44ED0 /* Integrations */,
 				C4B13B1D25C4915000548C3A /* Core */,
+				54B20EDF263AA22C00D3250E /* PHP */,
+				C4F7808A25D7F918000DBC97 /* Terminal */,
 				C47331A0247093AC009A0597 /* Menu */,
-				C4811D2722D70D8E00B5F6B3 /* Commands */,
+				C464ADAA275A7A25003FCD53 /* SiteList */,
+				5420395726135DB800FB00FA /* Preferences */,
 				C4811D2822D70D9C00B5F6B3 /* Helpers */,
 				C4F8C0A222D4F100002EFE61 /* Extensions */,
 			);
 			path = Domain;
 			sourceTree = "<group>";
 		};
+		C464ADAA275A7A25003FCD53 /* SiteList */ = {
+			isa = PBXGroup;
+			children = (
+				C464ADAB275A7A3F003FCD53 /* SiteListWC.swift */,
+				C464ADAE275A7A69003FCD53 /* SiteListVC.swift */,
+				C41E87192763D42300161EE0 /* SiteListVC+ContextMenu.swift */,
+				C41CA5EC2774F8EE00A2C80E /* SiteListVC+Actions.swift */,
+				C464ADB1275A87CA003FCD53 /* SiteListCell.swift */,
+			);
+			path = SiteList;
+			sourceTree = "<group>";
+		};
 		C47331A0247093AC009A0597 /* Menu */ = {
 			isa = PBXGroup;
 			children = (
+				C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */,
 				C47331A1247093B7009A0597 /* StatusMenu.swift */,
 				C48D0C9525CC80B100CC7490 /* HeaderView.swift */,
 				C48D0C9925CC888B00CC7490 /* HeaderView.xib */,
@@ -153,54 +359,99 @@
 			path = Menu;
 			sourceTree = "<group>";
 		};
-		C4811D2622D70CEF00B5F6B3 /* Singletons */ = {
-			isa = PBXGroup;
-			children = (
-				C49EAB45259FC305007F6C3B /* Paths.swift */,
-				C41C1B4622B009A400E7CF16 /* Shell.swift */,
-				C42295DC2358D02000E263B2 /* Command.swift */,
-				C4811D2322D70A4700B5F6B3 /* App.swift */,
-				C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */,
-			);
-			path = Singletons;
-			sourceTree = "<group>";
-		};
-		C4811D2722D70D8E00B5F6B3 /* Commands */ = {
-			isa = PBXGroup;
-			children = (
-				C41C1B4C22B0215A00E7CF16 /* Actions.swift */,
-				C4D8016522B1584700C6DA1B /* Startup.swift */,
-			);
-			path = Commands;
-			sourceTree = "<group>";
-		};
 		C4811D2822D70D9C00B5F6B3 /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
 				C476FF9722B0DD830098105B /* Alert.swift */,
-				C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */,
+				54B48B5E275F66AE006D90C5 /* Application.swift */,
+				C4188988275FE8CB001EF227 /* Filesystem.swift */,
 				C474B00524C0E98C00066A22 /* LocalNotification.swift */,
+				C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */,
+				C4CCBA6B275C567B008C7055 /* PMWindowController.swift */,
+				54AB03252763858F00A29D5F /* Timer.swift */,
+				C4B5635D276AB09000F12CCB /* VersionExtractor.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
 		};
+		C4AF9F6A275445C900D44ED0 /* Valet */ = {
+			isa = PBXGroup;
+			children = (
+				C4AF9F792754499000D44ED0 /* Valet.swift */,
+			);
+			path = Valet;
+			sourceTree = "<group>";
+		};
+		C4AF9F6B275445D300D44ED0 /* Integrations */ = {
+			isa = PBXGroup;
+			children = (
+				C4AF9F6C275445D900D44ED0 /* Homebrew */,
+				C4AF9F6A275445C900D44ED0 /* Valet */,
+			);
+			path = Integrations;
+			sourceTree = "<group>";
+		};
+		C4AF9F6C275445D900D44ED0 /* Homebrew */ = {
+			isa = PBXGroup;
+			children = (
+				C4F2E4362752F0870020E974 /* HomebrewDiagnostics.swift */,
+				C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */,
+			);
+			path = Homebrew;
+			sourceTree = "<group>";
+		};
 		C4B13B1D25C4915000548C3A /* Core */ = {
 			isa = PBXGroup;
 			children = (
 				C41C1B3C22B0098000E7CF16 /* Main.storyboard */,
-				C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */,
-				C41C1B4A22B019FF00E7CF16 /* PhpInstall.swift */,
-				C4ACA38E25C754C100060C66 /* PhpExtension.swift */,
+				C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */,
+				C4B97B74275CF08C003F3378 /* AppDelegate+MenuOutlets.swift */,
+				C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */,
+				C4811D2322D70A4700B5F6B3 /* App.swift */,
+				C4B97B77275CF1B5003F3378 /* App+ActivationPolicy.swift */,
+				C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */,
+				C4D8016522B1584700C6DA1B /* Startup.swift */,
+				C41C1B4C22B0215A00E7CF16 /* Actions.swift */,
 			);
 			path = Core;
 			sourceTree = "<group>";
 		};
+		C4F7807A25D7F84B000DBC97 /* phpmon-tests */ = {
+			isa = PBXGroup;
+			children = (
+				C4AF9F70275445FF00D44ED0 /* valet-config.json */,
+				C43A8A1F25D9D1D700591B77 /* brew.json */,
+				C4F780A725D80AE8000DBC97 /* php.ini */,
+				C4F7807D25D7F84B000DBC97 /* Info.plist */,
+				C4F7809B25D80344000DBC97 /* CommandTest.swift */,
+				C4F780AD25D80B37000DBC97 /* ExtensionParserTest.swift */,
+				C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.swift */,
+				C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */,
+				C43A8A1925D9CD1000591B77 /* Utility.swift */,
+				C4AF9F76275447F100D44ED0 /* ValetConfigParserTest.swift */,
+				C4AF9F7C275454A900D44ED0 /* ValetTest.swift */,
+				C4B56360276AB0A500F12CCB /* VersionExtractorTest.swift */,
+			);
+			path = "phpmon-tests";
+			sourceTree = "<group>";
+		};
+		C4F7808A25D7F918000DBC97 /* Terminal */ = {
+			isa = PBXGroup;
+			children = (
+				C49EAB45259FC305007F6C3B /* Paths.swift */,
+				C42295DC2358D02000E263B2 /* Command.swift */,
+				C41C1B4622B009A400E7CF16 /* Shell.swift */,
+			);
+			path = Terminal;
+			sourceTree = "<group>";
+		};
 		C4F8C0A222D4F100002EFE61 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
 				C4F8C0A322D4F12C002EFE61 /* DateExtension.swift */,
 				C46FA23E246C358E00944F05 /* StringExtension.swift */,
 				C48D0C9225CC804200CC7490 /* XibLoadable.swift */,
+				C42759662627662800093CAE /* NSMenuExtension.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -221,23 +472,48 @@
 			dependencies = (
 			);
 			name = "PHP Monitor";
+			packageProductDependencies = (
+				C4998F0526175E7200B2526E /* HotKey */,
+			);
 			productName = phpmon;
 			productReference = C41C1B3322B0097F00E7CF16 /* PHP Monitor.app */;
 			productType = "com.apple.product-type.application";
 		};
+		C4F7807825D7F84B000DBC97 /* phpmon-tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C4F7808025D7F84B000DBC97 /* Build configuration list for PBXNativeTarget "phpmon-tests" */;
+			buildPhases = (
+				C4F7807525D7F84B000DBC97 /* Sources */,
+				C4F7807625D7F84B000DBC97 /* Frameworks */,
+				C4F7807725D7F84B000DBC97 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				C4F7807F25D7F84B000DBC97 /* PBXTargetDependency */,
+			);
+			name = "phpmon-tests";
+			productName = "phpmon-tests";
+			productReference = C4F7807925D7F84B000DBC97 /* phpmon-tests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		C41C1B2B22B0097F00E7CF16 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 1020;
+				LastSwiftUpdateCheck = 1240;
 				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "Nico Verbruggen";
 				TargetAttributes = {
 					C41C1B3222B0097F00E7CF16 = {
 						CreatedOnToolsVersion = 10.2.1;
 					};
+					C4F7807825D7F84B000DBC97 = {
+						CreatedOnToolsVersion = 12.4;
+						TestTargetID = C41C1B3222B0097F00E7CF16;
+					};
 				};
 			};
 			buildConfigurationList = C41C1B2E22B0097F00E7CF16 /* Build configuration list for PBXProject "PHP Monitor" */;
@@ -249,11 +525,15 @@
 				Base,
 			);
 			mainGroup = C41C1B2A22B0097F00E7CF16;
+			packageReferences = (
+				C4998F0426175E7200B2526E /* XCRemoteSwiftPackageReference "HotKey" */,
+			);
 			productRefGroup = C41C1B3422B0097F00E7CF16 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
 				C41C1B3222B0097F00E7CF16 /* PHP Monitor */,
+				C4F7807825D7F84B000DBC97 /* phpmon-tests */,
 			);
 		};
 /* End PBXProject section */
@@ -265,14 +545,30 @@
 			files = (
 				C41C1B3B22B0098000E7CF16 /* Assets.xcassets in Resources */,
 				C41C1B3E22B0098000E7CF16 /* Main.storyboard in Resources */,
+				C4AF9F71275445FF00D44ED0 /* valet-config.json in Resources */,
 				C48D0C9025CC7FD000CC7490 /* StatsView.xib in Resources */,
 				C405A4D124B9B9140062FAFA /* InternetAccessPolicy.plist in Resources */,
+				C4232EE52612526500158FC6 /* Credits.html in Resources */,
+				54FCFD26276C883F004CE748 /* CheckboxPreferenceView.xib in Resources */,
 				C473319F2470923A009A0597 /* Localizable.strings in Resources */,
+				54FCFD2D276C8D67004CE748 /* HotkeyPreferenceView.xib in Resources */,
 				C405A4D024B9B9140062FAFA /* InternetAccessPolicy.strings in Resources */,
 				C48D0C9A25CC888B00CC7490 /* HeaderView.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C4F7807725D7F84B000DBC97 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				54FCFD27276C883F004CE748 /* CheckboxPreferenceView.xib in Resources */,
+				54FCFD2E276C8D67004CE748 /* HotkeyPreferenceView.xib in Resources */,
+				C4F780A825D80AE8000DBC97 /* php.ini in Resources */,
+				C43A8A2025D9D1D700591B77 /* brew.json in Resources */,
+				C4AF9F72275445FF00D44ED0 /* valet-config.json in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -282,30 +578,122 @@
 			files = (
 				C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */,
 				C4D8016622B1584700C6DA1B /* Startup.swift in Sources */,
+				C4998F0A2617633900B2526E /* PrefsWC.swift in Sources */,
 				C4F8C0A422D4F12C002EFE61 /* DateExtension.swift in Sources */,
+				C4AF9F7A2754499000D44ED0 /* Valet.swift in Sources */,
+				5420395926135DC100FB00FA /* PrefsVC.swift in Sources */,
+				C43603A0275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */,
+				54FCFD30276C8DA4004CE748 /* HotkeyPreferenceView.swift in Sources */,
 				C41C1B4722B009A400E7CF16 /* Shell.swift in Sources */,
+				C4F2E43A2752F7D00020E974 /* PhpInstallation.swift in Sources */,
 				C41C1B4D22B0215A00E7CF16 /* Actions.swift in Sources */,
+				C41E871A2763D42300161EE0 /* SiteListVC+ContextMenu.swift in Sources */,
 				C48D0CA325CC992000CC7490 /* StatsView.swift in Sources */,
+				C4F2E4372752F0870020E974 /* HomebrewDiagnostics.swift in Sources */,
+				C4CCBA6C275C567B008C7055 /* PMWindowController.swift in Sources */,
+				C41CD0292628D8EE0065BBED /* GlobalKeybindPreference.swift in Sources */,
 				C42295DD2358D02000E263B2 /* Command.swift in Sources */,
+				54B48B5F275F66AE006D90C5 /* Application.swift in Sources */,
+				C4B97B78275CF1B5003F3378 /* App+ActivationPolicy.swift in Sources */,
 				C4811D2422D70A4700B5F6B3 /* App.swift in Sources */,
 				C41C1B4922B00A9800E7CF16 /* MenuBarImageGenerator.swift in Sources */,
+				5420395F2613607600FB00FA /* Preferences.swift in Sources */,
 				C48D0C9325CC804200CC7490 /* XibLoadable.swift in Sources */,
+				54FCFD2A276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */,
 				C4811D2A22D70F9A00B5F6B3 /* MainMenu.swift in Sources */,
+				C41CA5ED2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */,
 				C412E5FC25700D5300A1FB67 /* HomebrewPackage.swift in Sources */,
+				54AB03262763858F00A29D5F /* Timer.swift in Sources */,
 				C41C1B3722B0097F00E7CF16 /* AppDelegate.swift in Sources */,
-				C41C1B4B22B019FF00E7CF16 /* PhpInstall.swift in Sources */,
+				C42759672627662800093CAE /* NSMenuExtension.swift in Sources */,
+				C464ADAF275A7A69003FCD53 /* SiteListVC.swift in Sources */,
+				C41C1B4B22B019FF00E7CF16 /* ActivePhpInstallation.swift in Sources */,
 				C49EAB46259FC305007F6C3B /* Paths.swift in Sources */,
+				C4188989275FE8CB001EF227 /* Filesystem.swift in Sources */,
+				C4B97B7B275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */,
 				C476FF9822B0DD830098105B /* Alert.swift in Sources */,
 				C474B00624C0E98C00066A22 /* LocalNotification.swift in Sources */,
 				C48D0C9625CC80B100CC7490 /* HeaderView.swift in Sources */,
+				C4B5635E276AB09000F12CCB /* VersionExtractor.swift in Sources */,
 				C47331A2247093B7009A0597 /* StatusMenu.swift in Sources */,
 				C46FA23F246C358E00944F05 /* StringExtension.swift in Sources */,
+				C4B97B75275CF08C003F3378 /* AppDelegate+MenuOutlets.swift in Sources */,
+				C464ADAC275A7A3F003FCD53 /* SiteListWC.swift in Sources */,
+				C464ADB2275A87CA003FCD53 /* SiteListCell.swift in Sources */,
 				C4EE188422D3386B00E126E5 /* Constants.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C4F7807525D7F84B000DBC97 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				54EAC806262F212B0092D14E /* GlobalKeybindPreference.swift in Sources */,
+				C41CA5EE2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */,
+				C4F780C425D80B75000DBC97 /* MainMenu.swift in Sources */,
+				54AB03272763858F00A29D5F /* Timer.swift in Sources */,
+				54FCFD2B276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */,
+				54B48B60275F66AE006D90C5 /* Application.swift in Sources */,
+				C4F780C825D80B75000DBC97 /* DateExtension.swift in Sources */,
+				C4F780CC25D80B75000DBC97 /* ActivePhpInstallation.swift in Sources */,
+				C4F780B125D80B4D000DBC97 /* PhpExtension.swift in Sources */,
+				C4F780CE25D80B75000DBC97 /* LocalNotification.swift in Sources */,
+				C4FBFC532616485F00CDB8E1 /* PhpVersionDetectionTest.swift in Sources */,
+				C43A8A2425D9D20D00591B77 /* BrewJsonParserTest.swift in Sources */,
+				C4F780CA25D80B75000DBC97 /* HomebrewPackage.swift in Sources */,
+				C4AF9F7B2754499000D44ED0 /* Valet.swift in Sources */,
+				C4F780C025D80B6E000DBC97 /* Startup.swift in Sources */,
+				C4CCBA6D275C567B008C7055 /* PMWindowController.swift in Sources */,
+				C4B5635F276AB09000F12CCB /* VersionExtractor.swift in Sources */,
+				C4F2E4382752F08D0020E974 /* HomebrewDiagnostics.swift in Sources */,
+				C4F780AE25D80B37000DBC97 /* ExtensionParserTest.swift in Sources */,
+				C4F780C725D80B75000DBC97 /* StatusMenu.swift in Sources */,
+				C43603A1275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */,
+				C42759682627662800093CAE /* NSMenuExtension.swift in Sources */,
+				C4B97B76275CF08C003F3378 /* AppDelegate+MenuOutlets.swift in Sources */,
+				C4F780CD25D80B75000DBC97 /* Alert.swift in Sources */,
+				C481F79726164A78004FBCFF /* PrefsVC.swift in Sources */,
+				C41E871B2763D42300161EE0 /* SiteListVC+ContextMenu.swift in Sources */,
+				C464ADB3275A87CA003FCD53 /* SiteListCell.swift in Sources */,
+				C4AF9F78275447F100D44ED0 /* ValetConfigParserTest.swift in Sources */,
+				C4B97B7C275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */,
+				C4B97B79275CF1B5003F3378 /* App+ActivationPolicy.swift in Sources */,
+				C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */,
+				C4F780BA25D80B62000DBC97 /* AppDelegate.swift in Sources */,
+				54FCFD31276C8DA4004CE748 /* HotkeyPreferenceView.swift in Sources */,
+				C4998F0B2617633900B2526E /* PrefsWC.swift in Sources */,
+				C4F780A225D804AA000DBC97 /* Paths.swift in Sources */,
+				C4F2E43B27530F750020E974 /* PhpInstallation.swift in Sources */,
+				C4F780BD25D80B65000DBC97 /* Constants.swift in Sources */,
+				C4F780C325D80B75000DBC97 /* HeaderView.swift in Sources */,
+				C4F7809625D7FBF8000DBC97 /* Shell.swift in Sources */,
+				C4AF9F7D275454A900D44ED0 /* ValetTest.swift in Sources */,
+				C4B56362276AB0A500F12CCB /* VersionExtractorTest.swift in Sources */,
+				C4F780C525D80B75000DBC97 /* MenuBarImageGenerator.swift in Sources */,
+				C4F780B725D80B5D000DBC97 /* App.swift in Sources */,
+				C4F780C925D80B75000DBC97 /* StringExtension.swift in Sources */,
+				C481F79A26164A7C004FBCFF /* Preferences.swift in Sources */,
+				C464ADAD275A7A3F003FCD53 /* SiteListWC.swift in Sources */,
+				C4F780CB25D80B75000DBC97 /* StatsView.swift in Sources */,
+				C464ADB0275A7A6A003FCD53 /* SiteListVC.swift in Sources */,
+				C43A8A1A25D9CD1000591B77 /* Utility.swift in Sources */,
+				C418898A275FE8CB001EF227 /* Filesystem.swift in Sources */,
+				C4F780C625D80B75000DBC97 /* XibLoadable.swift in Sources */,
+				C4F7809F25D8037C000DBC97 /* Command.swift in Sources */,
+				C4F780B425D80B51000DBC97 /* Actions.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		C4F7807F25D7F84B000DBC97 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = C41C1B3222B0097F00E7CF16 /* PHP Monitor */;
+			targetProxy = C4F7807E25D7F84B000DBC97 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		C41C1B3C22B0098000E7CF16 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -370,7 +758,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -426,7 +814,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
@@ -443,7 +831,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 45;
+				CURRENT_PROJECT_VERSION = 140;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = phpmon/Info.plist;
@@ -451,7 +839,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 3.0;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -467,7 +856,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 45;
+				CURRENT_PROJECT_VERSION = 140;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = phpmon/Info.plist;
@@ -475,7 +864,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 3.0;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -483,6 +873,48 @@
 			};
 			name = Release;
 		};
+		C4F7808125D7F84B000DBC97 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 8M54J5J787;
+				INFOPLIST_FILE = "phpmon-tests/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/../Frameworks",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				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;
+				INFOPLIST_FILE = "phpmon-tests/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/../Frameworks",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				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 */
@@ -504,7 +936,35 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		C4F7808025D7F84B000DBC97 /* Build configuration list for PBXNativeTarget "phpmon-tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C4F7808125D7F84B000DBC97 /* Debug */,
+				C4F7808225D7F84B000DBC97 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		C4998F0426175E7200B2526E /* XCRemoteSwiftPackageReference "HotKey" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/soffes/HotKey";
+			requirement = {
+				kind = upToNextMinorVersion;
+				minimumVersion = 0.1.3;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		C4998F0526175E7200B2526E /* HotKey */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = C4998F0426175E7200B2526E /* XCRemoteSwiftPackageReference "HotKey" */;
+			productName = HotKey;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = C41C1B2B22B0097F00E7CF16 /* Project object */;
 }

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

@@ -28,6 +28,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C4F7807825D7F84B000DBC97"
+               BuildableName = "phpmon-tests.xctest"
+               BlueprintName = "phpmon-tests"
+               ReferencedContainer = "container:PHP Monitor.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

README.md

@@ -1,33 +1,36 @@
 # 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" />
 
-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.
+**PHP Monitor** (or phpmon) is a lightweight macOS utility app that runs on your Mac and displays the active PHP version in your status bar. It's tightly integrated with [Laravel Valet](https://github.com/laravel/valet), so you need to have it set up before you can use this.
 
-<img src="./docs/screenshot.png" width="389px" alt="phpmon screenshot (menu bar app)"/>
+<img src="./docs/screenshot41.jpg" width="800px" alt="phpmon screenshot (menu bar app)"/>
 
 <small><i>Screenshot: A menu showing all of the functionality of PHP Monitor.</i></small>
 
-It's also super convenient to switch between different versions of PHP. You'll even get notifications (only if you choose to opt-in, of course)!
+It's super convenient to switch between different versions of PHP. You'll even get notifications (only if you choose to opt-in, of course)!
 
 <img src="./docs/notification.png" width="370px" alt="phpmon screenshot (notification)"/>
 
-It also gives you quick access to various useful functionality (like accessing configuration files, restarting services, and more).
+PHP Monitor also gives you quick access to various useful functionality (like accessing configuration files, restarting services, and more).
 
 ## 🖥 System requirements
 
 PHP Monitor is a universal application that runs on Apple Silicon **and** Intel-based Macs.
 
-* macOS 10.15 Catalina or higher (works on macOS 11 Big Sur)
+* macOS 11 Big Sur or higher (supports macOS 12 Monterey)
 * Homebrew is installed in `/usr/local/homebrew` or `/opt/homebrew`
 * The brew formula `php` has to be installed (which version is detected)
-* Laravel Valet 2.13 or higher
+* Laravel Valet 2.16.2 or higher (older versions might be compatible but are not supported)
 
-_You may need to update your Valet installation to keep everything working if a major version update of PHP has been released._
+_You may need to update your Valet installation to keep everything working if a major version update of PHP has been released. You can do this by running `composer global update && valet install`._
 
 ## 🚀 How to install
 
-You can install via Homebrew, or may download the latest [release](https://github.com/nicoverbruggen/phpmon/releases).
+You can install via Homebrew (recommended), or may download the latest release on GitHub.
 
 To install via Homebrew, run:
 
@@ -40,10 +43,6 @@ To upgrade your existing installation, run:
 
 _The app is signed and notarized, meaning all you have to do is approve its first launch._
 
-## ⭐️ Star me!
-
-If this software has been useful to you, all I ask is that you **please star the repository**, so I know that the software is being used. You can also send me  [feedback](https://twitter.com/nicoverbruggen) if the app came in handy. 😃
-
 ## 👨‍💻 Why build this?
 
 I wanted to be able to **see at a glance** which version of PHP was linked, and handle dealing with Laravel Valet in a simple app without having to deal with the terminal every time. 
@@ -60,7 +59,26 @@ PHP Monitor performs some integrity checks to ensure a good experience when usin
 
 > 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.
 
-If you're still having issues, here's a few common issues and solutions:
+If you're still having issues, here's a few common questions & answers, as well as issues and solutions:
+
+<details>
+<summary><strong>Which versions of PHP are supported?</strong></summary>
+
+<ul>
+<li>PHP 5.6</li>
+<li>PHP 7.0</li>
+<li>PHP 7.1</li>
+<li>PHP 7.2</li>
+<li>PHP 7.3</li>
+<li>PHP 7.4</li>
+<li>PHP 8.0</li>
+<li>PHP 8.1</li>
+<li>PHP 8.2 (experimental)</li>
+</ul>
+
+For more details, consult the [constants file](https://github.com/nicoverbruggen/phpmon/blob/main/phpmon/Constants.swift#L16) file to see which versions are supported.
+
+</details>
 
 <details>
 <summary><strong>I want PHP Monitor to start up when I boot my Mac!</strong></summary>
@@ -93,9 +111,15 @@ If you're on an Apple Silicon-based Mac, you'll need to add:
     # on an M1 Mac
     export PATH=$HOME/bin:/opt/homebrew/bin:$PATH
 
-and add the following to your .zshrc:
+and add the following to your .zshrc, but add this BEFORE the homebrew PATH additions:
 
     export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH
+    
+If you're adding composer and Homebrew binaries, ensure that Homebrew binaries are preferred by adding these to the path last. On my system, that looks like this:
+
+    export PATH=$HOME/bin:/usr/local/bin:$PATH
+    export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH
+    export PATH=$HOME/bin:/opt/homebrew/bin:$PATH
 
 Make sure PHP is linked correctly:
 
@@ -136,6 +160,35 @@ This problem is usually resolved by upgrading Valet and running `valet install`
 	valet install
 
 </details>
+
+<details>
+<summary><strong>PHP Monitor tells me my installation is broken, but I don't see why!</strong></summary>
+
+PHP Monitor tells you that a PHP installation is broken, if the configuration is causing warnings or errors when determining the version number.
+
+Since PHP Monitor changes the linked version via Homebrew, both Valet *and* your terminal (CLI) should use the new PHP version.
+
+However, this might not be the case on your system. You _might_ have a specific version of PHP linked if that is not the case. In that case, you may need to change your `.bashrc` or `.zshrc` file where the PATH is set (depending on the terminal you use).
+
+You can find out which version of PHP is being used by running `which php`.
+
+You can find out what exactly is causing the issue by running a command. On Intel, you can run (replace `7.4` with the version that is broken):
+
+```
+/usr/local/opt/php@7.4/bin/php -r "print phpversion();"
+```
+
+On Apple Silicon, you can run (replace `7.4` with the version that is broken):
+
+```
+/opt/homebrew/opt/php@7.4/bin/php -r "print phpversion();"
+```
+
+You should see an error or a warning here in the output. 
+
+Usually this is a duplicate extension declaration causing issues, or an extension that couldn't be loaded. You'll have to solve that issue yourself (usually by removing the offending extension or reinstalling).
+
+</details>
 	
 <details>
 <summary><strong>One of the limits (memory limit, max POST size, max upload size) shows an exclamation mark!</strong></summary>
@@ -151,7 +204,7 @@ You must a provide a value like so: `1024K`, `256M`, `1G`. Alternatively, `-1` i
 <details>
 <summary><strong>One of my commented out extensions is not being detected...</strong></summary>
 
-The app searches in the relevant `php.ini` file for a specific pattern. For regular extensions:
+The app searches in the relevant `.ini` files for a specific pattern. For regular extensions:
 
 * `extension="*.so"`
 * `; extension="*.so"`
@@ -162,6 +215,9 @@ For Zend extensions:
 * `; zend_extension="*.so"`
 
 The `*` is a wildcard and the name of the extension. If you've commented out the extension, make sure you've commented it out with a semicolon (;) and a single space after the semicolon for PHP Monitor to detect it.
+
+Since v3.4 all of the loaded .ini files are sourced to determine which extensions are enabled.
+
 </details>
 
 <details>
@@ -181,27 +237,61 @@ PHP Monitor itself doesn't do any network requests. Feel free to check the sourc
 </details>
 
 <details>
-<summary><strong>After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade`!</strong></summary>
+<summary><strong>How do I get various applications to show up in the domain list's right-click menu?</strong></summary>
 
-This is a security feature of Brew. When you start a service as an administrator, the root user becomes the owner of relevant binaries. 
+When you select and right-click on a domain, you can open these directories with various applications. This can help speed up your workflow. However, for these apps to show up, they must be detected first.
 
-You will need to manually clean up those folders yourself using `rm -rf` or by manually removing those folders via Finder.
+The supported apps are: <i>PhpStorm, Visual Studio Code, Sublime Text, Sublime Merge, iTerm</i>.
+
+All of these apps should just be detected correctly, no matter their location on your system. If you can open it using `open -a "appname"`, the app should be detected and work. If you have renamed the app, there might be an issue getting it detected.
+
+To see which files are checked to determine availability, see [this file](./phpmon/Domain/Helpers/Application.swift).
+</details>
+
+<details>
+<summary><strong>After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade` or `brew cleanup`!</strong></summary>
+
+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).
 
 </details>
 
-## 📝 Another issue?
+<details>
+<summary><strong>The app has crashed!</strong></summary>
+
+Please get in touch and open an issue. PHP Monitor shouldn't crash... (unless you are actually removing PHP *while* the app is running, that’s considered normal behaviour!)
+
+</details>
+
+## 📝 Having another issue?
 
 I did not include any tracking or analytics software, so if you encounter issues, let me know [via an issue](https://github.com/nicoverbruggen/phpmon/issues/new).
 
 ## 💵 Support me?
 
-I usually develop this application in my spare time, after work. If you find the application useful and you have a bit of money to spare, feel free to send me [a tip via PayPal](https://paypal.me/nicoverbruggen).
+PHP Monitor is available entirely **free of charge**, but if you can afford it a donation helps keep the project alive and the app maintained.
+
+You can find a [sponsor](https://nicoverbruggen.be/sponsor) link at the top of this repo or you could click the link here to be taken to my sponsorship page.
+
+Donations really help with the Apple Developer Program cost, and keep me motivated to keep working on PHP Monitor outside of work hours (I do have a day job!).
+
+## 😎 Acknowledgements
+
+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)
+* 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
+
+Thank you very much for your contributions, kind words and support.
 
 ## 🚜 How it works
 
 ### Loading info about PHP in the background
 
-This utility runs `php -r 'print phpversion()'` in the background periodically. It also checks your `.ini` files for extensions and loads more information about your limits (memory limit, POST limit, upload limit). 
+This utility runs `php-config --version` in the background periodically. It also checks your `.ini` files for extensions and loads more information about your limits (memory limit, POST limit, upload limit). 
 
 In order to save power, this only happens once every 60 seconds.
 
@@ -209,19 +299,7 @@ In order to save power, this only happens once every 60 seconds.
 
 This utility will detect which PHP versions you have installed via Homebrew, and then allows you to switch between them.
 
-This means:
-
-- You have at least the latest version of PHP installed (`php`)
-- You have installed Laravel Valet (`which valet` returns `/usr/local/bin/valet`)
-- You ran `valet trust`, which means Valet commands can be run without using sudo
-
-The utility runs the following commands:
-
-- Unlink all detected PHP versions
-- Switch to whatever version of PHP `php` is at (this is done to ensure that Valet works, even when attempting to use PHP 5.6)
-- Stop all relevant services (`php`, `nginx`)
-- Link the desired version of PHP
-- Start the correct `php` service for the desired PHP version
+The switcher will disable all PHP-FPM services not belonging to the version you wish to use, and link the desired version of PHP. Then, it'll restart your desired PHP version's FPM process. This all happens in parallel, so this should be much faster than Valet’s switcher.
 
 ### Want to know more?
 
@@ -231,7 +309,7 @@ This app isn't very complicated after all. In the end, this just (conveniently)
 
 ## 🔧 Build instructions
 
-<img src="./docs/build.png" width="320px" alt="build button in Xcode"/>
+<img src="./docs/build.png" width="404px" alt="build button in Xcode"/>
 
 If you'd like to build PHP Monitor yourself, you need:
 

SECURITY.md

@@ -2,15 +2,25 @@
 
 ## Supported versions
 
-Generally speaking, only the latest version of **PHP Monitor** is supported:
+Generally speaking, only the latest version of **PHP Monitor** is supported, except during transition periods (for example, when particular system requirements go up):
 
-| Version | Apple Silicon | Supported          | Supported macOS | Deployment Target |
-| ------- | ------------- | ------------------ | ----- | ----- |
-| 3.0     | ✅ Universal binary | ✅ | Big Sur (11.0) | macOS 10.14+ |
-| 2.6     | ✅ Universal binary | ❌ | Big Sur (11.0) | macOS 10.14+ |
-| 2.5     | ✴️ Universal binary<br/>`/usr/local/homebrew` installations only | ❌ | Big Sur (11.0)<br/>Catalina (10.15) | macOS 10.14+ |
-| 2.4     | ✴️ Universal binary<br/>`/usr/local/homebrew` installations only | ❌ | Big Sur (11.0)<br/>Catalina (10.15) | macOS 10.14+ |
-| < 2.4   | ❌ Intel binary<br/>`/usr/local/homebrew` installations only | ❌ | Catalina (10.15) | macOS 10.14+ |
+| Version | Apple silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Minimum Required Valet Version |
+| ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
+| 4.1       | ✅ 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 |
+| ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
+| 4.0       | ✅ Universal binary | ❌ | Big Sur (11.0) and Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 | 2.13 |
+| 3.5       | ✅ Universal binary | ❌ | Big Sur (11.0) and Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 | 2.13 |
+| 3.0—3.4   | ✅ Universal binary | ❌ | Big Sur (11.0) | macOS 10.14+ | PHP 5.6—PHP 8.1 | 2.13 |
+| 2.6       | ✅ Universal binary | ❌ | Big Sur (11.0) | macOS 10.14+ | PHP 5.6—PHP 8.0 | 2.13 |
+| 2.5       | ✴️ Universal binary<br/>`/usr/local/homebrew` installations only | ❌ | Big Sur (11.0)<br/>Catalina (10.15) | macOS 10.14+ | not applicable | not applicable |
+| 2.4       | ✴️ Universal binary<br/>`/usr/local/homebrew` installations only | ❌ | Big Sur (11.0)<br/>Catalina (10.15) | macOS 10.14+ | not applicable | not applicable |
+| < 2.4     | ❌ Intel binary<br/>`/usr/local/homebrew` installations only | ❌ | Catalina (10.15) | macOS 10.14+ | not applicable | not applicable | 
 
 ## Reporting a vulnerability
 

phpmon-tests/BrewJsonParserTest.swift

@@ -0,0 +1,31 @@
+//
+//  BrewJsonParserTest.swift
+//  phpmon-tests
+//
+//  Created by Nico Verbruggen on 14/02/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import XCTest
+
+class BrewJsonParserTest: XCTestCase {
+
+    static var jsonBrewFile: URL {
+        return Bundle(for: Self.self).url(forResource: "brew", withExtension: "json")!
+    }
+
+    func testCanLoadExtension() throws {
+        let json = try? String(contentsOf: Self.jsonBrewFile, encoding: .utf8)
+        let package = try! JSONDecoder().decode(
+            [HomebrewPackage].self, from: json!.data(using: .utf8)!
+        ).first!
+        
+        XCTAssertEqual(package.name, "php")
+        XCTAssertEqual(package.full_name, "php")
+        XCTAssertEqual(package.aliases.first!, "php@8.0")
+        XCTAssertEqual(package.installed.contains(where: { installed in
+            installed.version.starts(with: "8.0")
+        }), true)
+    }
+
+}

phpmon-tests/CommandTest.swift

@@ -0,0 +1,25 @@
+//
+//  CommandTest.swift
+//  phpmon-tests
+//
+//  Created by Nico Verbruggen on 13/02/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import XCTest
+
+class CommandTest: XCTestCase {
+
+    func testDeterminePhpVersion() {
+        let version = Command.execute(
+            path: Paths.php,
+            arguments: ["-v"]
+        )
+        
+        XCTAssert(version.contains("(cli)"))
+        XCTAssert(version.contains("NTS"))
+        XCTAssert(version.contains("built"))
+        XCTAssert(version.contains("Zend"))
+    }
+    
+}

phpmon-tests/ExtensionParserTest.swift

@@ -0,0 +1,72 @@
+//
+//  ExtensionParserTest.swift
+//  phpmon-tests
+//
+//  Created by Nico Verbruggen on 13/02/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import XCTest
+
+class ExtensionParserTest: XCTestCase {
+    
+    static var phpIniFileUrl: URL {
+        return Bundle(for: Self.self).url(forResource: "php", withExtension: "ini")!
+    }
+
+    func testCanLoadExtension() throws {
+        let extensions = PhpExtension.load(from: Self.phpIniFileUrl)
+        
+        XCTAssertGreaterThan(extensions.count, 0)
+    }
+    
+    func testExtensionNameIsCorrect() throws {
+        let extensions = PhpExtension.load(from: Self.phpIniFileUrl)
+        
+        let extensionNames = extensions.map { (ext) -> String in
+            return ext.name
+        }
+        
+        // These 6 should be found
+        XCTAssertTrue(extensionNames.contains("xdebug"))
+        XCTAssertTrue(extensionNames.contains("imagick"))
+        XCTAssertTrue(extensionNames.contains("sodium-next"))
+        XCTAssertTrue(extensionNames.contains("opcache"))
+        XCTAssertTrue(extensionNames.contains("yaml"))
+        XCTAssertTrue(extensionNames.contains("custom"))
+        
+        XCTAssertFalse(extensionNames.contains("fake"))
+        XCTAssertFalse(extensionNames.contains("nice"))
+    }
+    
+    func testExtensionStatusIsCorrect() throws {
+        let extensions = PhpExtension.load(from: Self.phpIniFileUrl)
+        
+        // xdebug should be enabled
+        XCTAssertEqual(extensions[0].enabled, true)
+        
+        // imagick should be disabled
+        XCTAssertEqual(extensions[1].enabled, false)
+    }
+    
+    func testToggleWorksAsExpected() throws {
+        let destination = Utility.copyToTemporaryFile(resourceName: "php", fileExtension: "ini")!
+        let extensions = PhpExtension.load(from: destination)
+        XCTAssertEqual(extensions.count, 6)
+        
+        // Try to disable xdebug (should be detected first)!
+        let xdebug = extensions.first!
+        XCTAssertTrue(xdebug.name == "xdebug")
+        XCTAssertEqual(xdebug.enabled, true)
+        xdebug.toggle()
+        XCTAssertEqual(xdebug.enabled, false)
+        
+        // Check if the file contains the appropriate data
+        let file = try! String(contentsOf: destination, encoding: .utf8)
+        XCTAssertTrue(file.contains("; zend_extension=\"xdebug.so\""))
+        
+        // Make sure if we load the data again, it's disabled
+        XCTAssertEqual(PhpExtension.load(from: destination).first!.enabled, false)
+    }
+
+}

phpmon-tests/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

phpmon-tests/PhpVersionDetectionTest.swift

@@ -0,0 +1,30 @@
+//
+//  PhpVersionDetectionTest.swift
+//  phpmon-tests
+//
+//  Created by Nico Verbruggen on 01/04/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import XCTest
+
+class PhpVersionDetectionTest: XCTestCase {
+
+    func testCanDetectValidPhpVersions() throws {
+        let outcome = Actions.extractPhpVersions(from: [
+            "", // empty lines should be omitted
+            "php@8.0",
+            "php@8.0", // should only be detected once
+            "meta-php@8.0", // should be omitted, invalid
+            "php@8.0-coolio", // should be omitted, invalid
+            "php@7.0",
+            "",
+            "unrelatedphp@1.0", // should be omitted, invalid
+            "php@5.6",
+            "php@5.4" // should be omitted, not supported
+        ], checkBinaries: false)
+        
+        XCTAssertEqual(outcome, ["8.0", "7.0", "5.6"])
+    }
+
+}

phpmon-tests/Utility.swift

@@ -0,0 +1,28 @@
+//
+//  Utility.swift
+//  phpmon-tests
+//
+//  Created by Nico Verbruggen on 14/02/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class Utility {
+    
+    public static func copyToTemporaryFile(resourceName: String, fileExtension: String) -> URL? {
+        if let bundleURL = Bundle(for: Self.self).url(forResource: resourceName, withExtension: fileExtension) {
+            let tempDirectoryURL = NSURL.fileURL(withPath: NSTemporaryDirectory(), isDirectory: true)
+            let targetURL = tempDirectoryURL.appendingPathComponent("\(UUID().uuidString).\(fileExtension)")
+            
+            do {
+                try FileManager.default.copyItem(at: bundleURL, to: targetURL)
+                return targetURL
+            } catch let error {
+                print("Unable to copy file: \(error)")
+            }
+        }
+        
+        return nil
+    }
+}

phpmon-tests/ValetConfigParserTest.swift

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

phpmon-tests/ValetTest.swift

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

phpmon-tests/VersionExtractorTest.swift

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

phpmon-tests/brew.json

@@ -0,0 +1,332 @@
+[
+    {
+        "name":"php",
+        "full_name":"php",
+        "tap":"homebrew/core",
+        "oldname":null,
+        "aliases":[
+            "php@8.0"
+        ],
+        "versioned_formulae":[
+            "php@7.4",
+            "php@7.3",
+            "php@7.2"
+        ],
+        "desc":"General-purpose scripting language",
+        "license":"PHP-3.01",
+        "homepage":"https://www.php.net/",
+        "versions":{
+            "stable":"8.0.2",
+            "head":"HEAD",
+            "bottle":true
+        },
+        "urls":{
+            "stable":{
+                "url":"https://www.php.net/distributions/php-8.0.2.tar.xz",
+                "tag":null,
+                "revision":null
+            }
+        },
+        "revision":0,
+        "version_scheme":0,
+        "bottle":{
+            "stable":{
+                "rebuild":0,
+                "cellar":"/opt/homebrew/Cellar",
+                "prefix":"/opt/homebrew",
+                "root_url":"https://homebrew.bintray.com/bottles",
+                "files":{
+                    "arm64_big_sur":{
+                        "url":"https://homebrew.bintray.com/bottles/php-8.0.2.arm64_big_sur.bottle.tar.gz",
+                        "sha256":"cbefa1db73d08b9af4593a44512b8d727e43033ee8517736bae5f16315501b12"
+                    },
+                    "big_sur":{
+                        "url":"https://homebrew.bintray.com/bottles/php-8.0.2.big_sur.bottle.tar.gz",
+                        "sha256":"6857142e12254b15da4e74c2986dd24faca57dac8d467b04621db349e277dd63"
+                    },
+                    "catalina":{
+                        "url":"https://homebrew.bintray.com/bottles/php-8.0.2.catalina.bottle.tar.gz",
+                        "sha256":"b651611134c18f93fdf121a4277b51b197a896a19ccb8020289b4e19e0638349"
+                    },
+                    "mojave":{
+                        "url":"https://homebrew.bintray.com/bottles/php-8.0.2.mojave.bottle.tar.gz",
+                        "sha256":"9583a51fcc6f804aadbb14e18f770d4fb4973deaed6ddc4770342e62974ffbca"
+                    }
+                }
+            }
+        },
+        "keg_only":false,
+        "bottle_disabled":false,
+        "options":[
+            
+        ],
+        "build_dependencies":[
+            "httpd",
+            "pkg-config"
+        ],
+        "dependencies":[
+            "apr",
+            "apr-util",
+            "argon2",
+            "aspell",
+            "autoconf",
+            "curl",
+            "freetds",
+            "gd",
+            "gettext",
+            "glib",
+            "gmp",
+            "icu4c",
+            "krb5",
+            "libffi",
+            "libpq",
+            "libsodium",
+            "libzip",
+            "oniguruma",
+            "openldap",
+            "openssl@1.1",
+            "pcre2",
+            "sqlite",
+            "tidy-html5",
+            "unixodbc"
+        ],
+        "recommended_dependencies":[
+            
+        ],
+        "optional_dependencies":[
+            
+        ],
+        "uses_from_macos":[
+            {
+                "xz":"build"
+            },
+            "bzip2",
+            "libedit",
+            "libxml2",
+            "libxslt",
+            "zlib"
+        ],
+        "requirements":[
+            
+        ],
+        "conflicts_with":[
+            
+        ],
+        "caveats":"To enable PHP in Apache add the following to httpd.conf and restart Apache:\n    LoadModule php_module $(brew --prefix)/opt/php/lib/httpd/modules/libphp.so\n\n    <FilesMatch \\.php$>\n        SetHandler application/x-httpd-php\n    </FilesMatch>\n\nFinally, check DirectoryIndex includes index.php\n    DirectoryIndex index.php index.html\n\nThe php.ini and php-fpm.ini file can be found in:\n    $(brew --prefix)/etc/php/8.0/\n",
+        "installed":[
+            {
+                "version":"8.0.2",
+                "used_options":[
+                    
+                ],
+                "built_as_bottle":true,
+                "poured_from_bottle":true,
+                "runtime_dependencies":[
+                    {
+                        "full_name":"apr",
+                        "version":"1.7.0"
+                    },
+                    {
+                        "full_name":"openssl@1.1",
+                        "version":"1.1.1i"
+                    },
+                    {
+                        "full_name":"apr-util",
+                        "version":"1.6.1"
+                    },
+                    {
+                        "full_name":"argon2",
+                        "version":"20190702"
+                    },
+                    {
+                        "full_name":"aspell",
+                        "version":"0.60.8"
+                    },
+                    {
+                        "full_name":"autoconf",
+                        "version":"2.69"
+                    },
+                    {
+                        "full_name":"brotli",
+                        "version":"1.0.9"
+                    },
+                    {
+                        "full_name":"gettext",
+                        "version":"0.21"
+                    },
+                    {
+                        "full_name":"libunistring",
+                        "version":"0.9.10"
+                    },
+                    {
+                        "full_name":"libidn2",
+                        "version":"2.3.0"
+                    },
+                    {
+                        "full_name":"libmetalink",
+                        "version":"0.1.3"
+                    },
+                    {
+                        "full_name":"libssh2",
+                        "version":"1.9.0"
+                    },
+                    {
+                        "full_name":"c-ares",
+                        "version":"1.17.1"
+                    },
+                    {
+                        "full_name":"jemalloc",
+                        "version":"5.2.1"
+                    },
+                    {
+                        "full_name":"libev",
+                        "version":"4.33"
+                    },
+                    {
+                        "full_name":"nghttp2",
+                        "version":"1.43.0"
+                    },
+                    {
+                        "full_name":"openldap",
+                        "version":"2.4.57"
+                    },
+                    {
+                        "full_name":"rtmpdump",
+                        "version":"2.4+20151223"
+                    },
+                    {
+                        "full_name":"zstd",
+                        "version":"1.4.8"
+                    },
+                    {
+                        "full_name":"curl",
+                        "version":"7.75.0"
+                    },
+                    {
+                        "full_name":"libtool",
+                        "version":"2.4.6"
+                    },
+                    {
+                        "full_name":"unixodbc",
+                        "version":"2.3.9"
+                    },
+                    {
+                        "full_name":"freetds",
+                        "version":"1.2.18"
+                    },
+                    {
+                        "full_name":"libpng",
+                        "version":"1.6.37"
+                    },
+                    {
+                        "full_name":"freetype",
+                        "version":"2.10.4"
+                    },
+                    {
+                        "full_name":"fontconfig",
+                        "version":"2.13.1"
+                    },
+                    {
+                        "full_name":"jpeg",
+                        "version":"9d"
+                    },
+                    {
+                        "full_name":"libtiff",
+                        "version":"4.2.0"
+                    },
+                    {
+                        "full_name":"webp",
+                        "version":"1.2.0"
+                    },
+                    {
+                        "full_name":"gd",
+                        "version":"2.3.1"
+                    },
+                    {
+                        "full_name":"libffi",
+                        "version":"3.3"
+                    },
+                    {
+                        "full_name":"pcre",
+                        "version":"8.44"
+                    },
+                    {
+                        "full_name":"gdbm",
+                        "version":"1.18.1"
+                    },
+                    {
+                        "full_name":"readline",
+                        "version":"8.1"
+                    },
+                    {
+                        "full_name":"sqlite",
+                        "version":"3.34.0"
+                    },
+                    {
+                        "full_name":"tcl-tk",
+                        "version":"8.6.11"
+                    },
+                    {
+                        "full_name":"xz",
+                        "version":"5.2.5"
+                    },
+                    {
+                        "full_name":"python@3.9",
+                        "version":"3.9.1"
+                    },
+                    {
+                        "full_name":"glib",
+                        "version":"2.66.6"
+                    },
+                    {
+                        "full_name":"gmp",
+                        "version":"6.2.1"
+                    },
+                    {
+                        "full_name":"icu4c",
+                        "version":"67.1"
+                    },
+                    {
+                        "full_name":"krb5",
+                        "version":"1.19"
+                    },
+                    {
+                        "full_name":"libpq",
+                        "version":"13.1"
+                    },
+                    {
+                        "full_name":"libsodium",
+                        "version":"1.0.18"
+                    },
+                    {
+                        "full_name":"libzip",
+                        "version":"1.7.3"
+                    },
+                    {
+                        "full_name":"oniguruma",
+                        "version":"6.9.6"
+                    },
+                    {
+                        "full_name":"pcre2",
+                        "version":"10.36"
+                    },
+                    {
+                        "full_name":"tidy-html5",
+                        "version":"5.6.0"
+                    }
+                ],
+                "installed_as_dependency":false,
+                "installed_on_request":true
+            }
+        ],
+        "linked_keg":"8.0.2",
+        "pinned":false,
+        "outdated":false,
+        "deprecated":false,
+        "deprecation_date":null,
+        "deprecation_reason":null,
+        "disabled":false,
+        "disable_date":null,
+        "disable_reason":null
+    }
+]

phpmon-tests/valet-config.json

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

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

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

phpmon/Assets.xcassets/Contents.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

phpmon/Constants.swift

@@ -9,11 +9,31 @@ import Cocoa
 
 class Constants {
     
+    /**
+     * The latest PHP version that is considered to be stable at the time of release.
+     * This version number is currently not used (only as a default fallback).
+     */
+    static let LatestStablePhpVersion = "8.1"
+    
+    /**
+     The minimum version of Valet that is recommended.
+     If the installed version is older, a notification will be shown
+     every time the app launches (with a recommendation to upgrade).
+     
+     The minimum requirement is currently synced to PHP 8.1 compatibility.
+     See also: https://github.com/laravel/valet/releases/tag/v2.16.2
+     */
+    static let MinimumRecommendedValetVersion = "2.16.2"
+    
     /**
      * The PHP versions supported by this application.
      * Versions that do not appear in this array are omitted from the list.
      */
     static let SupportedPhpVersions = [
+        // ====================
+        // STABLE RELEASES
+        // ====================
+        // Versions of PHP that are stable and are supported.
         "5.6",
         "7.0",
         "7.1",
@@ -21,7 +41,14 @@ class Constants {
         "7.3",
         "7.4",
         "8.0",
-        "8.1"
+        "8.1",
+        
+        // ====================
+        // EXPERIMENTAL SUPPORT
+        // ====================
+        // Every release that supports the next release will always support the next
+        // dev release. In this case, that means that the version below is detected.
+        "8.2"
     ]
-    
+
 }

phpmon/Credits.html

@@ -0,0 +1,22 @@
+<html>
+    <head>
+        <style>
+            body {
+                background-color: #FFF;
+                color: #000;
+                font-family: -apple-system;
+                font-size: 11px;
+                padding: 5px;
+                margin: 5px;
+            }
+        </style>
+    </head>
+    <body>
+        <br>
+        <p><b>Want to spread the love?</b> Leave a <a href="https://github.com/nicoverbruggen/phpmon">star on GitHub</a>!</p>
+        <p><b>Having issues?</b> Consult the <a href="https://github.com/nicoverbruggen/phpmon#%EF%B8%8F-faq--troubleshooting">FAQ & Troubleshooting</a> section.</p>
+        <p><b>Want to support me?</b> You can <a href="https://nicoverbruggen.be/sponsor">financially support</a> the continued development of this app.</p>
+        <br>
+    </body>
+</html>
+

phpmon/Domain/Commands/Actions.swift

@@ -1,157 +0,0 @@
-//
-//  Services.swift
-//  PHP Monitor
-//
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-import AppKit
-
-class Actions {
-    
-    // MARK: - Detect PHP Versions
-    
-    public static func detectPhpVersions() -> [String]
-    {
-        let files = Shell.pipe("ls \(Paths.optPath) | grep php@")
-        var versions = files.components(separatedBy: "\n")
-        
-        // Remove all empty strings
-        versions.removeAll { (string) -> Bool in
-            return (string == "")
-        }
-        
-        // Get a list of versions only
-        var versionsOnly : [String] = []
-        versions.forEach { (string) in
-            versionsOnly.append(string.components(separatedBy: "php@")[1])
-        }
-        
-        // Make sure the aliased version is detected
-        // The user may have `php` installed, but not e.g. `php@8.0`
-        // We should also detect that as a version that is installed
-        let phpAlias = App.shared.brewPhpVersion
-        
-        if (!versionsOnly.contains(phpAlias)) {
-            versionsOnly.append(phpAlias);
-        }
-        
-        return versionsOnly
-    }
-    
-    // MARK: - Services
-    
-    public static func restartPhpFpm()
-    {
-        brew("services restart \(App.phpInstall!.formula)", sudo: true)
-    }
-    
-    public static func restartNginx()
-    {
-        brew("services restart nginx", sudo: true)
-    }
-    
-    public static func restartDnsMasq()
-    {
-        brew("services restart dnsmasq", sudo: true)
-    }
-    
-    /**
-     Switching to a new PHP version involves:
-     - unlinking the current version
-     - stopping the active services
-     - linking the new desired version
-     
-     Please note that depending on which version is installed,
-     the version that is switched to may or may not be identical to `php` (without @version).
-     */
-    public static func switchToPhpVersion(version: String, availableVersions: [String])
-    {
-        availableVersions.forEach { (available) in
-            let formula = (available == App.shared.brewPhpVersion) ? "php" : "php@\(available)"
-            brew("unlink \(formula)")
-            brew("services stop \(formula)", sudo: true)
-        }
-        
-        let formula = (version == App.shared.brewPhpVersion) ? "php" : "php@\(version)"
-        brew("link \(formula) --overwrite --force")
-        brew("services start \(formula)", sudo: true)
-    }
-    
-    // MARK: - Finding Config Files
-    
-    public static func openGenericPhpConfigFolder()
-    {
-        let files = [NSURL(fileURLWithPath: "\(Paths.etcPath)/php")];
-        NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
-    }
-    
-    public static func openPhpConfigFolder(version: String)
-    {
-        let files = [NSURL(fileURLWithPath: "\(Paths.etcPath)/php/\(version)/php.ini")];
-        NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
-    }
-    
-    public static func openValetConfigFolder()
-    {
-        let files = [NSURL(fileURLWithPath: NSString(string: "~/.config/valet").expandingTildeInPath)];
-        NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
-    }
-    
-    // MARK: - Quick Fix
-    
-    /**
-     Detects all currently available PHP versions, and unlinks each and every one of them.
-     After this, the brew services are also stopped, the latest PHP version is linked, and php + nginx are restarted.
-     If this does not solve the issue, the user may need to install additional extensions and/or run `composer global update`.
-     */
-    public static func fixMyPhp()
-    {
-        brew("services restart dnsmasq", sudo: true)
-        
-        self.detectPhpVersions().forEach { (version) in
-            let formula = (version == App.shared.brewPhpVersion) ? "php" : "php@\(version)"
-            brew("unlink php@\(version)")
-            brew("services stop \(formula)")
-            brew("services stop \(formula)", sudo: true)
-        }
-        
-        brew("services stop php")
-        brew("services stop nginx")
-        brew("link php")
-        brew("services restart dnsmasq", sudo: true)
-        brew("services stop php", sudo: true)
-        brew("services stop nginx", sudo: true)
-    }
-    
-    // MARK: Common Shell Commands
-    
-    /**
-     Runs a `brew` command. Can run as superuser.
-     */
-    public static func brew(_ command: String, sudo: Bool = false)
-    {
-        Shell.run("\(sudo ? "sudo " : "")" + "\(Paths.brew) \(command)")
-    }
-    
-    /**
-     Runs `sed` in order to replace all occurrences of a string in a specific file with another.
-     */
-    public static func sed(file: String, original: String, replacement: String)
-    {
-        Shell.run("sed -i '' 's/\(original)/\(replacement)/g' \(file)")
-    }
-    
-    /**
-     Uses `grep` to determine whether a particular query string can be found in a particular file.
-     */
-    public static func grepContains(file: String, query: String) -> Bool
-    {
-        return Shell.pipe("""
-            grep -q '\(query)' \(file); [ $? -eq 0 ] && echo "YES" || echo "NO"
-            """)
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .contains("YES")
-    }
-}

phpmon/Domain/Core/Actions.swift

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

phpmon/Domain/Core/App+ActivationPolicy.swift

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

phpmon/Domain/Core/App+GlobalHotkey.swift

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

phpmon/Domain/Core/App.swift

@@ -0,0 +1,105 @@
+//
+//  StateManager.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+import HotKey
+
+class App {
+    
+    // MARK: Static Vars
+    
+    /** The static app instance. Accessible at any time. */
+    static let shared = App()
+    
+    /** Retrieve the version number from the main info dictionary, Info.plist. */
+    static var version: String {
+        let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
+        let build = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
+        return "\(version) (\(build))"
+    }
+    
+    /** Information about the currently linked PHP installation. */
+    static var phpInstall: ActivePhpInstallation? {
+        return App.shared.currentInstall
+    }
+    
+    /** Whether the app is busy doing something. Used to determine what UI to display. */
+    static var busy: Bool {
+        return App.shared.busy
+    }
+    
+    // MARK: Variables
+    
+    /** The list of preferences that are currently active. */
+    var preferences: [PreferenceName: Bool]!
+    
+    /** The window controller of the currently active preferences window. */
+    var preferencesWindowController: PrefsWC? = nil
+    
+    /** The window controller of the currently active site list window. */
+    var siteListWindowController: SiteListWC? = nil
+    
+    /** Whether the application is busy switching versions. */
+    var busy: Bool = false
+    
+    /** The currently active installation of PHP. */
+    var currentInstall: ActivePhpInstallation? = nil
+    
+    /** All available versions of PHP. */
+    var availablePhpVersions: [String] = []
+    
+    /** Cached information about the PHP installations. */
+    var cachedPhpInstallations: [String: PhpInstallation] = [:]
+    
+    /** List of detected (installed) applications that PHP Monitor can work with. */
+    var detectedApplications: [Application] = []
+    
+    /** Timer that will periodically reload info about the user's PHP installation. */
+    var timer: Timer?
+    
+    /** Information we were able to discern from the Homebrew info command (as JSON). */
+    var brewPhpPackage: HomebrewPackage! = nil {
+        didSet {
+            brewPhpVersion = brewPhpPackage!.version
+        }
+    }
+    
+    /**
+     The version that the `php` formula via Brew is aliased to on the current system.
+     
+     If you're up to date, `php` will be aliased to the latest version,
+     but that might not be the case.
+     
+     We'll technically default to the version in Constants.swift, but the information
+     should always be loaded from Homebrew itself upon startup.
+     */
+    var brewPhpVersion: String = Constants.LatestStablePhpVersion
+    
+    // MARK: - Global Hotkey
+    
+    /**
+     The shortcut the user has requested.
+     */
+    var shortcutHotkey: HotKey? = nil {
+        didSet {
+            setupGlobalHotkeyListener()
+        }
+    }
+    
+    // MARK: - Activation Policy
+    
+    /**
+     Variable that keeps track of which windows are currently open.
+     (Please note that window controllers remain open in memory once opened.)
+     
+     When this list is updated, the app activation policy is re-evaluated.
+     The app activation policy dictates how the app runs
+     (as a normal app or as a toolbar app).
+     */
+    var openWindows: [String] = []
+    
+}

phpmon/Domain/Core/AppDelegate+MenuOutlets.swift

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

phpmon/Domain/Core/AppDelegate+Notifications.swift

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

phpmon/Domain/Core/AppDelegate.swift

@@ -9,7 +9,7 @@ import Cocoa
 import UserNotifications
 
 @NSApplicationMain
-class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDelegate {
+class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDelegate {
     
     // MARK: - Variables
     
@@ -18,25 +18,31 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
      (invoked by PHP Monitor) shell commands. It is used to
      invoke all commands in this application.
      */
-    let sharedShell : Shell
+    let sharedShell: Shell
     
     /**
      The App singleton contains information about the state of
      the application and global variables.
      */
-    let state : App
+    let state: App
     
     /**
      The MainMenu singleton is responsible for rendering the
      menu bar item and its menu, as well as its actions.
      */
-    let menu : MainMenu
+    let menu: MainMenu
     
     /**
      The paths singleton that determines where Homebrew is installed,
      and where to look for binaries.
      */
-    let paths : Paths
+    let paths: Paths
+    
+    /**
+     The Valet singleton that determines all information
+     about Valet and its current configuration.
+     */
+    let valet: Valet
     
     // MARK: - Initializer
     
@@ -44,10 +50,15 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
      When the application initializes, create all singletons.
      */
     override init() {
+        print("==================================")
+        print("PHP MONITOR by Nico Verbruggen")
+        print("Version \(App.version)")
+        print("==================================")
         self.sharedShell = Shell.user
         self.state = App.shared
         self.menu = MainMenu.shared
         self.paths = Paths.shared
+        self.valet = Valet.shared
         super.init()
     }
     
@@ -55,26 +66,14 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
     
     /**
      When the application has finished launching, we'll want to set up
-     the user notification center delegate, and kickoff the menu
+     the user notification center permissions, and kickoff the menu
      startup procedure.
      */
     func applicationDidFinishLaunching(_ aNotification: Notification) {
-        NSUserNotificationCenter.default.delegate = self
-        self.menu.startup()
+        // Make sure notifications will work
+        setupNotifications()
+        // Make sure the menu performs its initial checks
+        menu.startup()
     }
     
-    // MARK: - NSUserNotificationCenterDelegate
-    
-    /**
-     When a notification is sent, the delegate of the notification center
-     is asked whether the notification should be presented or not. Since
-     the user can now disable notifications per application since macOS
-     Catalina, any and all notifications should be displayed.
-     */
-    func userNotificationCenter(
-        _ center: NSUserNotificationCenter,
-        shouldPresent notification: NSUserNotification
-    ) -> Bool {
-        return true
-    }
 }

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

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
+        <capability name="Image references" minToolsVersion="12.0"/>
+        <capability name="Search Toolbar Item" minToolsVersion="12.0" minSystemVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -30,6 +33,249 @@
                                     </items>
                                 </menu>
                             </menuItem>
+                            <menuItem title="File" id="XRy-v5-KNb">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="File" id="zA7-mh-f1x">
+                                    <items>
+                                        <menuItem title="Close" keyEquivalent="w" id="2FI-pQ-tuO">
+                                            <connections>
+                                                <action selector="performClose:" target="Ady-hI-5gd" id="ZHq-so-Sba"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Sites" id="9gy-d3-Pos">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Sites" id="YTZ-bb-TOG">
+                                    <items>
+                                        <menuItem title="Reload Site List" keyEquivalent="r" id="Ema-AU-Nbr">
+                                            <connections>
+                                                <action selector="reloadSiteListPressed:" target="Voe-Tx-rLC" id="geC-Ld-haX"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Edit" id="r2Z-pR-umI">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Edit" id="8Pm-83-BlM">
+                                    <items>
+                                        <menuItem title="Undo" keyEquivalent="z" id="jCt-Yf-FSE">
+                                            <connections>
+                                                <action selector="undo:" target="Ady-hI-5gd" id="O3z-27-Ug0"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Redo" keyEquivalent="Z" id="fCh-1M-Qyg">
+                                            <connections>
+                                                <action selector="redo:" target="Ady-hI-5gd" id="utE-Bv-fdY"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="7Ja-wX-Yyy"/>
+                                        <menuItem title="Cut" keyEquivalent="x" id="wud-nd-1nZ">
+                                            <connections>
+                                                <action selector="cut:" target="Ady-hI-5gd" id="C3e-e7-Z50"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Copy" keyEquivalent="c" id="V42-o1-WHL">
+                                            <connections>
+                                                <action selector="copy:" target="Ady-hI-5gd" id="ec3-KB-YgV"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste" keyEquivalent="v" id="aBF-dz-Blf">
+                                            <connections>
+                                                <action selector="paste:" target="Ady-hI-5gd" id="BHd-PO-XsH"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste and Match Style" keyEquivalent="V" id="EgA-GE-99p">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteAsPlainText:" target="Ady-hI-5gd" id="ls4-pp-hcL"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Delete" id="smI-vK-hCc">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="delete:" target="Ady-hI-5gd" id="iNe-gC-rFo"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Select All" keyEquivalent="a" id="29b-s6-UmK">
+                                            <connections>
+                                                <action selector="selectAll:" target="Ady-hI-5gd" id="b6J-NN-IIc"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="uFh-RS-XNP"/>
+                                        <menuItem title="Find" id="Dvh-pB-nbE">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Find" id="QlO-5L-pAZ">
+                                                <items>
+                                                    <menuItem title="Find…" tag="1" keyEquivalent="f" id="m08-yq-ZGg">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="W9P-aN-Jes"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="pjr-Fe-SEl">
+                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="XVP-he-TQd"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Find Next" tag="2" keyEquivalent="g" id="Zpc-8S-9bB">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="oRy-fc-1aa"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="GDM-nF-rG0">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="x6a-fg-4qv"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="6fa-55-D8I">
+                                                        <connections>
+                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="EGI-VW-wxB"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Jump to Selection" keyEquivalent="j" id="H8e-pj-DLt">
+                                                        <connections>
+                                                            <action selector="centerSelectionInVisibleArea:" target="Ady-hI-5gd" id="oI9-dt-1tg"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Spelling and Grammar" id="RMo-NJ-dGJ">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Spelling" id="4PN-Vd-GBg">
+                                                <items>
+                                                    <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="2c8-04-pLg">
+                                                        <connections>
+                                                            <action selector="showGuessPanel:" target="Ady-hI-5gd" id="hyy-YK-6Bw"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Check Document Now" keyEquivalent=";" id="ZBj-z6-5YX">
+                                                        <connections>
+                                                            <action selector="checkSpelling:" target="Ady-hI-5gd" id="21B-wo-C7b"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="APF-Br-Trc"/>
+                                                    <menuItem title="Check Spelling While Typing" id="knZ-NA-0Jb">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleContinuousSpellChecking:" target="Ady-hI-5gd" id="32z-g2-SCz"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Check Grammar With Spelling" id="v6M-1d-el3">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleGrammarChecking:" target="Ady-hI-5gd" id="1YL-19-eUI"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Correct Spelling Automatically" id="qg8-Mm-AiQ">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticSpellingCorrection:" target="Ady-hI-5gd" id="zdy-r0-ioM"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Substitutions" id="SW4-hB-QOQ">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Substitutions" id="EmO-8n-AsV">
+                                                <items>
+                                                    <menuItem title="Show Substitutions" id="rvM-Vq-p0Y">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="orderFrontSubstitutionsPanel:" target="Ady-hI-5gd" id="SjT-fP-U8q"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="TTo-oL-4Pj"/>
+                                                    <menuItem title="Smart Copy/Paste" id="op9-oC-x65">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleSmartInsertDelete:" target="Ady-hI-5gd" id="82G-c7-eEX"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Smart Quotes" id="Sg4-Dr-IyH">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticQuoteSubstitution:" target="Ady-hI-5gd" id="tf9-2j-dbm"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Smart Dashes" id="Uop-B5-hKQ">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticDashSubstitution:" target="Ady-hI-5gd" id="2jO-5h-PhN"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Smart Links" id="G9f-Tv-imo">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticLinkDetection:" target="Ady-hI-5gd" id="ryX-Py-Jan"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Data Detectors" id="9sq-LY-oWc">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticDataDetection:" target="Ady-hI-5gd" id="ps3-Vn-32V"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Text Replacement" id="AQ0-Wh-nkQ">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="toggleAutomaticTextReplacement:" target="Ady-hI-5gd" id="nEj-vL-yg2"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Transformations" id="BLU-2S-dqL">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Transformations" id="lFI-Ry-XFg">
+                                                <items>
+                                                    <menuItem title="Make Upper Case" id="bx6-aZ-THy">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="uppercaseWord:" target="Ady-hI-5gd" id="tyN-SK-Cgt"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Make Lower Case" id="Ks8-z7-N7j">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="lowercaseWord:" target="Ady-hI-5gd" id="0fo-Fo-xfq"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Capitalize" id="Lv4-Up-dyv">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="capitalizeWord:" target="Ady-hI-5gd" id="Bqs-0x-WzX"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Speech" id="cTl-lQ-Mg9">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Speech" id="4c5-we-5Vo">
+                                                <items>
+                                                    <menuItem title="Start Speaking" id="YPC-zf-2Xh">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="startSpeaking:" target="Ady-hI-5gd" id="VRy-Kb-4cG"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Stop Speaking" id="4YM-9V-tLE">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="stopSpeaking:" target="Ady-hI-5gd" id="KHB-GE-En3"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
                             <menuItem title="Help" id="wpr-3q-Mcd">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
@@ -48,11 +294,318 @@
                         <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
                     </connections>
                 </application>
-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="PHP_Monitor" customModuleProvider="target"/>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="PHP_Monitor" customModuleProvider="target"/>
             </objects>
-            <point key="canvasLocation" x="-343" y="-16"/>
+            <point key="canvasLocation" x="-484" y="32"/>
+        </scene>
+        <!--Window Controller-->
+        <scene sceneID="PQa-AT-b2a">
+            <objects>
+                <windowController storyboardIdentifier="preferencesWindow" showSeguePresentationStyle="single" id="hLJ-Fd-wRr" customClass="PrefsWC" customModule="PHP_Monitor" customModuleProvider="target" sceneMemberID="viewController">
+                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="h4c-3b-nko">
+                        <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+                        <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+                        <rect key="contentRect" x="372" y="403" width="480" height="270"/>
+                        <rect key="screenRect" x="0.0" y="0.0" width="2304" height="1271"/>
+                        <view key="contentView" id="2yL-50-11x">
+                            <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </view>
+                        <toolbar key="toolbar" implicitIdentifier="611E3485-DC7F-46A0-8528-11CF9366370C" autosavesConfiguration="NO" allowsUserCustomization="NO" showsBaselineSeparator="NO" displayMode="iconAndLabel" sizeMode="regular" id="fcq-wR-7iv">
+                            <allowedToolbarItems/>
+                            <defaultToolbarItems/>
+                        </toolbar>
+                        <connections>
+                            <outlet property="delegate" destination="hLJ-Fd-wRr" id="6HE-8Y-aCO"/>
+                        </connections>
+                    </window>
+                    <connections>
+                        <segue destination="AW2-rV-rbS" kind="relationship" relationship="window.shadowedContentViewController" id="3dX-9V-eA0"/>
+                    </connections>
+                </windowController>
+                <customObject id="OF0-qs-3Oh" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-374" y="327"/>
+        </scene>
+        <!--Preferences-->
+        <scene sceneID="iyi-IS-7Ps">
+            <objects>
+                <viewController title="Preferences" storyboardIdentifier="preferences" showSeguePresentationStyle="single" id="AW2-rV-rbS" customClass="PrefsVC" customModule="PHP_Monitor" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" wantsLayer="YES" id="Pf1-A5-3Xz">
+                        <rect key="frame" x="0.0" y="0.0" width="574" height="498"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <stackView distribution="fillEqually" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k57-O3-Yyj">
+                                <rect key="frame" x="0.0" y="15" width="574" height="468"/>
+                            </stackView>
+                        </subviews>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="k57-O3-Yyj" secondAttribute="bottom" constant="15" id="ECF-1q-1zc"/>
+                            <constraint firstItem="k57-O3-Yyj" firstAttribute="top" secondItem="Pf1-A5-3Xz" secondAttribute="top" constant="15" id="HwH-HC-MSf"/>
+                            <constraint firstAttribute="trailing" secondItem="k57-O3-Yyj" secondAttribute="trailing" id="M7l-W4-EDv"/>
+                            <constraint firstItem="k57-O3-Yyj" firstAttribute="leading" secondItem="Pf1-A5-3Xz" secondAttribute="leading" id="ctd-MO-fe1"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="stackView" destination="k57-O3-Yyj" id="fF8-8n-bc9"/>
+                    </connections>
+                </viewController>
+                <customObject id="eQC-8B-FkX" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="251" y="205"/>
+        </scene>
+        <!--Window Controller-->
+        <scene sceneID="4XS-kY-YIS">
+            <objects>
+                <windowController storyboardIdentifier="siteListWindow" id="8Ec-9q-82s" customClass="SiteListWC" customModule="PHP_Monitor" customModuleProvider="target" sceneMemberID="viewController">
+                    <window key="window" title="Domains" subtitle="Linked &amp; Parked" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="raw-02-3Q1">
+                        <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+                        <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+                        <rect key="contentRect" x="425" y="461" width="550" height="263"/>
+                        <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+                        <view key="contentView" id="uVx-Da-x4I">
+                            <rect key="frame" x="0.0" y="0.0" width="550" height="263"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </view>
+                        <toolbar key="toolbar" implicitIdentifier="594015E3-8428-4926-9341-4B8CE4C7E373" autosavesConfiguration="NO" allowsUserCustomization="NO" showsBaselineSeparator="NO" displayMode="iconOnly" sizeMode="regular" id="OOz-oZ-vlN">
+                            <allowedToolbarItems>
+                                <toolbarItem implicitItemIdentifier="B734CDE2-70E9-45A8-B1B3-5A5DE156621D" label="Reload" paletteLabel="Reload" tag="-1" bordered="YES" sizingBehavior="auto" id="YtK-vM-5y7">
+                                    <imageReference key="image" image="arrow.clockwise" catalog="system" symbolScale="medium"/>
+                                    <connections>
+                                        <action selector="pressedReload:" target="8Ec-9q-82s" id="fLc-bD-oYQ"/>
+                                    </connections>
+                                </toolbarItem>
+                                <searchToolbarItem implicitItemIdentifier="629F0782-3C5F-4CD0-9396-3A054A422180" label="Search" paletteLabel="Search" visibilityPriority="1001" id="Q7Z-fw-lB9">
+                                    <nil key="toolTip"/>
+                                    <searchField key="view" verticalHuggingPriority="750" textCompletion="NO" id="oWA-TH-Pm7">
+                                        <rect key="frame" x="0.0" y="0.0" width="100" height="21"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" sendsSearchStringImmediately="YES" id="3NO-6x-aLc">
+                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </searchFieldCell>
+                                    </searchField>
+                                </searchToolbarItem>
+                            </allowedToolbarItems>
+                            <defaultToolbarItems>
+                                <toolbarItem reference="YtK-vM-5y7"/>
+                                <searchToolbarItem reference="Q7Z-fw-lB9"/>
+                            </defaultToolbarItems>
+                        </toolbar>
+                        <connections>
+                            <outlet property="delegate" destination="8Ec-9q-82s" id="xEM-aj-eHL"/>
+                        </connections>
+                    </window>
+                    <connections>
+                        <outlet property="searchToolbarItem" destination="Q7Z-fw-lB9" id="J5o-oh-VhO"/>
+                        <segue destination="JZI-Vd-9oq" kind="relationship" relationship="window.shadowedContentViewController" id="9Gy-Gw-hPH"/>
+                    </connections>
+                </windowController>
+                <customObject id="VCP-dF-cqM" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-374" y="773.5"/>
+        </scene>
+        <!--Site ListVC-->
+        <scene sceneID="aZt-6w-TFl">
+            <objects>
+                <viewController storyboardIdentifier="siteList" id="JZI-Vd-9oq" customClass="SiteListVC" customModule="PHP_Monitor" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" id="rIZ-4U-bhj">
+                        <rect key="frame" x="0.0" y="0.0" width="550" height="309"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <scrollView autohidesScrollers="YES" horizontalLineScroll="54" horizontalPageScroll="10" verticalLineScroll="54" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p0j-eB-I2i">
+                                <rect key="frame" x="0.0" y="0.0" width="550" height="309"/>
+                                <clipView key="contentView" id="6IL-DW-37w">
+                                    <rect key="frame" x="1" y="1" width="548" height="307"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="54" rowSizeStyle="automatic" viewBased="YES" id="cp3-34-pQj">
+                                            <rect key="frame" x="0.0" y="0.0" width="548" height="307"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            <size key="intercellSpacing" width="17" height="0.0"/>
+                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                            <tableColumns>
+                                                <tableColumn width="536" minWidth="40" maxWidth="10000" id="oeH-B2-0rA">
+                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
+                                                        <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                                    </tableHeaderCell>
+                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="Ith-sv-3bo">
+                                                        <font key="font" metaFont="system"/>
+                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                    <prototypeCellViews>
+                                                        <tableCellView identifier="siteItem" wantsLayer="YES" id="5GY-nN-BWd" customClass="SiteListCell" customModule="PHP_Monitor" customModuleProvider="target">
+                                                            <rect key="frame" x="8" y="0.0" width="531" height="54"/>
+                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                            <subviews>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="XJL-Uw-frD">
+                                                                    <rect key="frame" x="38" y="26" width="145" height="16"/>
+                                                                    <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="my-domain-name.test" id="SGC-Gm-Mxd">
+                                                                        <font key="font" metaFont="systemSemibold" size="13"/>
+                                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                    </textFieldCell>
+                                                                </textField>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="CXK-Q9-CpO">
+                                                                    <rect key="frame" x="38" y="12" width="75" height="14"/>
+                                                                    <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="~/path/to/site" id="fe7-Ha-mR9">
+                                                                        <font key="font" metaFont="smallSystem"/>
+                                                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                    </textFieldCell>
+                                                                </textField>
+                                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QPX-eu-eV8">
+                                                                    <rect key="frame" x="10" y="22" width="20" height="20"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="20" id="Bmk-CN-Yyn"/>
+                                                                        <constraint firstAttribute="height" constant="20" id="d4z-lb-Ww0"/>
+                                                                    </constraints>
+                                                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Lock" id="aJ0-ia-YrZ"/>
+                                                                </imageView>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jKi-Ls-7FZ">
+                                                                    <rect key="frame" x="459" y="28" width="64" height="11"/>
+                                                                    <textFieldCell key="cell" lineBreakMode="clipping" title="DRIVER TYPE" id="fjd-eb-itv">
+                                                                        <font key="font" metaFont="miniSystem"/>
+                                                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                    </textFieldCell>
+                                                                </textField>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TbX-e2-3QL">
+                                                                    <rect key="frame" x="459" y="15" width="36" height="14"/>
+                                                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Driver" id="GMt-SG-vFl">
+                                                                        <font key="font" metaFont="smallSystem"/>
+                                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                    </textFieldCell>
+                                                                </textField>
+                                                                <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="syz-LF-l6P">
+                                                                    <rect key="frame" x="0.0" y="-2" width="531" height="5"/>
+                                                                </box>
+                                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0NQ-ZD-CqD">
+                                                                    <rect key="frame" x="435" y="18" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="18" id="Suw-gm-AEi"/>
+                                                                        <constraint firstAttribute="height" constant="18" id="qO6-vg-5nC"/>
+                                                                    </constraints>
+                                                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="IconLinked" id="2ng-pK-kvv"/>
+                                                                    <color key="contentTintColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                                                </imageView>
+                                                                <button translatesAutoresizingMaskIntoConstraints="NO" id="ypa-iv-wLD">
+                                                                    <rect key="frame" x="211" y="18" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="18" id="jKJ-Xn-BPA"/>
+                                                                        <constraint firstAttribute="height" constant="18" id="lSH-of-WzD"/>
+                                                                    </constraints>
+                                                                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSCaution" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="9XB-KO-aSI">
+                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                        <font key="font" metaFont="system"/>
+                                                                    </buttonCell>
+                                                                </button>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="150" translatesAutoresizingMaskIntoConstraints="NO" id="MD8-ef-Ht8">
+                                                                    <rect key="frame" x="235" y="16" width="182" height="22"/>
+                                                                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Warning: This is a warning message. Please take this into account." id="iub-KH-clf">
+                                                                        <font key="font" metaFont="system" size="9"/>
+                                                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                    </textFieldCell>
+                                                                </textField>
+                                                            </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="0NQ-ZD-CqD" firstAttribute="leading" secondItem="MD8-ef-Ht8" secondAttribute="trailing" constant="20" id="1Rb-Or-Nnn"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="TbX-e2-3QL" secondAttribute="trailing" constant="20" symbolic="YES" id="3vE-LR-S7N"/>
+                                                                <constraint firstItem="TbX-e2-3QL" firstAttribute="leading" secondItem="0NQ-ZD-CqD" secondAttribute="trailing" constant="8" symbolic="YES" id="4cb-D9-8d1"/>
+                                                                <constraint firstItem="XJL-Uw-frD" firstAttribute="leading" secondItem="QPX-eu-eV8" secondAttribute="trailing" constant="10" id="55y-3V-RYt"/>
+                                                                <constraint firstItem="syz-LF-l6P" firstAttribute="leading" secondItem="5GY-nN-BWd" secondAttribute="leading" id="8QK-nf-Fiw"/>
+                                                                <constraint firstItem="QPX-eu-eV8" firstAttribute="top" secondItem="XJL-Uw-frD" secondAttribute="top" id="9QB-jZ-k1V"/>
+                                                                <constraint firstItem="ypa-iv-wLD" firstAttribute="centerY" secondItem="5GY-nN-BWd" secondAttribute="centerY" id="9d8-P2-iSk"/>
+                                                                <constraint firstItem="MD8-ef-Ht8" firstAttribute="leading" secondItem="ypa-iv-wLD" secondAttribute="trailing" constant="8" symbolic="YES" id="C90-wQ-3Gf"/>
+                                                                <constraint firstItem="QPX-eu-eV8" firstAttribute="leading" secondItem="5GY-nN-BWd" secondAttribute="leading" constant="10" id="GOj-sw-ZlZ"/>
+                                                                <constraint firstItem="TbX-e2-3QL" firstAttribute="top" secondItem="jKi-Ls-7FZ" secondAttribute="bottom" constant="-1" id="J29-wT-Uex"/>
+                                                                <constraint firstItem="CXK-Q9-CpO" firstAttribute="leading" secondItem="XJL-Uw-frD" secondAttribute="leading" id="Ojw-VZ-3EG"/>
+                                                                <constraint firstAttribute="trailing" secondItem="syz-LF-l6P" secondAttribute="trailing" id="PWd-5k-AlD"/>
+                                                                <constraint firstItem="XJL-Uw-frD" firstAttribute="top" secondItem="5GY-nN-BWd" secondAttribute="top" constant="12" id="QeE-c7-I9U"/>
+                                                                <constraint firstAttribute="trailing" secondItem="jKi-Ls-7FZ" secondAttribute="trailing" constant="10" id="Uhk-Dy-c65"/>
+                                                                <constraint firstItem="0NQ-ZD-CqD" firstAttribute="centerY" secondItem="5GY-nN-BWd" secondAttribute="centerY" id="Utr-aa-tqX"/>
+                                                                <constraint firstItem="CXK-Q9-CpO" firstAttribute="top" secondItem="XJL-Uw-frD" secondAttribute="bottom" id="VKg-Vq-sYa"/>
+                                                                <constraint firstItem="TbX-e2-3QL" firstAttribute="centerY" secondItem="5GY-nN-BWd" secondAttribute="centerY" constant="5" id="cN8-zO-fnc"/>
+                                                                <constraint firstAttribute="bottom" secondItem="syz-LF-l6P" secondAttribute="bottom" id="gj7-cJ-Lle"/>
+                                                                <constraint firstItem="0NQ-ZD-CqD" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="CXK-Q9-CpO" secondAttribute="trailing" constant="8" symbolic="YES" id="iEd-Y3-zhp"/>
+                                                                <constraint firstItem="ypa-iv-wLD" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="XJL-Uw-frD" secondAttribute="trailing" constant="30" id="koV-Sj-tO8"/>
+                                                                <constraint firstItem="MD8-ef-Ht8" firstAttribute="centerY" secondItem="ypa-iv-wLD" secondAttribute="centerY" id="lIN-pm-mCo"/>
+                                                                <constraint firstItem="0NQ-ZD-CqD" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="XJL-Uw-frD" secondAttribute="trailing" constant="8" symbolic="YES" id="lLA-Jx-Q4W"/>
+                                                                <constraint firstItem="jKi-Ls-7FZ" firstAttribute="leading" secondItem="TbX-e2-3QL" secondAttribute="leading" id="zjN-s3-2Ww"/>
+                                                            </constraints>
+                                                            <connections>
+                                                                <outlet property="buttonWarning" destination="ypa-iv-wLD" id="NwX-H3-8um"/>
+                                                                <outlet property="imageViewLock" destination="QPX-eu-eV8" id="Nnh-kB-adG"/>
+                                                                <outlet property="imageViewType" destination="0NQ-ZD-CqD" id="Cph-FN-LaY"/>
+                                                                <outlet property="labelDriver" destination="TbX-e2-3QL" id="qJh-Ak-Dge"/>
+                                                                <outlet property="labelPathName" destination="CXK-Q9-CpO" id="iVZ-cL-azB"/>
+                                                                <outlet property="labelSiteName" destination="XJL-Uw-frD" id="f0t-vd-W68"/>
+                                                                <outlet property="labelWarning" destination="MD8-ef-Ht8" id="Faw-CY-9R5"/>
+                                                            </connections>
+                                                        </tableCellView>
+                                                    </prototypeCellViews>
+                                                </tableColumn>
+                                            </tableColumns>
+                                            <connections>
+                                                <outlet property="dataSource" destination="JZI-Vd-9oq" id="sbf-YF-ENF"/>
+                                                <outlet property="delegate" destination="JZI-Vd-9oq" id="kal-o7-c23"/>
+                                            </connections>
+                                        </tableView>
+                                    </subviews>
+                                </clipView>
+                                <constraints>
+                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="300" id="R3Z-g3-tYQ"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="550" id="iRQ-sz-oyv"/>
+                                </constraints>
+                                <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="TDE-ff-DQT">
+                                    <rect key="frame" x="1" y="293" width="548" height="15"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </scroller>
+                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="wFn-93-f10">
+                                    <rect key="frame" x="558" y="29" width="15" height="225"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </scroller>
+                            </scrollView>
+                            <progressIndicator maxValue="100" displayedWhenStopped="NO" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="ZiS-Gq-TLQ">
+                                <rect key="frame" x="260" y="150" width="30" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="30" id="XK3-AR-Oc0"/>
+                                    <constraint firstAttribute="height" constant="30" id="lfW-dB-Eu3"/>
+                                </constraints>
+                            </progressIndicator>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="p0j-eB-I2i" firstAttribute="leading" secondItem="rIZ-4U-bhj" secondAttribute="leading" id="2Tx-yb-xrv"/>
+                            <constraint firstItem="p0j-eB-I2i" firstAttribute="top" secondItem="rIZ-4U-bhj" secondAttribute="top" id="Pst-5A-dI0"/>
+                            <constraint firstAttribute="bottom" secondItem="p0j-eB-I2i" secondAttribute="bottom" id="QEw-5m-u1s"/>
+                            <constraint firstItem="ZiS-Gq-TLQ" firstAttribute="centerY" secondItem="rIZ-4U-bhj" secondAttribute="centerY" constant="-10" id="XqX-Tf-8ck"/>
+                            <constraint firstItem="ZiS-Gq-TLQ" firstAttribute="centerX" secondItem="rIZ-4U-bhj" secondAttribute="centerX" id="eD8-TV-7dF"/>
+                            <constraint firstAttribute="trailing" secondItem="p0j-eB-I2i" secondAttribute="trailing" id="zWH-TD-RZv"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="progressIndicator" destination="ZiS-Gq-TLQ" id="Ylb-Vk-uub"/>
+                        <outlet property="tableView" destination="cp3-34-pQj" id="sdw-Ac-27X"/>
+                    </connections>
+                </viewController>
+                <customObject id="HgD-aB-bQb" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="288" y="764.5"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="IconLinked" width="512" height="512"/>
+        <image name="Lock" width="30" height="30"/>
+        <image name="NSCaution" width="32" height="32"/>
+        <image name="arrow.clockwise" catalog="system" width="14" height="16"/>
+    </resources>
 </document>

phpmon/Domain/Core/HomebrewPackage.swift

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

phpmon/Domain/Core/PhpInstall.swift

@@ -1,114 +0,0 @@
-//
-//  PhpInstall.swift
-//  PHP Monitor
-//
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-class PhpInstall {
-
-    var version: Version
-    var configuration: Configuration
-    var extensions: [PhpExtension]
-    
-    // MARK: - Computed
-    
-    var formula: String {
-        return (self.version.short == App.shared.brewPhpVersion) ? "php" : "php@\(self.version.short)"
-    }
-    
-    // MARK: - Initializer
-
-    init() {
-        // Show information about the current version
-        self.version = Self.getVersion()
-        
-        // If an error occurred, exit early
-        if (self.version.error) {
-            self.configuration = Configuration()
-            self.extensions = []
-            return
-        }
-        
-        // Load extension information
-        let path = URL(fileURLWithPath: "\(Paths.etcPath)/php/\(self.version.short)/php.ini")
-        self.extensions = PhpExtension.load(from: path)
-        
-        // Get configuration values
-        self.configuration = Configuration(
-            memory_limit: Self.getByteCount(key: "memory_limit"),
-            upload_max_filesize: Self.getByteCount(key: "upload_max_filesize"),
-            post_max_size: Self.getByteCount(key: "post_max_size")
-        )
-    }
-    
-    /**
-     When the app tries to retrieve the version, the installation is considered broken if the output is nothing,
-     _or_ if the output contains the word "Warning" or "Error". In normal situations this should not be the case.
-     */
-    private static func getVersion() -> Version {
-        var versionStruct = Version()
-        let version = Command.execute(path: Paths.php, arguments: ["-r", "print phpversion();"])
-        
-        if (version == "" || version.contains("Warning") || version.contains("Error")) {
-            versionStruct.short = "💩 BROKEN"
-            versionStruct.long = "";
-            versionStruct.error = true
-            return versionStruct;
-        }
-        
-        // That's the long version
-        versionStruct.long = version
-        
-        // Next up, let's strip away the minor version number
-        let segments = versionStruct.long.components(separatedBy: ".")
-        
-        // Get the first two elements
-        versionStruct.short = segments[0...1].joined(separator: ".")
-        
-        return versionStruct
-    }
-    
-    /**
-     Retrieves the display value for a specific key in the `.ini` file.
-     
-     The following values are valid:
-     * -1: unlimited (show the infinity icon)
-     * 10000: an integer = amount of bytes
-     * 1K, 1M, 1G = shorthand for kilobytes, megabytes and gigabytes
-     
-     If none of these notations are used, the _fallback_ value is used. We'll show an emoji to indicate something has gone wrong here.
-     To clarify, B gets appended to valid values. As a result, "5M" (valid) becomes "5MB", and "5MB" (invalid) becomes ⚠️.
-     
-     - Parameter key: The key of the `ini` value that needs to be retrieved. For example, you can use `memory_limit`.
-     */
-    private static func getByteCount(key: String) -> String {
-        let value = Command.execute(path: Paths.php, arguments: ["-r", "echo ini_get('\(key)');"])
-        
-        // Check if the value is unlimited
-        if (value == "-1") {
-            return "∞"
-        }
-        
-        // Check if the syntax is valid otherwise
-        let regex = try! NSRegularExpression(pattern: #"^([0-9]*)(K|M|G|)$"#, options: [])
-        let match = regex.matches(in: value, options: [], range: NSMakeRange(0, value.count)).first
-        return (match == nil) ? "⚠️" : "\(value)B"
-    }
-    
-    // MARK: - Structs
-    
-    struct Version {
-        var short = "???"
-        var long = "???"
-        var error = false
-    }
-    
-    struct Configuration {
-        var memory_limit = "???"
-        var upload_max_filesize = "???"
-        var post_max_size = "???"
-    }
-}

phpmon/Domain/Core/Startup.swift

@@ -21,53 +21,60 @@ class Startup {
      */
     func checkEnvironment(success: () -> Void, failure: @escaping () -> Void)
     {
-        self.failureCallback = failure
+        failureCallback = failure
         
-        self.performEnvironmentCheck(
+        performEnvironmentCheck(
             !Shell.fileExists("\(Paths.binPath)/php"),
             messageText:        "startup.errors.php_binary.title".localized,
-            informativeText:    "startup.errors.php_binary_desc".localized,
+            informativeText:    "startup.errors.php_binary.desc".localized,
             breaking:           true
         )
         
-        self.performEnvironmentCheck(
+        performEnvironmentCheck(
             !Shell.pipe("ls \(Paths.optPath) | grep php").contains("php"),
             messageText:        "startup.errors.php_opt.title".localized,
             informativeText:    "startup.errors.php_opt.desc".localized,
             breaking:           true
         )
         
-        self.performEnvironmentCheck(
-            !Shell.pipe("which valet").contains("/usr/local/bin/valet"),
+        performEnvironmentCheck(
+            // Check for Valet; it can be symlinked or in .composer/vendor/bin
+            !(Shell.fileExists("/usr/local/bin/valet")
+                || Shell.fileExists("/opt/homebrew/bin/valet")
+                || Shell.fileExists("~/.composer/vendor/bin/valet")
+            ),
             messageText:        "startup.errors.valet_executable.title".localized,
             informativeText:    "startup.errors.valet_executable.desc".localized,
             breaking:           true
         )
         
-        self.performEnvironmentCheck(
+        performEnvironmentCheck(
             !Shell.pipe("cat /private/etc/sudoers.d/brew").contains("\(Paths.binPath)/brew"),
             messageText:        "startup.errors.sudoers_brew.title".localized,
             informativeText:    "startup.errors.sudoers_brew.desc".localized,
             breaking:           true
         )
         
-        self.performEnvironmentCheck(
-            !Shell.pipe("cat /private/etc/sudoers.d/valet").contains("/usr/local/bin/valet"),
+        performEnvironmentCheck(
+            // Check for Valet; it can be symlinked or in .composer/vendor/bin
+            !(Shell.pipe("cat /private/etc/sudoers.d/valet").contains("/usr/local/bin/valet")
+                || Shell.pipe("cat /private/etc/sudoers.d/valet").contains("/opt/homebrew/bin/valet")
+            ),
             messageText:        "startup.errors.sudoers_valet.title".localized,
             informativeText:    "startup.errors.sudoers_valet.desc".localized,
             breaking:           true
         )
         
         let services = Shell.pipe("\(Paths.brew) services list | grep php")
-        self.performEnvironmentCheck(
+        performEnvironmentCheck(
             (services.countInstances(of: "started") > 1),
             messageText:        "startup.errors.services.title".localized,
             informativeText:    "startup.errors.services.desc".localized,
             breaking:           false
         )
         
-        if (!self.failed) {
-            self.determineBrewAliasVersion()
+        if (!failed) {
+            determineBrewAliasVersion()
             success()
         }
     }
@@ -107,13 +114,18 @@ class Startup {
     ) {
         if (!condition) { return }
         
-        self.failed = breaking
+        failed = breaking
 
-        DispatchQueue.main.async {
+        DispatchQueue.main.async { [self] in
             // Present the information to the user
-            Alert.notify(message: messageText, info: informativeText)
+            Alert.notify(
+                message: messageText,
+                info: informativeText,
+                style: breaking ? .critical : .warning
+            )
             // Only breaking issues will throw the extra retry modal
-            breaking ? self.failureCallback() : ()
+            breaking ? failureCallback() : ()
         }
     }
+    
 }

phpmon/Domain/Extensions/DateExtension.swift

@@ -7,11 +7,12 @@
 
 import Cocoa
 
-extension Date
-{
+extension Date {
+    
     func toString() -> String {
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
         return dateFormatter.string(from: self)
     }
+    
 }

phpmon/Domain/Extensions/NSMenuExtension.swift

@@ -0,0 +1,18 @@
+//
+//  NSMenuExtension.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 14/04/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+extension NSMenu {
+    
+    open func addItem(_ newItem: NSMenuItem, withKeyModifier modifier: NSEvent.ModifierFlags) {
+        newItem.keyEquivalentModifierMask = modifier
+        self.addItem(newItem)
+    }
+    
+}

phpmon/Domain/Extensions/StringExtension.swift

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

phpmon/Domain/Extensions/XibLoadable.swift

@@ -7,17 +7,19 @@
 //
 
 import Foundation
-
 import Cocoa
 
 // Adapted from: https://stackoverflow.com/a/46268778
 
 protocol XibLoadable {
+    
     static var xibName: String? { get }
     static func createFromXib(in bundle: Bundle) -> Self?
+    
 }
 
 extension XibLoadable where Self: NSView {
+    
     static var xibName: String? {
         return String(describing: Self.self)
     }
@@ -30,4 +32,5 @@ extension XibLoadable where Self: NSView {
         let views = Array<Any>(results).filter { $0 is Self }
         return views.last as? Self
     }
+    
 }

phpmon/Domain/Helpers/Alert.swift

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

phpmon/Domain/Helpers/Application.swift

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

phpmon/Domain/Helpers/Filesystem.swift

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

phpmon/Domain/Helpers/LocalNotification.swift

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

phpmon/Domain/Helpers/MenuBarImageGenerator.swift

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

phpmon/Domain/Helpers/PMWindowController.swift

@@ -0,0 +1,48 @@
+//
+//  PMWindowController.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 05/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+/**
+ This window class keeps track of which windows are currently visible, and reports this info back to the App class.
+ For more information, check the `windows` property on `App`.
+ 
+ - Note: This class does make a simple assumption: each window controller corresponds to a single view.
+ */
+class PMWindowController: NSWindowController, NSWindowDelegate {
+    
+    public var windowName: String {
+        fatalError("Please specify a window name")
+    }
+    
+    override func showWindow(_ sender: Any?) {
+        super.showWindow(sender)
+        App.shared.register(window: windowName)
+    }
+    
+    public func positionWindowInTopLeftCorner() {
+        guard let frame = NSScreen.main?.frame else { return }
+        guard let window = self.window else { return }
+        
+        window.setFrame(NSRect(
+            x: frame.size.width - window.frame.size.width - 20,
+            y: frame.size.height - window.frame.size.height - 40,
+            width: window.frame.width,
+            height: window.frame.height
+        ), display: true)
+    }
+    
+    func windowWillClose(_ notification: Notification) {
+        App.shared.remove(window: windowName)
+    }
+    
+    deinit {
+        print("Window controller '\(windowName)' was deinitialized")
+    }
+    
+}

phpmon/Domain/Helpers/Timer.swift

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

phpmon/Domain/Helpers/VersionExtractor.swift

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

phpmon/Domain/Integrations/Homebrew/HomebrewDiagnostics.swift

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

phpmon/Domain/Integrations/Homebrew/HomebrewPackage.swift

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

phpmon/Domain/Integrations/Valet/Valet.swift

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

phpmon/Domain/Menu/HeaderView.swift

@@ -10,6 +10,7 @@ import Foundation
 import Cocoa
 
 class HeaderView: NSView, XibLoadable {
+    
     @IBOutlet weak var textField: NSTextField!
     
     static func asMenuItem(text: String) -> NSMenuItem {
@@ -20,4 +21,5 @@ class HeaderView: NSView, XibLoadable {
         item.target = self
         return item
     }
+    
 }

phpmon/Domain/Menu/MainMenu.swift

@@ -0,0 +1,428 @@
+//
+//  MainMenu.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
+
+    static let shared = MainMenu()
+    
+    weak var menuDelegate: NSMenuDelegate? = nil
+    
+    /**
+     The status bar item with variable length.
+     */
+    let statusItem = NSStatusBar.system.statusItem(
+        withLength: NSStatusItem.variableLength
+    )
+    
+    // MARK: - UI related
+    
+    /**
+     Kick off the startup of the rendering of the main menu.
+     */
+    func startup() {
+        // Start with the icon
+        setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+        
+        // Perform environment boot checks
+        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
+            Startup().checkEnvironment(success: { onEnvironmentPass() },
+                                       failure: { onEnvironmentFail() }
+            )
+        }
+    }
+    
+    /**
+     When the environment is all clear and the app can run, let's go.
+     */
+    private func onEnvironmentPass() {
+        _ = Actions.detectPhpVersions()
+        
+        if HomebrewDiagnostics.shared.errors.contains(.aliasConflict) {
+            DispatchQueue.main.async {
+                Alert.notify(
+                    message: "alert.php_alias_conflict.title".localized,
+                    info: "alert.php_alias_conflict.info".localized,
+                    style: .critical
+                )
+            }
+        }
+        
+        updatePhpVersionInStatusBar()
+        
+        print("Determining broken PHP-FPM...")
+        // Attempt to find out if PHP-FPM is broken
+        let installation = App.phpInstall!
+        installation.notifyAboutBrokenPhpFpm()
+        
+        print("Detecting applications...")
+        // Attempt to load list of applications
+        App.shared.detectedApplications = Application.detectPresetApplications()
+        let appNames = App.shared.detectedApplications.map { app in
+            return app.name
+        }
+        print("Detected applications: \(appNames)")
+        
+        // Load the global hotkey
+        App.shared.loadGlobalHotkey()
+        
+        // Attempt to find out more info about Valet
+        print("PHP Monitor has extracted the version number of Valet: \(Valet.shared.version)")
+        Valet.shared.validateVersion()
+        Valet.shared.startPreloadingSites()
+        print("PHP Monitor is ready to serve!")
+        
+        // Schedule a request to fetch the PHP version every 60 seconds
+        DispatchQueue.main.async { [self] in
+            App.shared.timer = Timer.scheduledTimer(
+                timeInterval: 60,
+                target: self,
+                selector: #selector(updatePhpVersionInStatusBar),
+                userInfo: nil,
+                repeats: true
+            )
+        }
+    }
+    
+    /**
+     When the environment is not OK, present an alert to inform the user.
+     */
+    private func onEnvironmentFail() {
+        DispatchQueue.main.async { [self] in
+            let close = Alert.present(
+                messageText: "alert.cannot_start.title".localized,
+                informativeText: "alert.cannot_start.info".localized,
+                buttonTitle: "alert.cannot_start.close".localized,
+                secondButtonTitle: "alert.cannot_start.retry".localized
+            )
+            
+            if (close) {
+                exit(1)
+            }
+            
+            startup()
+        }
+    }
+    
+    /**
+     Update the menu's contents, based on what's going on.
+     */
+    func update() {
+        // Update the menu item on the main thread
+        DispatchQueue.main.async { [self] in
+            // Create a new menu
+            let menu = StatusMenu()
+            
+            // Add the PHP versions (or error messages)
+            menu.addPhpVersionMenuItems()
+            menu.addItem(NSMenuItem.separator())
+            
+            // Add the possible actions
+            menu.addPhpActionMenuItems()
+            menu.addItem(NSMenuItem.separator())
+            
+            // Add Valet interactions
+            menu.addValetMenuItems()
+            menu.addItem(NSMenuItem.separator())
+            
+            // Add services
+            menu.addServicesMenuItems()
+            menu.addItem(NSMenuItem.separator())
+            
+            // Add information about services & actions
+            menu.addPhpConfigurationMenuItems()
+            menu.addItem(NSMenuItem.separator())
+            
+            // Add about & quit menu items
+            menu.addItem(NSMenuItem(title: "mi_preferences".localized, action: #selector(openPrefs), keyEquivalent: ","))
+            menu.addItem(NSMenuItem(title: "mi_about".localized, action: #selector(openAbout), keyEquivalent: ""))
+            menu.addItem(NSMenuItem(title: "mi_quit".localized, action: #selector(terminateApp), keyEquivalent: "q"))
+            
+            // Make sure every item can be interacted with
+            menu.items.forEach({ (item) in
+                item.target = self
+            })
+            
+            statusItem.menu = menu
+            statusItem.menu?.delegate = self
+        }
+    }
+    
+    /**
+     Sets the status bar image based on a version string.
+     */
+    func setStatusBarImage(version: String) {
+        setStatusBar(
+            image: MenuBarImageGenerator.textToImageWithIcon(text: version)
+        )
+    }
+    
+    /**
+     Sets the status bar image, based on the provided NSImage.
+     The image will be used as a template image.
+     */
+    func setStatusBar(image: NSImage) {
+        if let button = statusItem.button {
+            image.isTemplate = true
+            button.image = image
+        }
+    }
+    
+    // MARK: - Nicer callbacks
+    
+    /**
+     Executes a specific callback and fires the completion callback,
+     while updating the UI as required. As long as the completion callback
+     does not fire, the app is presumed to be busy and the UI reflects this.
+     
+     - Parameter execute: Callback of the work that needs to happen.
+     - Parameter completion: Callback that is fired when the work is done.
+     */
+    private func waitAndExecute(_ execute: @escaping () -> Void, completion: @escaping () -> Void = {})
+    {
+        App.shared.busy = true
+        setBusyImage()
+        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
+            update()
+            execute()
+            App.shared.busy = false
+            
+            DispatchQueue.main.async { [self] in
+                updatePhpVersionInStatusBar()
+                update()
+                completion()
+            }
+        }
+    }
+    
+    // MARK: - User Interface
+    
+    @objc func updatePhpVersionInStatusBar() {
+        App.shared.currentInstall = ActivePhpInstallation()
+        refreshIcon()
+        update()
+    }
+    
+    func refreshIcon() {
+        DispatchQueue.main.async { [self] in
+            if (App.busy) {
+                setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+            } else {
+                if Preferences.preferences[.shouldDisplayDynamicIcon] as! Bool == false {
+                    // Static icon has been requested
+                    setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIconStatic"))!)
+                } else {
+                    // The dynamic icon has been requested
+                    let long = Preferences.preferences[.fullPhpVersionDynamicIcon] as! Bool
+                    setStatusBarImage(version: long ? App.phpInstall!.version.long  : App.phpInstall!.version.short)
+                }
+            }
+        }
+    }
+    
+    @objc func reloadPhpMonitorMenu() {
+        waitAndExecute {
+            // This automatically reloads the menu
+            print("Reloading information about the PHP installation...")
+        } completion: {
+            // Add a slight delay to make sure it loads the new menu
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                // Open the menu again
+                MainMenu.shared.statusItem.button?.performClick(nil)
+            }
+        }
+    }
+    
+    @objc func setBusyImage() {
+        DispatchQueue.main.async { [self] in
+            setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+        }
+    }
+    
+    // MARK: - Actions
+    
+    @objc func restartPhpFpm() {
+        waitAndExecute {
+            Actions.restartPhpFpm()
+        }
+    }
+    
+    @objc func restartAllServices() {
+        waitAndExecute {
+            Actions.restartDnsMasq()
+            Actions.restartPhpFpm()
+            Actions.restartNginx()
+        } completion: {
+            DispatchQueue.main.async {
+                LocalNotification.send(
+                    title: "notification.services_restarted".localized,
+                    subtitle: "notification.services_restarted_desc".localized
+                )
+            }
+        }
+    }
+    
+    @objc func stopAllServices() {
+        waitAndExecute {
+            Actions.stopAllServices()
+        } completion: {
+            DispatchQueue.main.async {
+                LocalNotification.send(
+                    title: "notification.services_stopped".localized,
+                    subtitle: "notification.services_stopped_desc".localized
+                )
+            }
+        }
+    }
+    
+    @objc func restartNginx() {
+        waitAndExecute {
+            Actions.restartNginx()
+        }
+    }
+    
+    @objc func restartDnsMasq() {
+        waitAndExecute {
+            Actions.restartDnsMasq()
+        }
+    }
+    
+    @objc func toggleExtension(sender: ExtensionMenuItem) {
+        waitAndExecute {
+            sender.phpExtension?.toggle()
+            
+            if Preferences.preferences[.autoServiceRestartAfterExtensionToggle] as! Bool == true {
+                Actions.restartPhpFpm()
+            }
+        }
+    }
+    
+    @objc func openPhpInfo() {
+        waitAndExecute {
+            // Write a file called `phpmon_phpinfo.php` to /tmp
+            try! "<?php phpinfo();".write(toFile: "/tmp/phpmon_phpinfo.php", atomically: true, encoding: .utf8)
+            
+            // Tell php-cgi to run the PHP and output as an .html file
+            Shell.run("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
+        } completion: {
+            // When this has been completed, open the URL to the file in the browser
+            NSWorkspace.shared.open(URL(string: "file:///private/tmp/phpmon_phpinfo.html")!)
+        }
+    }
+    
+    @objc func forceRestartLatestPhp() {
+        // Tell the user the switch is about to occur
+        Alert.notify(message: "alert.force_reload.title".localized, info: "alert.force_reload.info".localized)
+        
+        // Start switching
+        waitAndExecute {
+            Actions.fixMyPhp()
+        } completion: {
+            Alert.notify(message: "alert.force_reload_done.title".localized, info: "alert.force_reload_done.info".localized)
+        }
+    }
+    
+    @objc func openActiveConfigFolder() {
+        if (App.phpInstall!.version.error) {
+            // php version was not identified
+            Actions.openGenericPhpConfigFolder()
+            return
+        }
+        
+        // php version was identified
+        Actions.openPhpConfigFolder(version: App.phpInstall!.version.short)
+    }
+    
+    @objc func openGlobalComposerFolder() {
+        Actions.openGlobalComposerFolder()
+    }
+    
+    @objc func openValetConfigFolder() {
+        Actions.openValetConfigFolder()
+    }
+    
+    @objc func switchToPhpVersion(sender: PhpMenuItem) {
+        setBusyImage()
+        App.shared.busy = true
+        
+        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
+            // Update the PHP version in the status bar
+            updatePhpVersionInStatusBar()
+            
+            // Update the menu
+            update()
+            
+            let completion = {
+                // Mark as no longer busy
+                App.shared.busy = false
+                
+                // Perform UI updates on main thread
+                DispatchQueue.main.async { [self] in
+                    updatePhpVersionInStatusBar()
+                    update()
+                    
+                    // Send a notification that the switch has been completed
+                    LocalNotification.send(
+                        title: String(format: "notification.version_changed_title".localized, sender.version),
+                        subtitle: String(format: "notification.version_changed_desc".localized, sender.version)
+                    )
+                    
+                    App.phpInstall?.notifyAboutBrokenPhpFpm()
+                }
+            }
+            
+            /* DISABLED UNTIL VALET SWITCHING IS OK (see #34)
+            if Preferences.preferences[.useInternalSwitcher] as! Bool == false {
+                // 1. Default switcher using Valet
+                // Will cause less issues, but is slower
+                Actions.switchToPhpVersionUsingValet(
+                    version: sender.version,
+                    availableVersions: App.shared.availablePhpVersions,
+                    completed: completion
+                )
+            } else { */
+                // 2. Custom switcher (internal)
+                // Will cause more issues with Homebrew and is faster
+                Actions.switchToPhpVersion(
+                    version: sender.version,
+                    availableVersions: App.shared.availablePhpVersions,
+                    completed: completion
+                )
+            /* } */
+        }
+    }
+    
+    @objc func openAbout() {
+        NSApplication.shared.activate(ignoringOtherApps: true)
+        NSApplication.shared.orderFrontStandardAboutPanel()
+    }
+    
+    @objc func openPrefs() {
+        PrefsVC.show()
+    }
+    
+    @objc func openSiteList() {
+        SiteListVC.show()
+    }
+    
+    @objc func terminateApp() {
+        NSApplication.shared.terminate(nil)
+    }
+    
+    // MARK: - Menu Delegate
+    
+    func menuWillOpen(_ menu: NSMenu) {
+        // Make sure the shortcut key does not trigger this when the menu is open
+        App.shared.shortcutHotkey?.isPaused = true
+    }
+    
+    func menuDidClose(_ menu: NSMenu) {
+        // When the menu is closed, allow the shortcut to work again
+        App.shared.shortcutHotkey?.isPaused = false
+    }
+}

phpmon/Domain/Menu/StatsView.swift

@@ -10,6 +10,7 @@ import Foundation
 import Cocoa
 
 class StatsView: NSView, XibLoadable {
+    
     @IBOutlet weak var titleMemLimit: NSTextField!
     @IBOutlet weak var titleMaxPost: NSTextField!
     @IBOutlet weak var titleMaxUpload: NSTextField!
@@ -31,4 +32,5 @@ class StatsView: NSView, XibLoadable {
         item.target = self
         return item
     }
+    
 }

phpmon/Domain/Menu/StatusMenu.swift

@@ -15,18 +15,18 @@ class StatusMenu : NSMenu {
         
         if App.phpInstall!.version.error {
             for message in ["mi_php_broken_1", "mi_php_broken_2", "mi_php_broken_3", "mi_php_broken_4"] {
-                self.addItem(NSMenuItem(title: message.localized, action: nil, keyEquivalent: ""))
+                addItem(NSMenuItem(title: message.localized, action: nil, keyEquivalent: ""))
             }
             return
         }
     
         let phpVersionText = "\("mi_php_version".localized) \(App.phpInstall!.version.long)"
-        self.addItem(HeaderView.asMenuItem(text: phpVersionText))
+        addItem(HeaderView.asMenuItem(text: phpVersionText))
     }
     
     func addPhpActionMenuItems() {
         if App.busy {
-            self.addItem(NSMenuItem(title: "mi_busy".localized, action: nil, keyEquivalent: ""))
+            addItem(NSMenuItem(title: "mi_busy".localized, action: nil, keyEquivalent: ""))
             return
         }
         
@@ -36,41 +36,48 @@ class StatusMenu : NSMenu {
         
         self.addSwitchToPhpMenuItems()
         self.addItem(NSMenuItem.separator())
-        self.addServicesMenuItems()
     }
     
-    private func addSwitchToPhpMenuItems() {
-        var shortcutKey = 1
-        for index in (0..<App.shared.availablePhpVersions.count).reversed() {
-            let version = App.shared.availablePhpVersions[index]
-            let action = #selector(MainMenu.switchToPhpVersion(sender:))
-            let brew = (version == App.shared.brewPhpVersion) ? "php" : "php@\(version)"
-            let menuItem = PhpMenuItem(
-                title: "\("mi_php_switch".localized) \(version) (\(brew))",
-                action: (version == App.phpInstall?.version.short) ? nil : action, keyEquivalent: "\(shortcutKey)"
-            )
-            menuItem.version = version
-            shortcutKey = shortcutKey + 1
-            self.addItem(menuItem)
-        }
-    }
-    
-    private func addServicesMenuItems() {
+    func addServicesMenuItems() {
         self.addItem(HeaderView.asMenuItem(text: "mi_active_services".localized))
         
-        let services = NSMenuItem(title: "mi_restart_specific".localized, action: nil, keyEquivalent: "")
+        let services = NSMenuItem(title: "mi_manage_services".localized, action: nil, keyEquivalent: "")
         let servicesMenu = NSMenu()
         servicesMenu.addItem(NSMenuItem(title: "mi_restart_dnsmasq".localized, action: #selector(MainMenu.restartDnsMasq), keyEquivalent: "d"))
         servicesMenu.addItem(NSMenuItem(title: "mi_restart_php_fpm".localized, action: #selector(MainMenu.restartPhpFpm), keyEquivalent: "p"))
         servicesMenu.addItem(NSMenuItem(title: "mi_restart_nginx".localized, action: #selector(MainMenu.restartNginx), keyEquivalent: "n"))
+        servicesMenu.addItem(
+            NSMenuItem(title: "mi_stop_all_services".localized, action: #selector(MainMenu.stopAllServices), keyEquivalent: "s"),
+            withKeyModifier: [.command, .shift])
+        servicesMenu.addItem(NSMenuItem(title: "mi_restart_all_services".localized, action: #selector(MainMenu.restartAllServices), keyEquivalent: "s"))
         for item in servicesMenu.items {
             item.target = MainMenu.shared
         }
         self.setSubmenu(servicesMenu, for: services)
         
-        self.addItem(NSMenuItem(title: "mi_force_load_latest".localized, action: #selector(MainMenu.forceRestartLatestPhp), keyEquivalent: "f"))
+        self.addForceLoadLatestVersion()
         self.addItem(services)
-        self.addItem(NSMenuItem(title: "mi_restart_all_services".localized, action: #selector(MainMenu.restartAllServices), keyEquivalent: "s"))
+
+    }
+    
+    func addForceLoadLatestVersion() {
+        if !App.shared.availablePhpVersions.contains(App.shared.brewPhpVersion) {
+            self.addItem(NSMenuItem(
+                title: "mi_force_load_latest_unavailable".localized(App.shared.brewPhpVersion),
+                action: nil, keyEquivalent: "f"
+            ))
+        } else {
+            self.addItem(NSMenuItem(
+                title: "mi_force_load_latest".localized(App.shared.brewPhpVersion),
+                action: #selector(MainMenu.forceRestartLatestPhp), keyEquivalent: "f"))
+        }
+    }
+    
+    func addValetMenuItems() {
+        self.addItem(HeaderView.asMenuItem(text: "mi_valet".localized))
+        self.addItem(NSMenuItem(title: "mi_valet_config".localized, action: #selector(MainMenu.openValetConfigFolder), keyEquivalent: "v"))
+        self.addItem(NSMenuItem(title: "mi_sitelist".localized, action: #selector(MainMenu.openSiteList), keyEquivalent: "l"))
+        self.addItem(NSMenuItem.separator())
     }
     
     func addPhpConfigurationMenuItems() {
@@ -80,7 +87,7 @@ class StatusMenu : NSMenu {
         
         // Configuration
         self.addItem(HeaderView.asMenuItem(text: "mi_configuration".localized))
-        self.addItem(NSMenuItem(title: "mi_valet_config".localized, action: #selector(MainMenu.openValetConfigFolder), keyEquivalent: "v"))
+        self.addItem(NSMenuItem(title: "mi_global_composer".localized, action: #selector(MainMenu.openGlobalComposerFolder), keyEquivalent: "g"))
         self.addItem(NSMenuItem(title: "mi_php_config".localized, action: #selector(MainMenu.openActiveConfigFolder), keyEquivalent: "c"))
         self.addItem(NSMenuItem(title: "mi_phpinfo".localized, action: #selector(MainMenu.openPhpInfo), keyEquivalent: "i"))
         
@@ -88,14 +95,14 @@ class StatusMenu : NSMenu {
             return
         }
         
-        let stats = App.phpInstall!.configuration
+        let stats = App.phpInstall!.limits
         
         // Stats
         self.addItem(NSMenuItem.separator())
         self.addItem(StatsView.asMenuItem(
-            memory: stats.memory_limit,
-            post: stats.post_max_size,
-            upload: stats.upload_max_filesize)
+            memory: stats!.memory_limit,
+            post: stats!.post_max_size,
+            upload: stats!.upload_max_filesize)
         )
         
         // Extensions
@@ -106,18 +113,58 @@ class StatusMenu : NSMenu {
             self.addItem(NSMenuItem(title: "mi_no_extensions_detected".localized, action: nil, keyEquivalent: ""))
         }
         
+        var shortcutKey = 1
         for phpExtension in App.phpInstall!.extensions {
-            self.addExtensionItem(phpExtension)
+            self.addExtensionItem(phpExtension, shortcutKey)
+            shortcutKey += 1
+        }
+        
+        self.addItem(NSMenuItem.separator())
+        
+        self.addItem(NSMenuItem(title: "mi_php_refresh".localized, action: #selector(MainMenu.reloadPhpMonitorMenu), keyEquivalent: "r"))
+    }
+    
+    private func addSwitchToPhpMenuItems() {
+        var shortcutKey = 1
+        for index in (0..<App.shared.availablePhpVersions.count).reversed() {
+            
+            // Get the short and long version
+            let shortVersion = App.shared.availablePhpVersions[index]
+            let longVersion = App.shared.cachedPhpInstallations[shortVersion]!.longVersion
+            
+            let long = Preferences.preferences[.fullPhpVersionDynamicIcon] as! Bool
+            let versionString = long ? longVersion : shortVersion
+            
+            let action = #selector(MainMenu.switchToPhpVersion(sender:))
+            let brew = (shortVersion == App.shared.brewPhpVersion) ? "php" : "php@\(shortVersion)"
+            let menuItem = PhpMenuItem(
+                title: "\("mi_php_switch".localized) \(versionString) (\(brew))",
+                action: (shortVersion == App.phpInstall?.version.short) ? nil : action, keyEquivalent: "\(shortcutKey)"
+            )
+            
+            menuItem.version = shortVersion
+            shortcutKey = shortcutKey + 1
+            
+            self.addItem(menuItem)
         }
     }
     
-    private func addExtensionItem(_ phpExtension: PhpExtension) {
+    private func addExtensionItem(_ phpExtension: PhpExtension, _ shortcutKey: Int) {
+        let keyEquivalent = shortcutKey < 9 ? "\(shortcutKey)" : ""
+        
         let menuItem = ExtensionMenuItem(
-            title: "\(phpExtension.name.capitalized) (php.ini)",
-            action: #selector(MainMenu.toggleExtension), keyEquivalent: ""
+            title: "\(phpExtension.name) (\(phpExtension.fileNameOnly))",
+            action: #selector(MainMenu.toggleExtension),
+            keyEquivalent: keyEquivalent
         )
+        
+        if menuItem.keyEquivalent != "" {
+            menuItem.keyEquivalentModifierMask = [.option]
+        }
+        
         menuItem.state = phpExtension.enabled ? .on : .off
         menuItem.phpExtension = phpExtension
+        
         self.addItem(menuItem)
     }
 }
@@ -131,3 +178,7 @@ class PhpMenuItem: NSMenuItem {
 class ExtensionMenuItem: NSMenuItem {
     var phpExtension: PhpExtension? = nil
 }
+
+class EditorMenuItem: NSMenuItem {
+    var editor: Application? = nil
+}

phpmon/Domain/PHP/ActivePhpInstallation.swift

@@ -0,0 +1,187 @@
+//
+//  ActivePhpInstallation.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+/**
+ An installed version of PHP, that was detected by scanning the `/opt/php@version/bin` directory.
+ 
+ When initialized, that version's .ini files are also scanned (for active or inactive extensions).
+ Integrity checks can be performed to determine whether PHP-FPM is configured correctly.
+ 
+ - Note: Each installation has a separate version number.
+ Using `version.short` is advisable if you want to interact with Homebrew.
+ */
+class ActivePhpInstallation {
+
+    var version: Version!
+    var limits: Limits!
+    var extensions: [PhpExtension]!
+    
+    // MARK: - Computed
+    
+    var formula: String {
+        return (version.short == App.shared.brewPhpVersion) ? "php" : "php@\(version.short)"
+    }
+    
+    // MARK: - Initializer
+
+    init() {
+        // Show information about the current version
+        getVersion()
+        
+        // If an error occurred, exit early
+        if (version.error) {
+            limits = Limits()
+            extensions = []
+            return
+        }
+        
+        // Load extension information
+        let path = URL(fileURLWithPath: "\(Paths.etcPath)/php/\(version.short)/php.ini")
+        extensions = PhpExtension.load(from: path)
+        
+        // Get configuration values
+        limits = Limits(
+            memory_limit: getByteCount(key: "memory_limit"),
+            upload_max_filesize: getByteCount(key: "upload_max_filesize"),
+            post_max_size: getByteCount(key: "post_max_size")
+        )
+        
+        // Return a list of .ini files parsed after php.ini
+        let paths = Command.execute(path: Paths.php, arguments: ["-r", "echo php_ini_scanned_files();"])
+            .replacingOccurrences(of: "\n", with: "")
+            .split(separator: ",")
+            .map { String($0) }
+        
+        // See if any extensions are present in said .ini files
+        paths.forEach { (iniFilePath) in
+            let exts = PhpExtension.load(from: URL(fileURLWithPath: iniFilePath))
+            if exts.count > 0 {
+                extensions.append(contentsOf: exts)
+            }
+        }
+    }
+    
+    /**
+     When the app tries to retrieve the version, the installation is considered broken if the output is nothing,
+     _or_ if the output contains the word "Warning" or "Error". In normal situations this should not be the case.
+     */
+    private func getVersion() -> Void {
+        self.version = Version()
+        
+        let version = Command.execute(path: Paths.phpConfig, arguments: ["--version"], trimNewlines: true)
+        
+        if (version == "" || version.contains("Warning") || version.contains("Error")) {
+            self.version.short = "💩 BROKEN"
+            self.version.long = ""
+            self.version.error = true
+            return
+        }
+        
+        // That's the long version
+        self.version.long = version
+        
+        // Next up, let's strip away the minor version number
+        let segments = self.version.long.components(separatedBy: ".")
+        
+        // Get the first two elements
+        self.version.short = segments[0...1].joined(separator: ".")
+    }
+    
+    /**
+     Retrieves the display value for a specific key in the `.ini` file.
+     
+     The following values are valid:
+     * -1: unlimited (show the infinity icon)
+     * 10000: an integer = amount of bytes
+     * 1K, 1M, 1G = shorthand for kilobytes, megabytes and gigabytes
+     
+     If none of these notations are used, the _fallback_ value is used.
+     We'll show an emoji to indicate something has gone wrong here.
+     To clarify, B gets appended to valid values.
+     As a result, "5M" (valid) becomes "5MB", and "5MB" (invalid) becomes ⚠️.
+     
+     - Parameter key: The key of the `ini` value that needs to be retrieved. For example, you can use `memory_limit`.
+     */
+    private func getByteCount(key: String) -> String {
+        let value = Command.execute(path: Paths.php, arguments: ["-r", "echo ini_get('\(key)');"])
+        
+        // Check if the value is unlimited
+        if (value == "-1") {
+            return "∞"
+        }
+        
+        // Check if the syntax is valid otherwise
+        let regex = try! NSRegularExpression(pattern: #"^([0-9]*)(K|M|G|)$"#, options: [])
+        let match = regex.matches(in: value, options: [], range: NSMakeRange(0, value.count)).first
+        return (match == nil) ? "⚠️" : "\(value)B"
+    }
+    
+    /**
+     It is always possible that the system configuration for PHP-FPM has not been set up for Valet.
+     This can occur when a user manually installs a new PHP version, but does not run `valet install`.
+     In that case, we should alert the user!
+     
+     - Important: The underlying check is `checkPhpFpmStatus`, which can be run multiple times.
+     This method actively presents a modal if said checks fails, so don't call this method too many times.
+     */
+    public func notifyAboutBrokenPhpFpm() {
+        if !self.checkPhpFpmStatus() {
+            DispatchQueue.main.async {
+                Alert.notify(
+                    message: "alert.php_fpm_broken.title".localized,
+                    info: "alert.php_fpm_broken.info".localized,
+                    style: .critical
+                )
+            }
+        }
+    }
+    
+    /**
+     Determine if PHP-FPM is configured correctly.
+     
+     For PHP 5.6, we'll check if `valet.sock` is included in the main `php-fpm.conf` file, but for more recent
+     versions of PHP, we can just check for the existence of the `valet-fpm.conf` file. If the check here fails,
+     that means that Valet won't work properly.
+     */
+    private func checkPhpFpmStatus() -> Bool {
+        if self.version.short == "5.6" {
+            // The main PHP config file should contain `valet.sock` and then we're probably fine?
+            let fileName = "\(Paths.etcPath)/php/5.6/php-fpm.conf"
+            return Shell.pipe("cat \(fileName)").contains("valet.sock")
+        }
+        
+        // Make sure to check if valet-fpm.conf exists. If it does, we should be fine :)
+        return Shell.fileExists("\(Paths.etcPath)/php/\(self.version.short)/php-fpm.d/valet-fpm.conf")
+    }
+    
+    // MARK: - Structs
+
+    /**
+     Struct containing information about the version number of the current PHP installation.
+     Also includes information about whether the install is considered "broken" or not.
+     If an error was found in the terminal output, `error` is set to `true` and the installation
+     can be considered broken. (The app will display this as well.)
+     */
+    struct Version {
+        var short = "???"
+        var long = "???"
+        var error = false
+    }
+    
+    /**
+     Struct containing information about the limits of the current PHP installation.
+     Includes: memory limit, max upload size and max post size.
+     */
+    struct Limits {
+        var memory_limit = "???"
+        var upload_max_filesize = "???"
+        var post_max_size = "???"
+    }
+    
+}

phpmon/Domain/PHP/PhpExtension.swift

@@ -29,6 +29,11 @@ class PhpExtension {
     /// Whether the extension has been enabled.
     var enabled: Bool
     
+    /// The file where this extension was located, but only the filename, not the full path to the .ini file.
+    var fileNameOnly: String {
+        return String(file.split(separator: "/").last ?? "php.ini")
+    }
+    
     /**
      This regular expression will allow us to identify lines which activate an extension.
      
@@ -41,7 +46,7 @@ class PhpExtension {
      
      - Note: Extensions that are disabled in a different way will not be detected. This is intentional.
      */
-    static let extensionRegex = #"^(extension=|zend_extension=|; extension=|; zend_extension=)"(?<name>[a-zA-Z]*).so"$"#
+    static let extensionRegex = #"^(extension|zend_extension|;(\s?)extension|;(\s?)zend_extension)(\s?)(=)(\s?)(?<name>["]?(?:\/?.\/?)+(?:\.so)"?)$"#
     
     /**
      When registering an extension, we do that based on the line found inside the .ini file.
@@ -52,7 +57,13 @@ class PhpExtension {
         let range = Range(match!.range(withName: "name"), in: line)!
         
         self.line = line
-        self.name = line[range]
+        
+        let fullPath = String(line[range])
+            .replacingOccurrences(of: "\"", with: "") // replace excess "
+            .replacingOccurrences(of: ".so", with: "") // replace excess .so
+        
+        self.name = String(fullPath.split(separator: "/").last!) // take last segment
+        
         self.enabled = !line.contains(";")
         self.file = file
     }
@@ -61,12 +72,15 @@ class PhpExtension {
      This simply toggles the extension in the .ini file. You may need to restart the other services in order for this change to apply.
      */
     func toggle() {
-        Actions.sed(
-            file: self.file,
-            original: self.line,
-            replacement: self.enabled ? "; \(self.line)" : self.line.replacingOccurrences(of: "; ", with: "")
-        )
-        self.enabled = !self.enabled
+        let newLine = enabled
+            // DISABLED: Commented out line
+            ? "; \(line)"
+            // ENABLED: Line where the comment delimiter (;) is removed
+            : line.replacingOccurrences(of: "; ", with: "")
+        
+        Actions.sed(file: file, original: line, replacement: newLine)
+        
+        enabled.toggle()
     }
     
     // MARK: - Static Methods
@@ -83,11 +97,12 @@ class PhpExtension {
         }
         
         return file!.components(separatedBy: "\n")
-            .filter({ (line) -> Bool in
-                return line.range(of: Self.extensionRegex, options: .regularExpression) != nil
-            })
-            .map { (line) -> PhpExtension in
-                return PhpExtension(line, file: path.path)
+            .filter {
+                return $0.range(of: Self.extensionRegex, options: .regularExpression) != nil
+            }
+            .map {
+                return PhpExtension($0, file: path.path)
             }
     }
+    
 }

phpmon/Domain/PHP/PhpInstallation.swift

@@ -0,0 +1,30 @@
+//
+//  PhpInstallation.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 28/11/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class PhpInstallation {
+    
+    var longVersion: String
+    
+    /**
+     In order to determine details about a PHP installation, we’ll simply run `php-config --version`
+     in the relevant directory.
+     */
+    init(_ version: String) {
+        let phpConfigExecutablePath = "\(Paths.optPath)/php@\(version)/bin/php-config"
+        self.longVersion = version
+        if Shell.fileExists(phpConfigExecutablePath) {
+            self.longVersion = Command.execute(
+                path: phpConfigExecutablePath,
+                arguments: ["--version"]
+            )
+        }
+    }
+    
+}

phpmon/Domain/Preferences/Keybinds/GlobalKeybindPreference.swift

@@ -0,0 +1,75 @@
+//
+//  GlobalKeybindPreference.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 15/04/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+struct GlobalKeybindPreference: Codable, CustomStringConvertible {
+    
+    // MARK: - Internal variables
+    
+    let function : Bool
+    let control : Bool
+    let command : Bool
+    let shift : Bool
+    let option : Bool
+    let capsLock : Bool
+    let carbonFlags : UInt32
+    let characters : String?
+    let keyCode : UInt32
+    
+    // MARK: - How the keybind is display in Preferences
+    
+    var description: String {
+        var stringBuilder = ""
+        if self.function {
+            stringBuilder += "Fn"
+        }
+        if self.control {
+            stringBuilder += "⌃"
+        }
+        if self.option {
+            stringBuilder += "⌥"
+        }
+        if self.command {
+            stringBuilder += "⌘"
+        }
+        if self.shift {
+            stringBuilder += "⇧"
+        }
+        if self.capsLock {
+            stringBuilder += "⇪"
+        }
+        if let characters = self.characters {
+            stringBuilder += characters.uppercased()
+        }
+        return "\(stringBuilder)"
+    }
+    
+    // MARK: - Persisting data to UserDefaults (as JSON)
+    
+    public func toJson() -> String {
+        let jsonData = try! JSONEncoder().encode(self)
+        return String(data: jsonData, encoding: .utf8)!
+    }
+    
+    public static func fromJson(_ string: String?) -> GlobalKeybindPreference? {
+        if string == nil {
+            return nil
+        }
+        
+        if let jsonData = string!.data(using: .utf8) {
+            let decoder = JSONDecoder()
+            do {
+                return try decoder.decode(GlobalKeybindPreference.self, from: jsonData)
+            } catch {
+                return nil
+            }
+        }
+        return nil
+    }
+}

phpmon/Domain/Preferences/Preferences.swift

@@ -0,0 +1,94 @@
+//
+//  Preferences.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 30/03/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+enum PreferenceName: String {
+    case wasLaunchedBefore = "launched_before"
+    case shouldDisplayDynamicIcon = "use_dynamic_icon"
+    case fullPhpVersionDynamicIcon = "full_php_in_menu_bar"
+    case autoServiceRestartAfterExtensionToggle = "auto_restart_after_extension_toggle"
+    case useInternalSwitcher = "use_phpmon_switcher"
+    case globalHotkey = "global_hotkey"
+}
+
+class Preferences {
+    
+    // MARK: - Singleton
+    
+    static var shared = Preferences()
+    
+    var cachedPreferences: [PreferenceName: Any?]
+    
+    public init() {
+        Preferences.handleFirstTimeLaunch()
+        cachedPreferences = Self.cache()
+    }
+    
+    // MARK: - First Time Run
+    
+    /**
+     Note: macOS seems to cache plist values in memory as well as in files.
+     You can find the persisted configuration file in: ~/Library/Preferences/com.nicoverbruggen.phpmon.plist
+     
+     To clear the cache, and get a first-run experience you may need to run:
+     ```
+     defaults delete com.nicoverbruggen.phpmon
+     killall cfprefsd
+     ```
+     */
+    static func handleFirstTimeLaunch() {
+        UserDefaults.standard.register(defaults: [
+            PreferenceName.shouldDisplayDynamicIcon.rawValue: true,
+            PreferenceName.fullPhpVersionDynamicIcon.rawValue: false,
+            PreferenceName.autoServiceRestartAfterExtensionToggle.rawValue: true,
+            PreferenceName.useInternalSwitcher.rawValue: false
+        ])
+        
+        if UserDefaults.standard.bool(forKey: PreferenceName.wasLaunchedBefore.rawValue) {
+            return
+        }
+        print("Saving first-time preferences!")
+        UserDefaults.standard.setValue(true, forKey: PreferenceName.wasLaunchedBefore.rawValue)
+        UserDefaults.standard.synchronize()
+    }
+    
+    // MARK: - API
+    
+    static var preferences: [PreferenceName: Any?] {
+        return Self.shared.cachedPreferences
+    }
+    
+    // MARK: - Internal Functionality
+    
+    static func cache() -> [PreferenceName: Any] {
+        return [
+            // Part 1: Always Booleans
+            .shouldDisplayDynamicIcon: UserDefaults.standard.bool(forKey: PreferenceName.shouldDisplayDynamicIcon.rawValue) as Any,
+            .fullPhpVersionDynamicIcon: UserDefaults.standard.bool(forKey: PreferenceName.fullPhpVersionDynamicIcon.rawValue) as Any,
+            .autoServiceRestartAfterExtensionToggle: UserDefaults.standard.bool(forKey: PreferenceName.autoServiceRestartAfterExtensionToggle.rawValue) as Any,
+            .useInternalSwitcher: UserDefaults.standard.bool(forKey: PreferenceName.useInternalSwitcher.rawValue) as Any,
+            
+            // Part 2: Always Strings
+            .globalHotkey: UserDefaults.standard.string(forKey: PreferenceName.globalHotkey.rawValue) as Any,
+        ]
+    }
+    
+    static func update(_ preference: PreferenceName, value: Any?) {
+        if (value == nil) {
+            UserDefaults.standard.removeObject(forKey: preference.rawValue)
+        } else {
+            UserDefaults.standard.setValue(value, forKey: preference.rawValue)
+        }
+        UserDefaults.standard.synchronize()
+        
+        // Update the preferences cache in memory!
+        Preferences.shared.cachedPreferences = Preferences.cache()
+    }
+    
+}

phpmon/Domain/Preferences/PrefsVC.swift

@@ -0,0 +1,108 @@
+//
+//  PrefsVC.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 30/03/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+import HotKey
+import Carbon
+
+class PrefsVC: NSViewController {
+    
+    // MARK: - Window Identifier
+    
+    @IBOutlet weak var stackView: NSStackView!
+    
+    // MARK: - Display
+    
+    public static func create(delegate: NSWindowDelegate?) {
+        let storyboard = NSStoryboard(name: "Main" , bundle : nil)
+        
+        let windowController = storyboard.instantiateController(
+            withIdentifier: "preferencesWindow"
+        ) as! PrefsWC
+        
+        windowController.window!.title = "prefs.title".localized
+        windowController.window!.subtitle = "prefs.subtitle".localized
+        windowController.window!.delegate = delegate
+        windowController.window!.styleMask = [.titled, .closable, .miniaturizable]
+        windowController.window!.delegate = windowController
+        windowController.positionWindowInTopLeftCorner()
+        
+        App.shared.preferencesWindowController = windowController
+    }
+    
+    public static func show(delegate: NSWindowDelegate? = nil) {
+        if (App.shared.preferencesWindowController == nil) {
+            Self.create(delegate: delegate)
+        }
+        
+        App.shared.preferencesWindowController!.showWindow(self)
+        NSApp.activate(ignoringOtherApps: true)
+    }
+    
+    // MARK: - Lifecycle
+    
+    override func viewDidLoad() {
+        [
+            CheckboxPreferenceView.make(
+                sectionText: "prefs.dynamic_icon".localized,
+                descriptionText: "prefs.dynamic_icon_desc".localized,
+                checkboxText: "prefs.dynamic_icon_title".localized,
+                preference: .shouldDisplayDynamicIcon,
+                action: {
+                    MainMenu.shared.refreshIcon()
+                }
+            ),
+            CheckboxPreferenceView.make(
+                sectionText: "",
+                descriptionText: "prefs.display_full_php_version_desc".localized,
+                checkboxText: "prefs.display_full_php_version".localized,
+                preference: .fullPhpVersionDynamicIcon,
+                action: {
+                    MainMenu.shared.refreshIcon()
+                    MainMenu.shared.update()
+                }
+            ),
+            CheckboxPreferenceView.make(
+                sectionText: "prefs.services".localized,
+                descriptionText: "prefs.auto_restart_services_desc".localized,
+                checkboxText: "prefs.auto_restart_services_title".localized,
+                preference: .autoServiceRestartAfterExtensionToggle,
+                action: {}
+            ),
+            /* DISABLED UNTIL VALET SWITCHING IS OK (see #34)
+            CheckboxPreferenceView.make(
+                sectionText: "",
+                descriptionText: "prefs.use_internal_switcher_desc".localized,
+                checkboxText: "prefs.use_internal_switcher".localized,
+                preference: .useInternalSwitcher,
+                action: {}
+            ), */
+            HotkeyPreferenceView.make(
+                sectionText: "prefs.global_shortcut".localized,
+                descriptionText: "prefs.shortcut_desc".localized,
+                self
+            )
+        ].forEach({ self.stackView.addArrangedSubview($0) })
+    }
+    
+    // MARK: - Listening for hotkey dleegate
+    
+    var listeningForHotkeyView: HotkeyPreferenceView? = nil
+    
+    override func viewWillDisappear() {
+        if listeningForHotkeyView !== nil {
+            listeningForHotkeyView = nil
+        }
+    }
+
+    // MARK: - Deinitialization
+    
+    deinit {
+        print("VC deallocated")
+    }
+}

phpmon/Domain/Preferences/PrefsWC.swift

@@ -0,0 +1,47 @@
+//
+//  PrefsWC.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 02/04/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+struct Keys {
+    static let Escape = 53
+    static let Space = 49
+}
+
+class PrefsWC: PMWindowController {
+    
+    // MARK: - Window Identifier
+    
+    override var windowName: String {
+        return "Preferences"
+    }
+    
+    // MARK: - Window Lifecycle
+    
+    override func windowDidLoad() {
+        super.windowDidLoad()
+    }
+    
+    // MARK: - Key Interaction
+    
+    override func keyDown(with event: NSEvent) {
+        super.keyDown(with: event)
+        
+        if let vc = contentViewController as? PrefsVC {
+            if vc.listeningForHotkeyView != nil {
+                if event.keyCode == Keys.Escape || event.keyCode == Keys.Space {
+                    print("A blacklisted key was pressed, canceling listen")
+                    vc.listeningForHotkeyView = nil
+                } else {
+                    vc.listeningForHotkeyView!.updateShortcut(event)
+                }
+            }
+        }
+    }
+    
+}