🐛 Remove which valet check

* develop:
  💰 Add funding option to GitHub
  📝 Update SECURITY

.github/FUNDING.yml

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

.gitignore

@@ -2,3 +2,4 @@ phpmon.xcodeproj/project.xcworkspace
 phpmon.xcodeproj/xcuserdata
 PHP Monitor.xcodeproj/project.xcworkspace
 PHP Monitor.xcodeproj/xcuserdata
+.DS_Store

PHP Monitor.xcodeproj/project.pbxproj

@@ -9,28 +9,75 @@
 /* Begin PBXBuildFile section */
 		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 */; };
 		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 /* PhpVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4A22B019FF00E7CF16 /* PhpVersion.swift */; };
+		C41C1B4B22B019FF00E7CF16 /* PhpInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4A22B019FF00E7CF16 /* PhpInstallation.swift */; };
 		C41C1B4D22B0215A00E7CF16 /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4C22B0215A00E7CF16 /* Actions.swift */; };
 		C42295DD2358D02000E263B2 /* Command.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42295DC2358D02000E263B2 /* Command.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 */; };
 		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 */; };
+		C474B00624C0E98C00066A22 /* LocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = C474B00524C0E98C00066A22 /* LocalNotification.swift */; };
 		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 */; };
+		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 */; };
+		C49EAB46259FC305007F6C3B /* Paths.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EAB45259FC305007F6C3B /* Paths.swift */; };
+		C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4ACA38E25C754C100060C66 /* PhpExtension.swift */; };
 		C4D8016622B1584700C6DA1B /* Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D8016522B1584700C6DA1B /* Startup.swift */; };
 		C4EE188422D3386B00E126E5 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE188322D3386B00E126E5 /* Constants.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 /* PhpInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4A22B019FF00E7CF16 /* PhpInstallation.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 */; };
 /* 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 */
 		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>"; };
 		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>"; };
@@ -39,17 +86,36 @@
 		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 /* PhpVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpVersion.swift; sourceTree = "<group>"; };
+		C41C1B4A22B019FF00E7CF16 /* PhpInstallation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpInstallation.swift; sourceTree = "<group>"; };
 		C41C1B4C22B0215A00E7CF16 /* Actions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Actions.swift; sourceTree = "<group>"; };
 		C42295DC2358D02000E263B2 /* Command.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Command.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>"; };
 		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>"; };
+		C474B00524C0E98C00066A22 /* LocalNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalNotification.swift; sourceTree = "<group>"; };
 		C476FF9722B0DD830098105B /* Alert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alert.swift; sourceTree = "<group>"; };
 		C4811D2322D70A4700B5F6B3 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = "<group>"; };
 		C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenu.swift; sourceTree = "<group>"; };
+		C48D0C8F25CC7FD000CC7490 /* StatsView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StatsView.xib; sourceTree = "<group>"; };
+		C48D0C9225CC804200CC7490 /* XibLoadable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XibLoadable.swift; sourceTree = "<group>"; };
+		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>"; };
+		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>"; };
 		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>"; };
+		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>"; };
 /* End PBXFileReference section */
@@ -62,6 +128,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C4F7807625D7F84B000DBC97 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -78,7 +151,11 @@
 			isa = PBXGroup;
 			children = (
 				C4F8C0A522D4FA41002EFE61 /* README.md */,
+				C4E713562570150F00007428 /* SECURITY.md */,
+				C4F7807425D7F7E5000DBC97 /* RELEASE.md */,
+				C4E713572570151400007428 /* docs */,
 				C41C1B3522B0097F00E7CF16 /* phpmon */,
+				C4F7807A25D7F84B000DBC97 /* phpmon-tests */,
 				C41C1B3422B0097F00E7CF16 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -87,6 +164,7 @@
 			isa = PBXGroup;
 			children = (
 				C41C1B3322B0097F00E7CF16 /* PHP Monitor.app */,
+				C4F7807925D7F84B000DBC97 /* phpmon-tests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -96,10 +174,7 @@
 			children = (
 				C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */,
 				C4EE188322D3386B00E126E5 /* Constants.swift */,
-				C4811D2622D70CEF00B5F6B3 /* Singletons */,
-				C41E181722CB61EB0072CF09 /* Classes */,
-				C41E181822CB62200072CF09 /* View Controllers */,
-				C4F8C0A222D4F100002EFE61 /* Extensions */,
+				C41E181722CB61EB0072CF09 /* Domain */,
 				C41C1B3F22B0098000E7CF16 /* Info.plist */,
 				C41C1B4022B0098000E7CF16 /* phpmon.entitlements */,
 				C41C1B3A22B0098000E7CF16 /* Assets.xcassets */,
@@ -109,67 +184,85 @@
 			path = phpmon;
 			sourceTree = "<group>";
 		};
-		C41E181722CB61EB0072CF09 /* Classes */ = {
+		C41E181722CB61EB0072CF09 /* Domain */ = {
 			isa = PBXGroup;
 			children = (
+				C4F7808A25D7F918000DBC97 /* Terminal */,
+				C4B13B1D25C4915000548C3A /* Core */,
 				C47331A0247093AC009A0597 /* Menu */,
-				C4811D2722D70D8E00B5F6B3 /* Commands */,
 				C4811D2822D70D9C00B5F6B3 /* Helpers */,
+				C4F8C0A222D4F100002EFE61 /* Extensions */,
 			);
-			path = Classes;
-			sourceTree = "<group>";
-		};
-		C41E181822CB62200072CF09 /* View Controllers */ = {
-			isa = PBXGroup;
-			children = (
-				C41C1B3C22B0098000E7CF16 /* Main.storyboard */,
-			);
-			path = "View Controllers";
+			path = Domain;
 			sourceTree = "<group>";
 		};
 		C47331A0247093AC009A0597 /* Menu */ = {
 			isa = PBXGroup;
 			children = (
+				C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */,
 				C47331A1247093B7009A0597 /* StatusMenu.swift */,
+				C48D0C9525CC80B100CC7490 /* HeaderView.swift */,
+				C48D0C9925CC888B00CC7490 /* HeaderView.xib */,
+				C48D0CA225CC992000CC7490 /* StatsView.swift */,
+				C48D0C8F25CC7FD000CC7490 /* StatsView.xib */,
 			);
 			path = Menu;
 			sourceTree = "<group>";
 		};
-		C4811D2622D70CEF00B5F6B3 /* Singletons */ = {
-			isa = PBXGroup;
-			children = (
-				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 */,
-				C41C1B4A22B019FF00E7CF16 /* PhpVersion.swift */,
 				C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */,
+				C474B00524C0E98C00066A22 /* LocalNotification.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
 		};
+		C4B13B1D25C4915000548C3A /* Core */ = {
+			isa = PBXGroup;
+			children = (
+				C41C1B3C22B0098000E7CF16 /* Main.storyboard */,
+				C4811D2322D70A4700B5F6B3 /* App.swift */,
+				C41C1B4A22B019FF00E7CF16 /* PhpInstallation.swift */,
+				C4ACA38E25C754C100060C66 /* PhpExtension.swift */,
+				C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */,
+			);
+			path = Core;
+			sourceTree = "<group>";
+		};
+		C4F7807A25D7F84B000DBC97 /* phpmon-tests */ = {
+			isa = PBXGroup;
+			children = (
+				C43A8A1F25D9D1D700591B77 /* brew.json */,
+				C4F780A725D80AE8000DBC97 /* php.ini */,
+				C4F7807D25D7F84B000DBC97 /* Info.plist */,
+				C4F7809B25D80344000DBC97 /* CommandTest.swift */,
+				C4F780AD25D80B37000DBC97 /* ExtensionParserTest.swift */,
+				C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.swift */,
+				C43A8A1925D9CD1000591B77 /* Utility.swift */,
+			);
+			path = "phpmon-tests";
+			sourceTree = "<group>";
+		};
+		C4F7808A25D7F918000DBC97 /* Terminal */ = {
+			isa = PBXGroup;
+			children = (
+				C49EAB45259FC305007F6C3B /* Paths.swift */,
+				C42295DC2358D02000E263B2 /* Command.swift */,
+				C41C1B4622B009A400E7CF16 /* Shell.swift */,
+				C4D8016522B1584700C6DA1B /* Startup.swift */,
+				C41C1B4C22B0215A00E7CF16 /* Actions.swift */,
+			);
+			path = Terminal;
+			sourceTree = "<group>";
+		};
 		C4F8C0A222D4F100002EFE61 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
 				C4F8C0A322D4F12C002EFE61 /* DateExtension.swift */,
 				C46FA23E246C358E00944F05 /* StringExtension.swift */,
+				C48D0C9225CC804200CC7490 /* XibLoadable.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -194,19 +287,41 @@
 			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;
-				LastUpgradeCheck = 1110;
+				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" */;
@@ -223,6 +338,7 @@
 			projectRoot = "";
 			targets = (
 				C41C1B3222B0097F00E7CF16 /* PHP Monitor */,
+				C4F7807825D7F84B000DBC97 /* phpmon-tests */,
 			);
 		};
 /* End PBXProject section */
@@ -234,9 +350,20 @@
 			files = (
 				C41C1B3B22B0098000E7CF16 /* Assets.xcassets in Resources */,
 				C41C1B3E22B0098000E7CF16 /* Main.storyboard in Resources */,
+				C48D0C9025CC7FD000CC7490 /* StatsView.xib in Resources */,
 				C405A4D124B9B9140062FAFA /* InternetAccessPolicy.plist in Resources */,
 				C473319F2470923A009A0597 /* Localizable.strings in Resources */,
 				C405A4D024B9B9140062FAFA /* InternetAccessPolicy.strings in Resources */,
+				C48D0C9A25CC888B00CC7490 /* HeaderView.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C4F7807725D7F84B000DBC97 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C4F780A825D80AE8000DBC97 /* php.ini in Resources */,
+				C43A8A2025D9D1D700591B77 /* brew.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -247,25 +374,72 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */,
 				C4D8016622B1584700C6DA1B /* Startup.swift in Sources */,
 				C4F8C0A422D4F12C002EFE61 /* DateExtension.swift in Sources */,
 				C41C1B4722B009A400E7CF16 /* Shell.swift in Sources */,
 				C41C1B4D22B0215A00E7CF16 /* Actions.swift in Sources */,
+				C48D0CA325CC992000CC7490 /* StatsView.swift in Sources */,
 				C42295DD2358D02000E263B2 /* Command.swift in Sources */,
 				C4811D2422D70A4700B5F6B3 /* App.swift in Sources */,
 				C41C1B4922B00A9800E7CF16 /* MenuBarImageGenerator.swift in Sources */,
+				C48D0C9325CC804200CC7490 /* XibLoadable.swift in Sources */,
 				C4811D2A22D70F9A00B5F6B3 /* MainMenu.swift in Sources */,
+				C412E5FC25700D5300A1FB67 /* HomebrewPackage.swift in Sources */,
 				C41C1B3722B0097F00E7CF16 /* AppDelegate.swift in Sources */,
-				C41C1B4B22B019FF00E7CF16 /* PhpVersion.swift in Sources */,
+				C41C1B4B22B019FF00E7CF16 /* PhpInstallation.swift in Sources */,
+				C49EAB46259FC305007F6C3B /* Paths.swift in Sources */,
 				C476FF9822B0DD830098105B /* Alert.swift in Sources */,
+				C474B00624C0E98C00066A22 /* LocalNotification.swift in Sources */,
+				C48D0C9625CC80B100CC7490 /* HeaderView.swift in Sources */,
 				C47331A2247093B7009A0597 /* StatusMenu.swift in Sources */,
 				C46FA23F246C358E00944F05 /* StringExtension.swift in Sources */,
 				C4EE188422D3386B00E126E5 /* Constants.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C4F7807525D7F84B000DBC97 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C4F780C425D80B75000DBC97 /* MainMenu.swift in Sources */,
+				C4F780C825D80B75000DBC97 /* DateExtension.swift in Sources */,
+				C4F780CC25D80B75000DBC97 /* PhpInstallation.swift in Sources */,
+				C4F780B125D80B4D000DBC97 /* PhpExtension.swift in Sources */,
+				C4F780CE25D80B75000DBC97 /* LocalNotification.swift in Sources */,
+				C43A8A2425D9D20D00591B77 /* BrewJsonParserTest.swift in Sources */,
+				C4F780CA25D80B75000DBC97 /* HomebrewPackage.swift in Sources */,
+				C4F780C025D80B6E000DBC97 /* Startup.swift in Sources */,
+				C4F780AE25D80B37000DBC97 /* ExtensionParserTest.swift in Sources */,
+				C4F780C725D80B75000DBC97 /* StatusMenu.swift in Sources */,
+				C4F780CD25D80B75000DBC97 /* Alert.swift in Sources */,
+				C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */,
+				C4F780BA25D80B62000DBC97 /* AppDelegate.swift in Sources */,
+				C4F780A225D804AA000DBC97 /* Paths.swift in Sources */,
+				C4F780BD25D80B65000DBC97 /* Constants.swift in Sources */,
+				C4F780C325D80B75000DBC97 /* HeaderView.swift in Sources */,
+				C4F7809625D7FBF8000DBC97 /* Shell.swift in Sources */,
+				C4F780C525D80B75000DBC97 /* MenuBarImageGenerator.swift in Sources */,
+				C4F780B725D80B5D000DBC97 /* App.swift in Sources */,
+				C4F780C925D80B75000DBC97 /* StringExtension.swift in Sources */,
+				C4F780CB25D80B75000DBC97 /* StatsView.swift in Sources */,
+				C43A8A1A25D9CD1000591B77 /* Utility.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;
@@ -304,6 +478,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -365,6 +540,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -401,7 +577,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = phpmon/Info.plist;
@@ -409,7 +585,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.2;
+				MARKETING_VERSION = 3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -425,7 +601,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = phpmon/Info.plist;
@@ -433,7 +609,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.2;
+				MARKETING_VERSION = 3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -441,6 +617,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.1;
+				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.1;
+				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 */
@@ -462,6 +680,15 @@
 			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 */
 	};
 	rootObject = C41C1B2B22B0097F00E7CF16 /* Project object */;

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -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
@@ -39,6 +49,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

README.md

@@ -1,24 +1,31 @@
 # PHP Monitor
 
+> ⭐️ If this software has been useful to you, all I ask is that you **please star the repository**, so I know that the software is being used. You can also send me  [feedback](https://twitter.com/nicoverbruggen) if the app came in handy. Thank you! 😃
+
 <img src="./phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png" alt="phpmon icon" width="128px" />
 
 PHP Monitor (or phpmon) is a lightweight macOS utility app that runs on your Mac and displays the active PHP version in your status bar.
 
-It also gives you quick access to various useful functionality (like switching PHP versions, restarting services, accessing configuration files, and more).
+<img src="./docs/screenshot.png" width="389px" alt="phpmon screenshot (menu bar app)"/>
 
-<img src="./docs/screenshot.png" width="278px" alt="phpmon screenshot"/>
+<small><i>Screenshot: A menu showing all of the functionality of PHP Monitor.</i></small>
 
-For me, it comes in handy when running multiple versions of PHP with Homebrew. If you wish to be able to see at a glance which version is currently linked & active with Laravel Valet, PHP Monitor is your new best friend. 
+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 also super convenient to and switch between versions.
+<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).
 
 ## 🖥 System requirements
 
-* macOS 10.15 Catalina or higher (works on macOS 11 Big Sur)
-* PHP 7.4 installed with Homebrew 2.x
-* Laravel Valet 2.x
+PHP Monitor is a universal application that runs on Apple Silicon **and** Intel-based Macs.
 
-_Please note that future versions of PHP will not work automatically, minor changes are required to add support for newer versions of PHP._
+* macOS 10.14 Mojave or higher (works on macOS 11 Big Sur)
+* 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
+
+_You may need to update your Valet installation to keep everything working if a major version update of PHP has been released._
 
 ## 🚀 How to install
 
@@ -26,20 +33,175 @@ You can install via Homebrew, or may download the latest [release](https://githu
 
 To install via Homebrew, run:
 
-    brew tap nicoverbruggen/homebrew-cask
-    brew cask install phpmon
+	brew tap nicoverbruggen/homebrew-cask
+	brew install --cask phpmon
 
-## 👨‍💻 Why I built this
+To upgrade your existing installation, run:
 
-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. 
+	brew upgrade phpmon
 
-Initially, I had an Alfred workflow for this. But this does the job as well, while also showing me at all times which version of PHP is linked (which is the main benefit over e.g. an Alfred workflow).
+_The app is signed and notarized, meaning all you have to do is approve its first launch._
+
+## 👨‍💻 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. 
+
+Initially, I had an Alfred workflow for this — but it has now been replaced with this utility, which also does a good job at displaying additional information at a glance, like the current PHP version, memory limits, and more.
+
+## 🤬 The app won't start?!
+
+PHP Monitor performs some integrity checks to ensure a good experience when using the app. You'll get a message telling you that PHP Monitor won't work correctly in a variety of scenarios. 
+
+**Follow instructions as specified in the alert in order to resolve any issues.**
+
+## 🙋‍♂️ FAQ & Troubleshooting
+
+> If you are having issues, the first thing you should be doing is installing the latest version of PHP Monitor _and_ Laravel Valet. This can resolve a variety of issues. To upgrade Valet, run `composer global update`. Don't forget to run `valet install` after upgrading.
+
+If you're still having issues, here's a few common issues and solutions:
+
+<details>
+<summary><strong>I want PHP Monitor to start up when I boot my Mac!</strong></summary>
+
+You can do this by dragging *PHP Monitor.app* into the **Login Items** section in **System Preferences > Users & Groups** for your account.
+
+Super convenient!
+</details>
+
+<details>
+<summary><strong>I want to set up PHP Monitor from scratch! I don't have Homebrew installed either, where do I begin?</strong></summary>
+
+If you want to set up your computer for the very first time with PHP Monitor, here's how I do it:
+
+Install [Homebrew](https://brew.sh) first.
+
+Install PHP, composer, add to path:
+
+    brew install php
+    brew install composer
+    nano .zshrc
+
+Make sure the following line is not in the comments:
+
+    # on an Intel Mac
+    export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+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:
+
+    export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH
+
+Make sure PHP is linked correctly:
+
+    which php
+
+should return: `/usr/local/bin/php` (or `/opt/homebrew/bin/php`)
+
+    composer global require laravel/valet
+    valet install
+
+This should install `dnsmasq` and set up Valet. Great, almost there!
+
+    valet trust
+
+Finally, run PHP Monitor. Since the app is notarized and signed with a developer ID, it should work.
+</details>
+
+<details>
+<summary><strong>PHP Monitor tells me `php` is not installed...</strong></summary>
+
+Try installing again using `brew install php`. 
+
+This should resolve the issue! If that does not fix the issue, run `brew link php --force`. (Afterwards, you may need to restart your terminal to make sure the new linked version is detected.)
+
+	brew install php
+	brew link php --force
+	
+</details>
+
+<details>
+<summary><strong>Valet sites won't load. I'm getting a 502 Bad Gateway error!</strong></summary>
+
+If you're visiting your `.test` domain, and you're getting a 502 (Bad Gateway) after switching to a different PHP version, you're dealing with a common issue.
+
+This problem is usually resolved by upgrading Valet and running `valet install` again.
+
+	composer global update
+	valet install
+
+</details>
+	
+<details>
+<summary><strong>One of the limits (memory limit, max POST size, max upload size) shows an exclamation mark!</strong></summary>
+
+The value you provided in your INI file is invalid. If that is the case, PHP will attempt to parse your value as bytes, which is usually unintended. (`1GB` will resolve to merely a few bytes, and all of your applications will run out of memory!)
+
+You must a provide a value like so: `1024K`, `256M`, `1G`. Alternatively, `-1` is also allowed, or just an integer (which will result in N amount of bytes being the limit).
+
+**Example**: Trying to use `1GB` as the memory limit, for example, will result in this exclamation mark. The correct way to set a 1GB limit is by using `1G` as the value. (Note: The displayed value will append `B` for clarity, so if you set `1G`, the value reported by PHP Monitor will be 1 GB.)
+
+</details>
+
+<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:
+
+* `extension="*.so"`
+* `; extension="*.so"`
+
+For Zend extensions:
+
+* `zend_extension="*.so"`
+* `; 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.
+</details>
+
+<details>
+<summary><strong>I've got two Homebrew installations on my Apple Silicon Mac, can I choose which installation to use with PHP Monitor?</strong></summary>
+
+Not at this time, no. PHP Monitor will prefer the `/opt/homebrew` installation over the classic installation directory.
+
+</details>
+
+<details>
+<summary><strong>Why is the app doing network requests?</strong></summary>
+
+It's Homebrew. I can't prevent `brew` from doing things via the network when I invoke it.
+
+PHP Monitor itself doesn't do any network requests. Feel free to check the source code or intercept the traffic, if you don't believe me.
+
+</details>
+
+<details>
+<summary><strong>After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade`!</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. 
+
+You will need to manually clean up those folders yourself using `rm -rf` or by manually removing those folders via Finder.
+
+</details>
+
+## 📝 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).
 
 ## 🚜 How it works
 
-### Version detection
+### Loading info about PHP in the background
 
-This utility runs `php -r 'print phpversion()'` in the background periodically (every 60 seconds).
+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). 
+
+In order to save power, this only happens once every 60 seconds.
 
 ### Switching PHP versions
 
@@ -47,17 +209,17 @@ This utility will detect which PHP versions you have installed via Homebrew, and
 
 This means:
 
-- You have at least the latest version of PHP installed (`php@7.4`)
+- 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 PHP 7.4 (this is done in order to ensure that Valet works, even when attempting to use PHP 5.6)
-- Stop all php-fpm service instances
+- 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-fpm service for the desired PHP version
+- Start the correct `php` service for the desired PHP version
 
 ### Want to know more?
 
@@ -65,25 +227,15 @@ If you want to know more about how this works, I recommend you check out the sou
 
 This app isn't very complicated after all. In the end, this just (conveniently) executes some shell commands.
 
-## 🤬 Troubleshooting
+## 🔧 Build instructions
 
-**If you are having issues, the first thing you should be doing is installing the latest version of PHP Monitor. This can resolve a variety of issues.**
+<img src="./docs/build.png" width="320px" alt="build button in Xcode"/>
 
-PHP Monitor performs some integrity checks to ensure a good experience when using the app. You'll get a message telling you that PHP Monitor won't work correctly in the following scenarios:
+If you'd like to build PHP Monitor yourself, you need:
 
-- The PHP binary is not located in `/usr/local/bin/php`
-- PHP 7.4 is missing in `/usr/local/opt`
-- Laravel Valet is missing in `/usr/local/bin/valet`
-- Brew has not been added to sudoers in `/private/etc/sudoers.d/brew`
-- Valet has not been added to sudoers in `/private/etc/sudoers.d/valet`
-- Multiple PHP services are active (see more info below)
+* Xcode (usually the latest version)
+* The contents of this repository
 
-Follow instructions as specified in the alert in order to resolve any issues.
+Once you have downloaded this repository, open `PHP Monitor.xcodeproj`, and you should be able to immediately build the app for your system by pressing Cmd-R. This will create a debug build. (If Xcode complains about code signing, you can turn it off.)
 
-## 📝 Additional information
-
-Please consult the [additional information](docs/ADDITIONAL.md) file that contains more information.
-
-## ⭐️ Is this helpful?
-
-If this software has been useful to you, star the repository so I know that the software is being used. I did not include any tracking or analytics software, so if you encounter issues, let me know via an issue.
+If you'd like to create a production build, choose "Any Mac" as the target and select Product > Archive.

RELEASE.md

@@ -0,0 +1,13 @@
+# Release Procedure
+
+1. Merge into `main`
+2. Create tag
+3. Add changes to changelog + update security document
+4. Archive
+5. Notarize and prepare for own distribution
+6. After notarization, export .app
+7. Create zipped version
+8. Calculate SHA256: `openssl dgst -sha256 phpmon.zip`
+9. Upload to GitHub and add to tagged release
+10. Update Cask with new version + hash
+11. Check new version can be installed via Cask

SECURITY.md

@@ -0,0 +1,17 @@
+# Security Policy
+
+## Supported versions
+
+Generally speaking, only the latest version of **PHP Monitor** is supported:
+
+| Version | Apple Silicon | Supported          | Supported macOS | Deployment Target |
+| ------- | ------------- | ------------------ | ----- | ----- |
+| 3.x     | ✅ 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+ |
+
+## Reporting a vulnerability
+
+Contact me (Nico Verbruggen) at the email address used for the commits in the repository. Please include "PHP Monitor" in the subject.

assets/icon.svg

@@ -0,0 +1 @@
+<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><filter x="-4.6%" y="-3.4%" width="109.2%" height="109.2%" filterUnits="objectBoundingBox" id="b"><feOffset dy="5" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.26 0" in="shadowBlurOuter1"/></filter><filter x="-8.6%" y="-11%" width="117.1%" height="121.9%" filterUnits="objectBoundingBox" id="d"><feOffset dx="1" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="6.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.372049825 0" in="shadowBlurOuter1" result="shadowMatrixOuter1"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="SourceGraphic"/></feMerge></filter><linearGradient x1="50.023%" y1="-15.482%" x2="50.023%" y2="104.493%" id="e"><stop stop-color="#51C2FB" offset=".053%"/><stop stop-color="#1C91FE" offset="100%"/></linearGradient><path d="M167.939 50H344.06c41.01 0 55.881 4.27 70.874 12.288 14.992 8.018 26.759 19.785 34.777 34.777C457.73 112.058 462 126.93 462 167.94V344.06c0 41.01-4.27 55.881-12.288 70.874-8.018 14.992-19.785 26.759-34.777 34.777C399.942 457.73 385.07 462 344.06 462H167.94c-41.01 0-55.881-4.27-70.874-12.288-14.992-8.018-26.759-19.785-34.777-34.777C54.27 399.942 50 385.07 50 344.06V167.94c0-41.01 4.27-55.881 12.288-70.874 8.018-14.992 19.785-26.759 34.777-34.777C112.058 54.27 126.93 50 167.94 50z" id="a"/></defs><g fill="none" fill-rule="evenodd"><mask id="c" fill="#fff"><use xlink:href="#a"/></mask><use filter="url(#b)" xlink:href="#a" fill-rule="nonzero" fill="#000"/><g mask="url(#c)"><path fill="#FFF" d="M50 50h412v412H50z"/></g><g filter="url(#d)" mask="url(#c)"><path fill="#FFF" d="M131.535 155.144l63.377-8.907 33.68 239.645-63.377 8.907zM315.79 263.497l63.377-8.907 15.17 107.94-63.377 8.906z"/><path fill="#FFF" d="M315.79 263.497l63.377-8.907 15.17 107.94-63.377 8.906z"/><path fill="#FFF" d="M316.01 173.224l84.001 68.319-53.919 66.92-84-68.318z"/><path fill="#FFF" d="M93.155 157.813l164.384-23.102 21.433 152.5-164.385 23.104z"/><path d="M133.3 83.75h-12.9V54.437c0-2.303-1.935-4.187-4.3-4.187h-8.6c-2.365 0-4.3 1.884-4.3 4.188v41.874c0 2.304 1.935 4.188 4.3 4.188h25.8c2.365 0 4.3-1.884 4.3-4.188v-8.374c0-2.304-1.935-4.188-4.3-4.188zm202.1 100.5h-8.6v-56.584c0-6.647-2.741-13.033-7.579-17.744L265.525 57.63c-4.837-4.71-11.395-7.38-18.221-7.38H223.6V25.125C223.6 11.254 212.044 0 197.8 0h-172C11.556 0 0 11.254 0 25.125v167.5c0 13.871 11.556 25.125 25.8 25.125h8.6C34.4 245.492 57.513 268 86 268c28.487 0 51.6-22.508 51.6-50.25h68.8c0 27.742 23.112 50.25 51.6 50.25 28.488 0 51.6-22.508 51.6-50.25h25.8c4.73 0 8.6-3.769 8.6-8.375v-16.75c0-4.606-3.87-8.375-8.6-8.375zM86 242.875c-14.244 0-25.8-11.254-25.8-25.125s11.556-25.125 25.8-25.125c14.244 0 25.8 11.254 25.8 25.125s-11.556 25.125-25.8 25.125zm25.8-92.125c-33.271 0-60.2-26.224-60.2-58.625 0-32.4 26.929-58.625 60.2-58.625S172 59.724 172 92.125c0 32.4-26.929 58.625-60.2 58.625zM258 242.875c-14.244 0-25.8-11.254-25.8-25.125s11.556-25.125 25.8-25.125c14.244 0 25.8 11.254 25.8 25.125s-11.556 25.125-25.8 25.125zM301 134h-77.4V75.375h23.704L301 127.666V134z" fill="url(#e)" fill-rule="nonzero" transform="rotate(-8 1129.292 -453.38)"/></g></g></svg>

assets/menubar.svg

@@ -0,0 +1 @@
+<svg width="22" height="22" xmlns="http://www.w3.org/2000/svg"><path d="M8.975 8.375H8.3V6.844a.223.223 0 00-.225-.219h-.45a.223.223 0 00-.225.219V9.03c0 .12.101.219.225.219h1.35a.223.223 0 00.225-.219v-.437a.223.223 0 00-.225-.219zm10.575 5.25h-.45v-2.956c0-.347-.143-.68-.397-.927l-2.81-2.731a1.37 1.37 0 00-.953-.386H13.7V5.312C13.7 4.588 13.095 4 12.35 4h-9C2.605 4 2 4.588 2 5.313v8.75c0 .724.605 1.312 1.35 1.312h.45C3.8 16.825 5.01 18 6.5 18c1.49 0 2.7-1.176 2.7-2.625h3.6c0 1.45 1.21 2.625 2.7 2.625 1.49 0 2.7-1.176 2.7-2.625h1.35c.247 0 .45-.197.45-.438v-.874a.445.445 0 00-.45-.438zM6.5 16.688c-.745 0-1.35-.588-1.35-1.313s.605-1.313 1.35-1.313c.745 0 1.35.588 1.35 1.313s-.605 1.313-1.35 1.313zm1.35-4.813c-1.74 0-3.15-1.37-3.15-3.063C4.7 7.12 6.11 5.75 7.85 5.75S11 7.12 11 8.813c0 1.692-1.41 3.062-3.15 3.062zm7.65 4.813c-.745 0-1.35-.588-1.35-1.313s.605-1.313 1.35-1.313c.745 0 1.35.588 1.35 1.313s-.605 1.313-1.35 1.313zM17.75 11H13.7V7.937h1.24l2.81 2.732V11z" fill="#000" fill-rule="nonzero"/></svg>

docs/ADDITIONAL.md

@@ -1,99 +0,0 @@
-### Q&A
-
-#### Q: This app is doing network requests?
-
-It's Homebrew. I can't prevent `brew` from doing things via the network when I invoke it.
-
-PHP Monitor itself doesn't do any network requests. Feel free to check the source code or intercept the traffic, if you don't believe me.
-
-#### Q: How can I set this up on a fresh Mac?
-
-If you want to set up your computer for the very first time, here's how I do it:
-
-Install [Homebrew](https://brew.sh) first.
-
-Install PHP, composer, add to path:
-
-    brew install php
-    brew install composer
-    nano .zshrc
-
-Make sure the following line is not in the comments:
-
-    export PATH=$HOME/bin:/usr/local/bin:$PATH
-
-and add the following to your .zshrc:
-
-    export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH
-
-Make sure PHP is linked correctly:
-
-    which php
-
-should return: `/usr/local/bin/php`
-
-    composer global require laravel/valet
-    valet install
-
-This should install `dnsmasq` and set up Valet. Great, almost there!
-
-    valet trust
-
-Finally, run PHP Monitor. Since the app is notarized and signed with a developer ID, it should work.
-
-#### Q: I want PHP Monitor to start up when I boot my Mac!
-
-You can do this by dragging *PHP Monitor.app* into the **Login Items** section in **System Preferences > Users & Groups** for your account.
-
-Super convenient!
-
-#### Q: PHP Monitor says that the latest version of PHP is not installed, but it is!
-
-Try installing again using `brew install php@7.4`. 
-
-This should resolve the issue.
-
-#### Q: PHP Monitor reports another version compared to phpinfo on my local website, what is going on?
-
-_Beginning with version 2.0 you'll get alerts about this at startup._
-
-If you're still seeing another version of PHP in your scripts running on your local webserver (nginx) — e.g. when running `phpinfo()` — I recommend you shut down all PHP services that are currently active. You can find out what services are active by running:
-
-    sudo brew services list | grep php
-
-This will present to you a list of services, like so (depending on the installed versions of PHP):
-
-```
-php           started root /Library/LaunchDaemons/homebrew.mxcl.php.plist
-php@5.6       stopped
-php@7.0       stopped
-php@7.1       stopped
-php@7.2       stopped
-php@7.3       stopped
-```
-
-You'll want to make sure that **only one service is running** and that it is running **as `root`**. You can terminate a service by running:
-
-    sudo brew services stop {service_name}
-
-So in order to disable PHP 7.3, you'd need to run:
-
-    sudo brew services stop php@7.3
-
-If you notice that PHP FPM is running as your own user account, you can turn off the service by running:
-
-    brew services stop php@7.3
-
-The easiest way to make sure that PHP Monitor works again is to run the following commands:
-
-    sudo brew services stop php
-    sudo brew services stop php@7.3
-    sudo brew services stop php@7.2
-    sudo brew services stop php@7.1
-    sudo brew services stop php@7.0
-    sudo brew services stop php@5.6
-    sudo brew services stop nginx
-
-Then, in PHP Monitor, select "Restart php-fpm service", which should start the service. 
-
-Alternatively, you can run `sudo brew services start php@7.4` where `7.4` is your preferred version of PHP (for the latest version of PHP, you may omit `@7.4` like in the example above).

docs/RELEASE.md

@@ -1,13 +0,0 @@
-# Release Procedure
-
-1. Merge into `master`
-2. Create tag
-3. Add changes to changelog
-4. Archive
-5. Notarize and prepare for own distribution
-6. After notarization, export .app
-7. Create zipped version
-8. Calculate SHA256: `openssl dgst -sha256 phpmon-2.x.zip`
-9. Upload to GitHub
-10. Update Cask
-11. Check new version can be installed via Cask

phpmon-tests/BrewJsonParserTest.swift

@@ -0,0 +1,28 @@
+//
+//  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")
+    }
+
+}

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,56 @@
+//
+//  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)
+        
+        XCTAssertEqual(extensions.first!.name, "xdebug")
+        XCTAssertEqual(extensions.last!.name, "imagick")
+    }
+    
+    func testExtensionStatusIsCorrect() throws {
+        let extensions = PhpExtension.load(from: Self.phpIniFileUrl)
+        
+        XCTAssertEqual(extensions.first!.enabled, true)
+        XCTAssertEqual(extensions.last!.enabled, false)
+    }
+    
+    func testToggleWorksAsExpected() throws {
+        let destination = Utility.copyToTemporaryFile(resourceName: "php", fileExtension: "ini")!
+        let extensions = PhpExtension.load(from: destination)
+        XCTAssertEqual(extensions.count, 2)
+        
+        // Try to disable it!
+        let xdebug = extensions.first!
+        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/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/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/AppDelegate.swift

@@ -2,38 +2,79 @@
 //  AppDelegate.swift
 //  PHP Monitor
 //
-//  Created by Nico Verbruggen on 11/06/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
+import UserNotifications
 
 @NSApplicationMain
-class AppDelegate: NSObject, NSApplicationDelegate {
+class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDelegate {
     
     // MARK: - Variables
     
+    /**
+     The Shell singleton that keeps track of the history of all
+     (invoked by PHP Monitor) shell commands. It is used to
+     invoke all commands in this application.
+     */
     let sharedShell : Shell
+    
+    /**
+     The App singleton contains information about the state of
+     the application and global variables.
+     */
     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
     
+    /**
+     The paths singleton that determines where Homebrew is installed,
+     and where to look for binaries.
+     */
+    let paths : Paths
+    
     // MARK: - Initializer
     
+    /**
+     When the application initializes, create all singletons.
+     */
     override init() {
         self.sharedShell = Shell.user
         self.state = App.shared
         self.menu = MainMenu.shared
+        self.paths = Paths.shared
         super.init()
     }
     
     // MARK: - Lifecycle
-
+    
+    /**
+     When the application has finished launching, we'll want to set up
+     the user notification center delegate, and kickoff the menu
+     startup procedure.
+     */
     func applicationDidFinishLaunching(_ aNotification: Notification) {
+        NSUserNotificationCenter.default.delegate = self
         self.menu.startup()
     }
     
-    func applicationWillTerminate(_ aNotification: Notification) {
-        self.state.windowController = nil
+    // 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/Classes/Commands/Actions.swift

@@ -1,132 +0,0 @@
-//
-//  Services.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 11/06/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-import AppKit
-
-class Actions {
-    
-    public static func detectPhpVersions() -> [String] {
-        let files = Shell.user.pipe("ls /usr/local/opt | 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])
-        }
-        return versionsOnly
-    }
-    
-    public static func restartPhpFpm() {
-        let version = App.shared.currentVersion!.short
-        if (version == Constants.LatestPhpVersion) {
-            Shell.user.run("sudo brew services restart php")
-        } else {
-            Shell.user.run("sudo brew services restart php@\(version)")
-        }
-    }
-    
-    public static func restartNginx()
-    {
-        Shell.user.run("sudo brew services restart nginx")
-    }
-    
-    public static func switchToPhpVersion(version: String, availableVersions: [String]) {
-        availableVersions.forEach { (version) in
-            // Unlink the current version
-            Shell.user.run("brew unlink php@\(version)")
-            // Stop the services
-            if (version == Constants.LatestPhpVersion) {
-                Shell.user.run("sudo brew services stop php")
-            } else {
-                Shell.user.run("sudo brew services stop php@\(version)")
-            }
-        }
-        if (availableVersions.contains(Constants.LatestPhpVersion)) {
-            // Use the latest version as a default
-            Shell.user.run("brew link php@\(Constants.LatestPhpVersion) --overwrite --force")
-            if (version == Constants.LatestPhpVersion) {
-                // If said version was also requested, all we need to do is start the service
-                Shell.user.run("sudo brew services start php")
-            } else {
-                // Otherwise, link the correct php version + start the correct service
-                Shell.user.run("brew link php@\(version) --overwrite --force")
-                Shell.user.run("sudo brew services start php@\(version)")
-            }
-        }
-    }
-    
-    public static func openGenericPhpConfigFolder() {
-        let files = [NSURL(fileURLWithPath: "/usr/local/etc/php")];
-        NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
-    }
-    
-    public static func openPhpConfigFolder(version: String) {
-        let files = [NSURL(fileURLWithPath: "/usr/local/etc/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])
-    }
-    
-    public static func didFindXdebug(_ version: String) -> Bool {
-        let command = """
-        grep -q 'zend_extension="xdebug.so"' /usr/local/etc/php/\(version)/php.ini; [ $? -eq 0 ] && echo "YES" || echo "NO"
-        """
-        let output = Shell.user.pipe(command).trimmingCharacters(in: .whitespacesAndNewlines)
-        return (output == "YES")
-    }
-    
-    public static func didEnableXdebug(_ version: String) -> Bool {
-        let command = """
-        grep -q '; zend_extension="xdebug.so"' /usr/local/etc/php/\(version)/php.ini; [ $? -eq 0 ] && echo "YES" || echo "NO"
-        """
-        let output = Shell.user.pipe(command).trimmingCharacters(in: .whitespacesAndNewlines)
-        return (output == "NO")
-    }
-    
-    public static func toggleXdebug() {
-        let version = App.shared.currentVersion?.short
-        var command = """
-        sed -i '' 's/; zend_extension="xdebug.so"/zend_extension="xdebug.so"/g' /usr/local/etc/php/\(version!)/php.ini
-        """
-        if (self.didEnableXdebug(version!)) {
-            command = """
-            sed -i '' 's/zend_extension="xdebug.so"/; zend_extension="xdebug.so"/g' /usr/local/etc/php/\(version!)/php.ini
-            """
-        }
-        Shell.user.run(command)
-    }
-    
-    // unlink all the crap and link the latest version
-    // this also restarts all services
-    public static func fixMyPhp() {
-        let versions = self.detectPhpVersions()
-        versions.forEach { (version) in
-            Shell.user.run("brew unlink php@\(version)")
-            if (version == Constants.LatestPhpVersion) {
-                Shell.user.run("brew services stop php")
-                Shell.user.run("sudo brew services stop php")
-            } else {
-                Shell.user.run("brew services stop php@\(version)")
-                Shell.user.run("sudo brew services stop php@\(version)")
-            }
-        }
-        Shell.user.run("brew services stop php")
-        Shell.user.run("brew services stop nginx")
-        Shell.user.run("brew link php")
-        Shell.user.run("sudo brew services restart php")
-        Shell.user.run("sudo brew services restart nginx")
-    }
-}

phpmon/Classes/Commands/Startup.swift

@@ -1,112 +0,0 @@
-//
-//  Environment.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 12/06/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-class Startup {
-    
-    public var failed : Bool = false
-    public var failureCallback = {}
-    
-    /**
-     Checks the user's environment and checks if PHP Monitor can be used properly.
-     This checks if PHP is installed, Valet is running, the appropriate permissions are set, and more.
-     
-     - Parameter success: Callback that is fired if the application can proceed with launch
-     - Parameter failure: Callback that is fired if the application must retry launch
-     */
-    public func checkEnvironment(success: () -> Void, failure: @escaping () -> Void)
-    {
-        self.failureCallback = failure
-        
-        self.performEnvironmentCheck(
-            !Shell.user.pipe("which php").contains("/usr/local/bin/php"),
-            messageText: "PHP is not correctly installed",
-            informativeText: "You must install PHP via brew. Try running `which php` in Terminal, it should return `/usr/local/bin/php`. The app will not work correctly until you resolve this issue. (Usually `brew link php` resolves this issue.)",
-            breaking: true
-        )
-        
-        self.performEnvironmentCheck(
-            !Shell.user.pipe("ls /usr/local/opt | grep php@7.4").contains("php@7.4"),
-            messageText: "PHP 7.4 is not correctly installed",
-            informativeText: "PHP 7.4 alias was not found in `/usr/local/opt`. The app will not work correctly until you resolve this issue. If you already have the `php` formula installed, you may need to run `brew install php@7.4` in order for PHP Monitor to detect this installation.",
-            breaking: true
-        )
-        
-        self.performEnvironmentCheck(
-            !Shell.user.pipe("which valet").contains("/usr/local/bin/valet"),
-            messageText: "Laravel Valet is not correctly installed",
-            informativeText: "You must install Valet with composer. Try running `which valet` in Terminal, it should return `/usr/local/bin/valet`. The app will not work correctly until you resolve this issue.",
-            breaking: true
-        )
-        
-        self.performEnvironmentCheck(
-            !Shell.user.pipe("cat /private/etc/sudoers.d/brew").contains("/usr/local/bin/brew"),
-            messageText: "Brew has not been added to sudoers.d",
-            informativeText: "You must run `sudo valet trust` to ensure Valet can start and stop services without having to use sudo every time. The app will not work correctly until you resolve this issue.",
-            breaking: true
-        )
-        
-        self.performEnvironmentCheck(
-            !Shell.user.pipe("cat /private/etc/sudoers.d/valet").contains("/usr/local/bin/valet"),
-            messageText: "Valet has not been added to sudoers.d",
-            informativeText: "You must run `sudo valet trust` to ensure Valet can start and stop services without having to use sudo every time. The app will not work correctly until you resolve this issue.",
-            breaking: true
-        )
-        
-        let services = Shell.user.pipe("brew services list | grep php")
-        self.performEnvironmentCheck(
-            (services.countInstances(of: "started") > 1),
-            messageText: "Multiple PHP services are active",
-            informativeText: "This can cause php-fpm to serve a more recent version of PHP than the one you'd like to see active. Please terminate all extra PHP processes." +
-            "\n\nThe easiest solution is to choose the option 'Force load latest PHP version' in the menu bar." +
-            "\n\nAlternatively, you can fix this manually. You can do this by running `brew services list` and running `sudo brew services stop php@7.3` (and use the version that applies)." +
-            "\n\nPHP Monitor usually handles the starting and stopping of these services, so once the correct version is the only PHP version running you should not have any issues. It is recommended to restart PHP Monitor once you have resolved this issue." +
-            "\n\nFor more information about this issue, please see the README.md file in the repository on GitHub.",
-            breaking: false
-        )
-        
-        if (!self.failed) {
-            success()
-        }
-    }
-    
-    /**
-     * Perform an environment check. Will cause the application to terminate, if `breaking` is set to true.
-     *
-     * - Parameter condition: Condition to check for
-     * - Parameter messageText: Short description of what is wrong
-     * - Parameter informativeText: Expanded description of the environment check that failed
-     * - Parameter breaking: If the application should terminate afterwards
-     */
-    private func performEnvironmentCheck(
-        _ condition: Bool,
-        messageText: String,
-        informativeText: String,
-        breaking: Bool
-    )
-    {
-        if (condition) {
-            // Only breaking issues will cause the notification
-            if (breaking) {
-                self.failed = true
-            }
-            DispatchQueue.main.async {
-                // Present the information to the user
-                _ = Alert.present(
-                    messageText: messageText,
-                    informativeText: informativeText
-                )
-                // Only breaking issues will throw the extra retry modal
-                if (breaking) {
-                     self.failureCallback()
-                }
-            }
-        }
-    }
-}

phpmon/Classes/Helpers/PhpVersion.swift

@@ -1,48 +0,0 @@
-//
-//  PhpVersionExtractor.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 11/06/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-class PhpVersion {
-    
-    var short : String = "???"
-    var long : String = "???"
-    
-    var xdebugFound: Bool = false
-    var xdebugEnabled : Bool = false
-    
-    var error : Bool = false
-    
-    init() {
-        let version = Command.execute(path: "/usr/local/bin/php", arguments: ["-r", "print phpversion();"])
-        
-        if (version == "" || version.contains("Warning")) {
-            self.short = "💩 BROKEN"
-            self.long = "";
-            self.error = true
-            return;
-        }
-        
-        // That's the long version
-        self.long = version
-        
-        // Next up, let's strip away the minor version number
-        let segments = long.components(separatedBy: ".")
-        
-        // Get the first two elements
-        self.short = segments[0...1].joined(separator: ".")
-        
-        // Load xdebug support
-        self.xdebugFound = Actions.didFindXdebug(self.short)
-        if (self.xdebugFound) {
-            self.xdebugEnabled = Actions.didEnableXdebug(self.short)
-        }
-        
-        self.error = false;
-    }
-}

phpmon/Classes/Menu/StatusMenu.swift

@@ -1,88 +0,0 @@
-//
-//  MainMenuBuilder.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 16/05/2020.
-//  Copyright © 2020 Nico Verbruggen. All rights reserved.
-//
-
-import Cocoa
-
-class StatusMenu : NSMenu {
-    
-    public func addPhpVersionMenuItems()
-    {
-        var string = "We are not sure what version of PHP you are running."
-        if (App.shared.currentVersion != nil) {
-            if (!App.shared.currentVersion!.error) {
-                string = "You are running PHP \(App.shared.currentVersion!.long)"
-                self.addItem(NSMenuItem(title: string, action: nil, keyEquivalent: ""))
-            } else {
-                // in case of an error show the error message
-                self.addItem(NSMenuItem(title: "Oof! It appears your PHP installation is broken...", action: nil, keyEquivalent: ""))
-                self.addItem(NSMenuItem(title: "Try running `php -v` in your terminal.", action: nil, keyEquivalent: ""))
-                self.addItem(NSMenuItem(title: "You could also try switching to another version.", action: nil, keyEquivalent: ""))
-                self.addItem(NSMenuItem(title: "Running `brew reinstall php` (or for the equivalent version) might help.", action: nil, keyEquivalent: ""))
-            }
-        }
-    }
-    
-    public func addPhpActionMenuItems()
-    {
-        if (App.shared.availablePhpVersions.count > 0 && !App.shared.busy) {
-            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 menuItem = NSMenuItem(title: "Switch to PHP \(version)", action: (version == App.shared.currentVersion?.short) ? nil : action, keyEquivalent: "\(shortcutKey)")
-                menuItem.tag = index
-                shortcutKey = shortcutKey + 1
-                self.addItem(menuItem)
-            }
-            self.addItem(NSMenuItem.separator())
-            self.addItem(NSMenuItem(title: "Active Services", action: nil, keyEquivalent: ""))
-            self.addItem(NSMenuItem(title: "Restart php-fpm service", action: #selector(MainMenu.restartPhpFpm), keyEquivalent: "f"))
-            self.addItem(NSMenuItem(title: "Restart nginx service", action: #selector(MainMenu.restartNginx), keyEquivalent: "n"))
-            self.addItem(NSMenuItem(title: "Force load latest PHP version", action: #selector(MainMenu.forceRestartLatestPhp), keyEquivalent: ""))
-        }
-        if (App.shared.busy) {
-            self.addItem(NSMenuItem(title: "PHP Monitor is busy...", action: nil, keyEquivalent: ""))
-        }
-    }
-    
-    public func addPhpConfigurationMenuItems()
-    {
-        if (App.shared.currentVersion != nil) {
-            self.addItem(NSMenuItem(title: "Configuration", action: nil, keyEquivalent: ""))
-            self.addItem(NSMenuItem(title: "Valet configuration (.config/valet)", action: #selector(MainMenu.openValetConfigFolder), keyEquivalent: "v"))
-            self.addItem(NSMenuItem(title: "PHP configuration file (php.ini)", action: #selector(MainMenu.openActiveConfigFolder), keyEquivalent: "c"))
-            self.addItem(NSMenuItem.separator())
-            self.addItem(NSMenuItem(title: "Enabled Extensions", action: nil, keyEquivalent: ""))
-            self.addXdebugMenuItem()
-        }
-    }
-    
-    private func addXdebugMenuItem()
-    {
-        let xdebugFound = App.shared.currentVersion!.xdebugFound
-        if (xdebugFound) {
-            let xdebugOn = App.shared.currentVersion!.xdebugEnabled
-            let xdebugToggleMenuItem = NSMenuItem(
-                title: "Xdebug",
-                action: #selector(MainMenu.toggleXdebug), keyEquivalent: "x"
-            )
-            if (xdebugOn) {
-                xdebugToggleMenuItem.state = .on
-            }
-            self.addItem(xdebugToggleMenuItem)
-        } else {
-            let disabledItem = NSMenuItem(
-                title: "xdebug.so missing",
-                action: nil, keyEquivalent: "x"
-            )
-            disabledItem.isEnabled = false
-            self.addItem(disabledItem)
-        }
-    }
-    
-}

phpmon/Constants.swift

@@ -2,8 +2,7 @@
 //  Constants.swift
 //  PHP Monitor
 //
-//  Created by Nico Verbruggen on 08/07/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
@@ -12,15 +11,17 @@ class Constants {
     
     /**
      * The PHP versions supported by this application.
+     * Versions that do not appear in this array are omitted from the list.
      */
     static let SupportedPhpVersions = [
-        "5.6", "7.0", "7.1", "7.2", "7.3", "7.4"
+        "5.6",
+        "7.0",
+        "7.1",
+        "7.2",
+        "7.3",
+        "7.4",
+        "8.0",
+        "8.1"
     ]
     
-    /**
-     Which php version is aliased as `php` to brew?
-     This is usually the latest PHP version.
-     */
-    static let LatestPhpVersion = "7.4"
-    
 }

phpmon/Domain/Core/App.swift

@@ -0,0 +1,61 @@
+//
+//  StateManager.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+import Cocoa
+
+class App {
+    
+    static let shared = App()
+    
+    static var phpInstall: PhpInstallation? {
+        return App.shared.currentInstall
+    }
+    
+    static var busy: Bool {
+        return App.shared.busy
+    }
+    
+    /**
+     Whether the application is busy switching versions.
+     */
+    var busy: Bool = false
+    
+    /**
+     The currently active installation of PHP.
+     */
+    var currentInstall: PhpInstallation? = nil
+    
+    /**
+     All available versions of PHP.
+     */
+    var availablePhpVersions : [String] = []
+    
+    /**
+     The timer that will periodically fetch the PHP version that is currently active.
+     */
+    var timer: Timer?
+    
+    /**
+     Information we were able to discern from the Homebrew info command (as JSON).
+     */
+    var brewPhpPackage: HomebrewPackage? = nil {
+        didSet {
+            self.brewPhpVersion = self.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 version 8.0, but the information should always be loaded
+     from Homebrew itself upon starting the application.
+     */
+    var brewPhpVersion: String = "8.0"
+    
+}

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

@@ -0,0 +1,58 @@
+<?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">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
+    </dependencies>
+    <scenes>
+        <!--Application-->
+        <scene sceneID="JPo-4y-FX3">
+            <objects>
+                <application id="hnw-xV-0zn" sceneMemberID="viewController">
+                    <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
+                        <items>
+                            <menuItem title="PHP Monitor" id="1Xt-HY-uBw">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="PHP Monitor" systemMenu="apple" id="uQy-DD-JDr">
+                                    <items>
+                                        <menuItem title="About PHP Monitor" id="5kV-Vb-QxS">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
+                                        <menuItem title="Quit PHP Monitor" keyEquivalent="q" id="4sb-4s-VLi">
+                                            <connections>
+                                                <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Help" id="wpr-3q-Mcd">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
+                                    <items>
+                                        <menuItem title="PHP Monitor Help" keyEquivalent="?" id="FKE-Sm-Kum">
+                                            <connections>
+                                                <action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                    <connections>
+                        <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"/>
+            </objects>
+            <point key="canvasLocation" x="-343" y="-16"/>
+        </scene>
+    </scenes>
+</document>

phpmon/Domain/Core/HomebrewPackage.swift

@@ -0,0 +1,18 @@
+//
+//  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/PhpExtension.swift

@@ -0,0 +1,93 @@
+//
+//  PhpExtension.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 31/01/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+/**
+ A PHP extension that was detected in the php.ini file.
+ Please note that the extension may be disabled.
+ 
+ - Note: You need to know more about regular expressions to be able to deal with these NSRegularExpression
+ instances. You can find more information here: https://nshipster.com/swift-regular-expressions/
+ */
+class PhpExtension {
+    
+    /// The file where this extension was located.
+    var file: String
+    
+    /// The original string that was used to determine this extension is active.
+    var line: String
+    
+    /// The name of the extension. This is always identical to the name found in the original string. If you want to display this name, capitalize this.
+    var name: String
+    
+    /// Whether the extension has been enabled.
+    var enabled: Bool
+    
+    /**
+     This regular expression will allow us to identify lines which activate an extension.
+     
+     It will match the following items:
+     
+     * `extension="name.so"`
+     * `zend_extension="name.so"`
+     * `; extension="name.so"`
+     * `; zend_extension="name.so"`
+     
+     - 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"$"#
+    
+    /**
+     When registering an extension, we do that based on the line found inside the .ini file.
+     */
+    init(_ line: String, file: String) {
+        let regex = try! NSRegularExpression(pattern: Self.extensionRegex, options: [])
+        let match = regex.matches(in: line, options: [], range: NSMakeRange(0, line.count)).first
+        let range = Range(match!.range(withName: "name"), in: line)!
+        
+        self.line = line
+        self.name = line[range]
+        self.enabled = !line.contains(";")
+        self.file = file
+    }
+    
+    /**
+     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
+    }
+    
+    // MARK: - Static Methods
+    
+    /**
+     This method will attempt to identify all extensions in the .ini file at a certain URL.
+     */
+    static func load(from path: URL) -> [PhpExtension] {
+        let file = try? String(contentsOf: path, encoding: .utf8)
+        
+        if (file == nil) {
+            print("There was an issue reading the file. Assuming no extensions were found.")
+            return []
+        }
+        
+        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)
+            }
+    }
+}

phpmon/Domain/Core/PhpInstallation.swift

@@ -0,0 +1,114 @@
+//
+//  PhpInstallation.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class PhpInstallation {
+
+    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/Extensions/DateExtension.swift

@@ -2,8 +2,7 @@
 //  Date.swift
 //  PHP Monitor
 //
-//  Created by Nico Verbruggen on 09/07/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa

phpmon/Domain/Extensions/StringExtension.swift

@@ -2,10 +2,8 @@
 //  StringExtension.swift
 //  PHP Monitor
 //
-//  Created by Nico Verbruggen on 13/05/2020.
-//  Copyright © 2020 Nico Verbruggen. All rights reserved.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
 //
-
 import Foundation
 
 extension String {
@@ -29,4 +27,10 @@ extension String {
         
         return count
     }
+
+    subscript (r: Range<String.Index>) -> String {
+        let start = r.lowerBound
+        let end = r.upperBound
+        return String(self[start ..< end])
+    }
 }

phpmon/Domain/Extensions/XibLoadable.swift

@@ -0,0 +1,33 @@
+//
+//  NibLoadable.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 04/02/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+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)
+    }
+    
+    static func createFromXib(in bundle: Bundle = Bundle.main) -> Self? {
+        guard let xibName = xibName else { return nil }
+        var topLevelArray: NSArray? = nil
+        bundle.loadNibNamed(NSNib.Name(xibName), owner: self, topLevelObjects: &topLevelArray)
+        guard let results = topLevelArray else { return nil }
+        let views = Array<Any>(results).filter { $0 is Self }
+        return views.last as? Self
+    }
+}

phpmon/Domain/Helpers/Alert.swift

@@ -2,13 +2,13 @@
 //  Alert.swift
 //  PHP Monitor
 //
-//  Created by Nico Verbruggen on 12/06/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
 
 class Alert {
+    
     public static func present(
         messageText: String,
         informativeText: String,
@@ -24,4 +24,9 @@ class Alert {
         }
         return alert.runModal() == .alertFirstButtonReturn
     }
+    
+    public static func notify(message: String, info: String) {
+        _ = self.present(messageText: message, informativeText: info, buttonTitle: "OK", secondButtonTitle: "")
+    }
+    
 }

phpmon/Domain/Helpers/LocalNotification.swift

@@ -0,0 +1,19 @@
+//
+//  LocalNotification.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class LocalNotification {
+    
+    public static func send(title: String, subtitle: String) {
+        let notification = NSUserNotification()
+        notification.title = title
+        notification.subtitle = subtitle
+        NSUserNotificationCenter.default.deliver(notification)
+    }
+    
+}

phpmon/Domain/Helpers/MenuBarImageGenerator.swift

@@ -2,8 +2,7 @@
 //  ImageGenerator.swift
 //  PHP Monitor
 //
-//  Created by Nico Verbruggen on 11/06/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa

phpmon/Domain/Menu/HeaderView.swift

@@ -0,0 +1,23 @@
+//
+//  HeaderView.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 04/02/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+
+class HeaderView: NSView, XibLoadable {
+    @IBOutlet weak var textField: NSTextField!
+    
+    static func asMenuItem(text: String) -> NSMenuItem {
+        let view = Self.createFromXib()
+        view!.textField.stringValue = text.uppercased()
+        let item = NSMenuItem()
+        item.view = view
+        item.target = self
+        return item
+    }
+}

phpmon/Domain/Menu/HeaderView.xib

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe" customClass="HeaderView" customModule="PHP_Monitor" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="350" height="24"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ddg-VQ-cOT">
+                    <rect key="frame" x="12" y="5" width="113" height="15"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="ACTIVE SERVICES" id="NHz-MZ-8FK">
+                        <font key="font" metaFont="systemBold" size="12"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+            </subviews>
+            <constraints>
+                <constraint firstItem="ddg-VQ-cOT" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="n4Z-WN-RIh"/>
+                <constraint firstItem="ddg-VQ-cOT" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="14" id="yuW-pb-GQJ"/>
+            </constraints>
+            <connections>
+                <outlet property="textField" destination="ddg-VQ-cOT" id="aaQ-Xb-o2X"/>
+            </connections>
+            <point key="canvasLocation" x="-75" y="38"/>
+        </customView>
+    </objects>
+</document>

phpmon/Domain/Menu/MainMenu.swift

@@ -0,0 +1,293 @@
+//
+//  MainMenu.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+class MainMenu: NSObject, NSWindowDelegate {
+
+    static let shared = MainMenu()
+    
+    /**
+     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
+        self.setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+        // Perform environment boot checks
+        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
+            Startup().checkEnvironment(success: { self.onEnvironmentPass() },
+                                       failure: { self.onEnvironmentFail() }
+            )
+        }
+    }
+    
+    /**
+     When the environment is all clear and the app can run, let's go.
+     */
+    private func onEnvironmentPass() {
+        App.shared.availablePhpVersions = Actions.detectPhpVersions()
+        self.updatePhpVersionInStatusBar()
+        // Schedule a request to fetch the PHP version every 60 seconds
+        DispatchQueue.main.async {
+            App.shared.timer = Timer.scheduledTimer(
+                timeInterval: 60,
+                target: self,
+                selector: #selector(self.updatePhpVersionInStatusBar),
+                userInfo: nil,
+                repeats: true
+            )
+        }
+    }
+    
+    /**
+     When the environment is not OK, present an alert to inform the user.
+     */
+    private func onEnvironmentFail() {
+        DispatchQueue.main.async {
+            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)
+            }
+            
+            self.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 {
+            // 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 information about services & actions
+            menu.addPhpConfigurationMenuItems()
+            menu.addItem(NSMenuItem.separator())
+            
+            // Add about & quit menu items
+            menu.addItem(NSMenuItem(title: "mi_about".localized, action: #selector(self.openAbout), keyEquivalent: ""))
+            menu.addItem(NSMenuItem(title: "mi_quit".localized, action: #selector(self.terminateApp), keyEquivalent: "q"))
+            
+            // Make sure every item can be interacted with
+            menu.items.forEach({ (item) in
+                item.target = self
+            })
+            
+            self.statusItem.menu = menu
+        }
+    }
+    
+    /**
+     Sets the status bar image based on a version string.
+     */
+    func setStatusBarImage(version: String) {
+        self.setStatusBar(
+            image: MenuBarImageGenerator.textToImage(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
+        self.setBusyImage()
+        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
+            self.update()
+            execute()
+            App.shared.busy = false
+            DispatchQueue.main.async {
+                self.updatePhpVersionInStatusBar()
+                self.update()
+                completion()
+            }
+        }
+    }
+    
+    // MARK: - User Interface
+    
+    @objc func updatePhpVersionInStatusBar() {
+        App.shared.currentInstall = PhpInstallation()
+        
+        DispatchQueue.main.async {
+            if (App.shared.busy) {
+                self.setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+            } else {
+                self.setStatusBarImage(version: App.phpInstall!.version.short)
+            }
+        }
+        
+        self.update()
+    }
+    
+    @objc func setBusyImage() {
+        DispatchQueue.main.async {
+            self.setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+        }
+    }
+    
+    // MARK: - Actions
+    
+    @objc func restartPhpFpm() {
+        self.waitAndExecute({
+            Actions.restartPhpFpm()
+        })
+    }
+    
+    @objc func restartAllServices() {
+        self.waitAndExecute({
+            Actions.restartDnsMasq()
+            Actions.restartPhpFpm()
+            Actions.restartNginx()
+        })
+    }
+    
+    @objc func restartNginx() {
+        self.waitAndExecute({
+            Actions.restartNginx()
+        })
+    }
+    
+    @objc func restartDnsMasq() {
+        self.waitAndExecute({
+            Actions.restartDnsMasq()
+        })
+    }
+    
+    @objc func toggleExtension(sender: ExtensionMenuItem) {
+        self.waitAndExecute({
+            // Toggle that extension
+            print("Toggling extension '\(sender.phpExtension!.name)'")
+            sender.phpExtension?.toggle()
+        })
+    }
+    
+    @objc func openPhpInfo() {
+        self.waitAndExecute({
+            try! "<?php phpinfo();".write(toFile: "/tmp/phpmon_phpinfo.php", atomically: true, encoding: .utf8)
+            Shell.run("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
+        }, {
+            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
+        self.waitAndExecute(
+            { Actions.fixMyPhp() },
+            { 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 openValetConfigFolder() {
+        Actions.openValetConfigFolder()
+    }
+    
+    @objc func switchToPhpVersion(sender: PhpMenuItem) {
+        print("Switching to: PHP \(sender.version)")
+        
+        self.setBusyImage()
+        App.shared.busy = true
+        
+        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
+            // Update the PHP version in the status bar
+            self.updatePhpVersionInStatusBar()
+            
+            // Update the menu
+            self.update()
+            
+            // Switch the PHP version
+            Actions.switchToPhpVersion(
+                version: sender.version,
+                availableVersions: App.shared.availablePhpVersions
+            )
+            
+            // Mark as no longer busy
+            App.shared.busy = false
+            
+            // Perform UI updates on main thread
+            DispatchQueue.main.async {
+                self.updatePhpVersionInStatusBar()
+                self.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)
+                )
+            }
+        }
+    }
+    
+    @objc func openAbout() {
+        NSApplication.shared.activate(ignoringOtherApps: true)
+        NSApplication.shared.orderFrontStandardAboutPanel()
+    }
+    
+    @objc func terminateApp() {
+        NSApplication.shared.terminate(nil)
+    }
+}

phpmon/Domain/Menu/StatsView.swift

@@ -0,0 +1,34 @@
+//
+//  StatsView.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 04/02/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+
+class StatsView: NSView, XibLoadable {
+    @IBOutlet weak var titleMemLimit: NSTextField!
+    @IBOutlet weak var titleMaxPost: NSTextField!
+    @IBOutlet weak var titleMaxUpload: NSTextField!
+    
+    @IBOutlet weak var labelMemLimit: NSTextField!
+    @IBOutlet weak var labelMaxPost: NSTextField!
+    @IBOutlet weak var labelMaxUpload: NSTextField!
+    
+    static func asMenuItem(memory: String, post: String, upload: String) -> NSMenuItem {
+        let view = Self.createFromXib()
+        view!.titleMemLimit.stringValue = "mi_memory_limit".localized.uppercased()
+        view!.titleMaxPost.stringValue = "mi_post_max_size".localized.uppercased()
+        view!.titleMaxUpload.stringValue = "mi_upload_max_filesize".localized.uppercased()
+        view!.labelMemLimit.stringValue = memory
+        view!.labelMaxPost.stringValue = post
+        view!.labelMaxUpload.stringValue = upload
+        let item = NSMenuItem()
+        item.view = view
+        item.target = self
+        return item
+    }
+}

phpmon/Domain/Menu/StatsView.xib

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe" customClass="StatsView" customModule="PHP_Monitor" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="341" height="55"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <stackView distribution="fillEqually" orientation="horizontal" alignment="top" spacing="20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TnH-dX-qaQ">
+                    <rect key="frame" x="30" y="6" width="281" height="43"/>
+                    <subviews>
+                        <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="doH-ww-BDw">
+                            <rect key="frame" x="0.0" y="4" width="87" height="35"/>
+                            <subviews>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="At1-ch-qv2">
+                                    <rect key="frame" x="-2" y="21" width="91" height="14"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="MEMORY LIMIT" id="LKe-C4-jxo">
+                                        <font key="font" metaFont="systemMedium" size="11"/>
+                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Emt-m3-Dt6">
+                                    <rect key="frame" x="16" y="0.0" width="55" height="19"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="1024M" id="H6T-wY-PIG">
+                                        <font key="font" metaFont="systemMedium" size="16"/>
+                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </subviews>
+                            <visibilityPriorities>
+                                <integer value="1000"/>
+                                <integer value="1000"/>
+                            </visibilityPriorities>
+                            <customSpacing>
+                                <real value="3.4028234663852886e+38"/>
+                                <real value="3.4028234663852886e+38"/>
+                            </customSpacing>
+                        </stackView>
+                        <stackView distribution="fillEqually" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="g4d-4N-NkC">
+                            <rect key="frame" x="107" y="4" width="77" height="35"/>
+                            <subviews>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7um-XA-djV">
+                                    <rect key="frame" x="7" y="21" width="63" height="14"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="MAX POST" id="Qfq-Bl-yuh">
+                                        <font key="font" metaFont="systemMedium" size="11"/>
+                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vyu-AO-8SH">
+                                    <rect key="frame" x="11" y="0.0" width="55" height="19"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="1024M" id="uH4-Zy-43x">
+                                        <font key="font" metaFont="systemMedium" size="16"/>
+                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </subviews>
+                            <visibilityPriorities>
+                                <integer value="1000"/>
+                                <integer value="1000"/>
+                            </visibilityPriorities>
+                            <customSpacing>
+                                <real value="3.4028234663852886e+38"/>
+                                <real value="3.4028234663852886e+38"/>
+                            </customSpacing>
+                        </stackView>
+                        <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nWj-33-m8Q">
+                            <rect key="frame" x="204" y="4" width="77" height="35"/>
+                            <subviews>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Oef-6n-9QI">
+                                    <rect key="frame" x="-1" y="21" width="79" height="14"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="MAX UPLOAD" id="lGh-MT-TgI">
+                                        <font key="font" metaFont="systemMedium" size="11"/>
+                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eHT-tr-Kwx">
+                                    <rect key="frame" x="11" y="0.0" width="55" height="19"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="1024M" id="1iA-Ri-zYY">
+                                        <font key="font" metaFont="systemMedium" size="16"/>
+                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </subviews>
+                            <visibilityPriorities>
+                                <integer value="1000"/>
+                                <integer value="1000"/>
+                            </visibilityPriorities>
+                            <customSpacing>
+                                <real value="3.4028234663852886e+38"/>
+                                <real value="3.4028234663852886e+38"/>
+                            </customSpacing>
+                        </stackView>
+                    </subviews>
+                    <constraints>
+                        <constraint firstItem="nWj-33-m8Q" firstAttribute="top" secondItem="TnH-dX-qaQ" secondAttribute="top" constant="4" id="CAY-Pw-B8n"/>
+                        <constraint firstAttribute="bottom" secondItem="doH-ww-BDw" secondAttribute="bottom" constant="4" id="Dq4-M6-1Wf"/>
+                        <constraint firstItem="g4d-4N-NkC" firstAttribute="top" secondItem="TnH-dX-qaQ" secondAttribute="top" constant="4" id="bls-fM-H4b"/>
+                        <constraint firstAttribute="bottom" secondItem="nWj-33-m8Q" secondAttribute="bottom" constant="4" id="f6j-eI-wiH"/>
+                        <constraint firstAttribute="bottom" secondItem="g4d-4N-NkC" secondAttribute="bottom" constant="4" id="faS-Mo-Qa2"/>
+                        <constraint firstItem="doH-ww-BDw" firstAttribute="top" secondItem="TnH-dX-qaQ" secondAttribute="top" constant="4" id="gL3-5S-OKo"/>
+                    </constraints>
+                    <visibilityPriorities>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                    </visibilityPriorities>
+                    <customSpacing>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                    </customSpacing>
+                </stackView>
+            </subviews>
+            <constraints>
+                <constraint firstItem="TnH-dX-qaQ" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="6" id="1mo-iG-Z0D"/>
+                <constraint firstAttribute="trailing" secondItem="TnH-dX-qaQ" secondAttribute="trailing" constant="30" id="3dD-wf-5pS"/>
+                <constraint firstItem="TnH-dX-qaQ" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="30" id="S8i-CD-j3h"/>
+                <constraint firstAttribute="bottom" secondItem="TnH-dX-qaQ" secondAttribute="bottom" constant="6" id="eve-qD-gUH"/>
+            </constraints>
+            <connections>
+                <outlet property="labelMaxPost" destination="Vyu-AO-8SH" id="5Cm-QO-hJQ"/>
+                <outlet property="labelMaxUpload" destination="eHT-tr-Kwx" id="5pK-FD-c4h"/>
+                <outlet property="labelMemLimit" destination="Emt-m3-Dt6" id="6nD-Su-XZ6"/>
+                <outlet property="titleMaxPost" destination="7um-XA-djV" id="5MN-Xb-XwL"/>
+                <outlet property="titleMaxUpload" destination="Oef-6n-9QI" id="Q61-JI-RJq"/>
+                <outlet property="titleMemLimit" destination="At1-ch-qv2" id="SQT-B9-sWS"/>
+            </connections>
+            <point key="canvasLocation" x="-84.5" y="44"/>
+        </customView>
+    </objects>
+</document>

phpmon/Domain/Menu/StatusMenu.swift

@@ -0,0 +1,133 @@
+//
+//  MainMenuBuilder.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+class StatusMenu : NSMenu {
+    func addPhpVersionMenuItems() {
+        if App.shared.currentInstall == nil {
+            return
+        }
+        
+        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: ""))
+            }
+            return
+        }
+    
+        let phpVersionText = "\("mi_php_version".localized) \(App.phpInstall!.version.long)"
+        self.addItem(HeaderView.asMenuItem(text: phpVersionText))
+    }
+    
+    func addPhpActionMenuItems() {
+        if App.busy {
+            self.addItem(NSMenuItem(title: "mi_busy".localized, action: nil, keyEquivalent: ""))
+            return
+        }
+        
+        if App.shared.availablePhpVersions.count == 0 {
+            return
+        }
+        
+        self.addSwitchToPhpMenuItems()
+        self.addItem(NSMenuItem.separator())
+        self.addServicesMenuItems()
+    }
+    
+    private func addSwitchToPhpMenuItems() {
+        var shortcutKey = 1
+        for index in (0..<App.shared.availablePhpVersions.count).reversed() {
+            let version = App.shared.availablePhpVersions[index]
+            let action = #selector(MainMenu.switchToPhpVersion(sender:))
+            let brew = (version == App.shared.brewPhpVersion) ? "php" : "php@\(version)"
+            let menuItem = PhpMenuItem(
+                title: "\("mi_php_switch".localized) \(version) (\(brew))",
+                action: (version == App.phpInstall?.version.short) ? nil : action, keyEquivalent: "\(shortcutKey)"
+            )
+            menuItem.version = version
+            shortcutKey = shortcutKey + 1
+            self.addItem(menuItem)
+        }
+    }
+    
+    private func addServicesMenuItems() {
+        self.addItem(HeaderView.asMenuItem(text: "mi_active_services".localized))
+        
+        let services = NSMenuItem(title: "mi_restart_specific".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"))
+        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.addItem(services)
+        self.addItem(NSMenuItem(title: "mi_restart_all_services".localized, action: #selector(MainMenu.restartAllServices), keyEquivalent: "s"))
+    }
+    
+    func addPhpConfigurationMenuItems() {
+        if App.shared.currentInstall == nil {
+            return
+        }
+        
+        // Configuration
+        self.addItem(HeaderView.asMenuItem(text: "mi_configuration".localized))
+        self.addItem(NSMenuItem(title: "mi_valet_config".localized, action: #selector(MainMenu.openValetConfigFolder), keyEquivalent: "v"))
+        self.addItem(NSMenuItem(title: "mi_php_config".localized, action: #selector(MainMenu.openActiveConfigFolder), keyEquivalent: "c"))
+        self.addItem(NSMenuItem(title: "mi_phpinfo".localized, action: #selector(MainMenu.openPhpInfo), keyEquivalent: "i"))
+        
+        if (App.shared.busy) {
+            return
+        }
+        
+        let stats = App.phpInstall!.configuration
+        
+        // Stats
+        self.addItem(NSMenuItem.separator())
+        self.addItem(StatsView.asMenuItem(
+            memory: stats.memory_limit,
+            post: stats.post_max_size,
+            upload: stats.upload_max_filesize)
+        )
+        
+        // Extensions
+        self.addItem(NSMenuItem.separator())
+        self.addItem(HeaderView.asMenuItem(text: "mi_detected_extensions".localized))
+        
+        if (App.phpInstall!.extensions.count == 0) {
+            self.addItem(NSMenuItem(title: "mi_no_extensions_detected".localized, action: nil, keyEquivalent: ""))
+        }
+        
+        for phpExtension in App.phpInstall!.extensions {
+            self.addExtensionItem(phpExtension)
+        }
+    }
+    
+    private func addExtensionItem(_ phpExtension: PhpExtension) {
+        let menuItem = ExtensionMenuItem(
+            title: "\(phpExtension.name.capitalized) (php.ini)",
+            action: #selector(MainMenu.toggleExtension), keyEquivalent: ""
+        )
+        menuItem.state = phpExtension.enabled ? .on : .off
+        menuItem.phpExtension = phpExtension
+        self.addItem(menuItem)
+    }
+}
+
+// MARK: - In order to store extra data in each item, NSMenuItem is subclassed
+
+class PhpMenuItem: NSMenuItem {
+    var version: String = ""
+}
+
+class ExtensionMenuItem: NSMenuItem {
+    var phpExtension: PhpExtension? = nil
+}

phpmon/Domain/Terminal/Actions.swift

@@ -0,0 +1,157 @@
+//
+//  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/Terminal/Command.swift

@@ -2,15 +2,19 @@
 //  Command.swift
 //  PHP Monitor
 //
-//  Created by Nico Verbruggen on 17/10/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
 
 class Command {
-
-    /// Immediately executes a command.
+    
+    /**
+     Immediately executes a command.
+     
+     - Parameter path: The path of the command or program to invoke.
+     - Parameter arguments: A list of arguments that are passed on.
+     */
     public static func execute(path: String, arguments: [String]) -> String {
         let task = Process()
         task.launchPath = path

phpmon/Domain/Terminal/Paths.swift

@@ -0,0 +1,63 @@
+//
+//  Paths.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+enum HomebrewDir: String {
+    case opt = "/opt/homebrew"
+    case usr = "/usr/local"
+}
+
+class Paths {
+    
+    static let shared = Paths()
+    var baseDir : HomebrewDir
+    
+    init() {
+        let optBrewFound = Shell.fileExists("\(HomebrewDir.opt.rawValue)/bin/brew")
+        let usrBrewFound = Shell.fileExists("\(HomebrewDir.usr.rawValue)/bin/brew")
+        
+        if (optBrewFound) {
+            // This is usually the case with Homebrew installed on Apple Silicon
+            self.baseDir = .opt
+        } else if (usrBrewFound) {
+            // This is usually the case with Homebrew installed on Intel (or Rosetta 2)
+            self.baseDir = .usr
+        } else {
+            // Falling back to default "legacy" Homebrew location (for Intel)
+            print("Seems like we couldn't determine the Homebrew directory.")
+            print("This usually means we're in trouble... (no Homebrew?)")
+            self.baseDir = .usr
+        }
+        
+        print("Homebrew directory: \(self.baseDir)")
+    }
+    
+    // - MARK: Binaries
+    
+    public static var brew: String {
+        return "\(self.binPath)/brew"
+    }
+    
+    public static var php: String {
+        return "\(self.binPath)/php"
+    }
+    
+    // - MARK: Paths
+    
+    public static var binPath: String {
+        return "\(self.shared.baseDir.rawValue)/bin"
+    }
+    
+    public static var optPath: String {
+        return "\(self.shared.baseDir.rawValue)/opt"
+    }
+    
+    public static var etcPath: String {
+        return "\(self.shared.baseDir.rawValue)/etc"
+    }
+}

phpmon/Domain/Terminal/Shell.swift

@@ -0,0 +1,82 @@
+//
+//  Shell.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+class Shell {
+    
+    // MARK: - Invoke static functions
+    
+    public static func run(_ command: String) {
+        Shell.user.run(command)
+    }
+    
+    public static func pipe(_ command: String) -> String {
+        Shell.user.pipe(command)
+    }
+    
+    // MARK: - Singleton
+    
+    var shell = "/bin/sh"
+    
+    init() {
+        // Determine if we're using macOS Catalina or newer (that support /bin/zsh as default shell)
+        let at_least_10_15 = ProcessInfo.processInfo.isOperatingSystemAtLeast(
+            .init(majorVersion: 10, minorVersion: 15, patchVersion: 0))
+    
+        // If macOS Mojave is being used, we'll default to /bin/bash
+        self.shell = at_least_10_15 ? "/bin/sh" : "/bin/bash"
+        print(at_least_10_15 ? "Detected recent macOS (> 10.15): defaulting to /bin/sh"
+            : "Detected older macOS (< 10.15): so defaulting to /bin/bash")
+    }
+    
+    /**
+     Singleton to access a user shell (with --login)
+     */
+    static let user = Shell()
+    
+    /**
+     Runs a shell command without using the output.
+     Uses the default shell.
+     
+     - Parameter command: The command to run
+     */
+    func run(_ command: String) {
+        // Equivalent of piping to /dev/null; don't do anything with the string
+        _ = self.pipe(command)
+    }
+    
+    /**
+     Runs a shell command and returns the output.
+     
+     - Parameter command: The command to run
+     - Parameter shell: Path to the shell to invoke
+     */
+    func pipe(_ command: String) -> String {
+        let task = Process()
+        let pipe = Pipe()
+        
+        task.launchPath = self.shell
+        task.arguments = ["--login", "-c", command]
+        task.standardOutput = pipe
+        task.launch()
+
+        return String(
+            data: pipe.fileHandleForReading.readDataToEndOfFile(),
+            encoding: .utf8
+        )!
+    }
+    
+    /**
+     Checks if a file exists at the provided path.
+     */
+    public static func fileExists(_ path: String) -> Bool {
+        return Shell.pipe(
+            "if [ -f \(path) ]; then echo \"PHP_Y_FE\"; fi"
+        ).contains("PHP_Y_FE")
+    }
+}

phpmon/Domain/Terminal/Startup.swift

@@ -0,0 +1,122 @@
+//
+//  Environment.swift
+//  PHP Monitor
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class Startup {
+    
+    public var failed : Bool = false
+    public var failureCallback = {}
+    
+    /**
+     Checks the user's environment and checks if PHP Monitor can be used properly.
+     This checks if PHP is installed, Valet is running, the appropriate permissions are set, and more.
+     
+     - Parameter success: Callback that is fired if the application can proceed with launch
+     - Parameter failure: Callback that is fired if the application must retry launch
+     */
+    func checkEnvironment(success: () -> Void, failure: @escaping () -> Void)
+    {
+        self.failureCallback = failure
+        
+        self.performEnvironmentCheck(
+            !Shell.fileExists("\(Paths.binPath)/php"),
+            messageText:        "startup.errors.php_binary.title".localized,
+            informativeText:    "startup.errors.php_binary_desc".localized,
+            breaking:           true
+        )
+        
+        self.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(
+            // Older versions of Valet might be located in `/usr/local/bin` regardless of Homebrew prefix
+            !(Shell.fileExists("/usr/local/bin/valet") || Shell.fileExists("/opt/homebrew/bin/valet")),
+            messageText:        "startup.errors.valet_executable.title".localized,
+            informativeText:    "startup.errors.valet_executable.desc".localized,
+            breaking:           true
+        )
+        
+        self.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(
+            // Older versions of Valet might be located in `/usr/local/bin` regardless of Homebrew prefix
+            !(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(
+            (services.countInstances(of: "started") > 1),
+            messageText:        "startup.errors.services.title".localized,
+            informativeText:    "startup.errors.services.desc".localized,
+            breaking:           false
+        )
+        
+        if (!self.failed) {
+            self.determineBrewAliasVersion()
+            success()
+        }
+    }
+    
+    /**
+     * In order to avoid having to hard-code which version of PHP is aliased to what specific subversion,
+     * PHP Monitor now determines the alias by checking the user's system.
+     */
+    private func determineBrewAliasVersion()
+    {
+        print("PHP Monitor has determined the application has successfully passed all checks.")
+        print("Determining which version of PHP is aliased to `php` via Homebrew...")
+        
+        let brewPhpAlias = Shell.pipe("\(Paths.brew) info php --json");
+        
+        App.shared.brewPhpPackage = try! JSONDecoder().decode(
+            [HomebrewPackage].self,
+            from: brewPhpAlias.data(using: .utf8)!
+        ).first!
+        
+        print("When on your system, the `php` formula means version \(App.shared.brewPhpVersion)!")
+    }
+    
+    /**
+     * Perform an environment check. Will cause the application to terminate, if `breaking` is set to true.
+     *
+     * - Parameter condition: Fail condition to check for; if this returns `true`, the alert will be shown
+     * - Parameter messageText: Short description of what is wrong
+     * - Parameter informativeText: Expanded description of the environment check that failed
+     * - Parameter breaking: If the application should terminate afterwards
+     */
+    private func performEnvironmentCheck(
+        _ condition: Bool,
+        messageText: String,
+        informativeText: String,
+        breaking: Bool
+    ) {
+        if (!condition) { return }
+        
+        self.failed = breaking
+
+        DispatchQueue.main.async {
+            // Present the information to the user
+            Alert.notify(message: messageText, info: informativeText)
+            // Only breaking issues will throw the extra retry modal
+            breaking ? self.failureCallback() : ()
+        }
+    }
+}

phpmon/IAP/InternetAccessPolicy.plist

@@ -38,7 +38,7 @@
 			<key>Relevance</key>
 			<string>Essential</string>
 			<key>Purpose</key>
-			<string>PHP Monitor directly invokes Homebrew which contacts GitHub.</string>
+			<string>PHP Monitor directly invokes Homebrew which contacts GitHub. This happens when PHP Monitor asks for more information about the PHP formula to determine which version of PHP you&apos;ve got running.</string>
 			<key>DenyConsequences</key>
 			<string>If you deny these connections, PHP Monitor might not be able to complete its preset set of instructions, causing version switching to fail.</string>
 		</dict>

phpmon/Info.plist

@@ -27,7 +27,7 @@
 	<key>LSUIElement</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2020 Nico Verbruggen. All rights reserved.</string>
+	<string>Copyright © 2021 Nico Verbruggen. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

phpmon/Localizable.strings

@@ -6,6 +6,46 @@
   Copyright © 2020 Nico Verbruggen. All rights reserved.
 */
 
+// MENU ITEMS (MI)
+
+"mi_busy" = "PHP Monitor is busy...";
+"mi_unsure" = "We are not sure what version of PHP you are running.";
+"mi_php_version" = "You are running PHP";
+"mi_php_switch" = "Switch to PHP";
+"mi_php_broken_1" = "Oof! It appears your PHP installation is broken...";
+"mi_php_broken_2" = "Try running `php -v` in your terminal.";
+"mi_php_broken_3" = "You could also try switching to another version.";
+"mi_php_broken_4" = "Running `brew reinstall php` (or for the equivalent version) might help.";
+
+"mi_diagnostics" = "Diagnostics";
+"mi_active_services" = "Active Services";
+"mi_restart_php_fpm" = "Restart service: php";
+"mi_restart_nginx" = "Restart service: nginx";
+"mi_restart_dnsmasq" = "Restart service: dnsmasq";
+"mi_restart_specific" = "Restart specific service";
+"mi_restart_all_services" = "Restart all services";
+"mi_force_load_latest" = "Force load latest PHP version";
+
+"mi_configuration" = "Configuration";
+"mi_limits" = "Limits Configuration";
+"mi_memory_limit" = "Memory Limit";
+"mi_post_max_size" = "Max POST";
+"mi_upload_max_filesize" = "Max Upload";
+
+"mi_valet_config" = "Locate Valet folder (.config/valet)";
+"mi_php_config" = "Locate PHP configuration file (php.ini)";
+"mi_phpinfo" = "Show current configuration (phpinfo)";
+"mi_detected_extensions" = "Detected Extensions";
+"mi_no_extensions_detected" = "No additional extensions detected.";
+
+"mi_quit" = "Quit PHP Monitor";
+"mi_about" = "About PHP Monitor";
+
+// NOTIFICATIONS
+
+"notification.version_changed_title" = "PHP %@ now active";
+"notification.version_changed_desc" = "PHP Monitor has finished the switch to PHP %@.";
+
 // ALERTS
 
 // Force Reload Started
@@ -14,4 +54,36 @@
 
 // Force Reload Done
 "alert.force_reload_done.title" = "PHP has been force reloaded";
-"alert.force_reload_done.info" = "All appropriate services have been restarted, and the latest version of PHP is now active. You can now try switching to another version of PHP.";
+"alert.force_reload_done.info" = "All appropriate services have been restarted, and the latest version of PHP is now active. You can now try switching to another version of PHP. If visiting sites still does not work, you may try running `valet install` again, this can fix a 502 issue (Bad Gateway).";
+
+// PHP Monitor Cannot Start
+"alert.cannot_start.title" = "PHP Monitor cannot start";
+"alert.cannot_start.info" = "The issue you were just notified about is keeping PHP Monitor from functioning correctly. Please fix the issue and restart PHP Monitor. After clicking on OK, PHP Monitor will close.\n\nIf you have fixed the issue (or don't remember what the exact issue is) you can click on Retry, which will have PHP Monitor retry the startup checks.";
+"alert.cannot_start.close" = "Close";
+"alert.cannot_start.retry" = "Retry";
+
+// STARTUP
+
+/// 1. PHP binary not found
+"startup.errors.php_binary.title" = "PHP is not correctly installed";
+"startup.errors.php_binary_desc" = "You must install PHP via brew. Try running `which php` in Terminal, it should return `/usr/local/bin/php` (or `/opt/homebrew/bin/php`). The app will not work correctly until you resolve this issue. (Usually `brew link php` resolves this issue.)";
+
+/// 2. PHP not found in /usr/local/opt or /opt/homebrew/opt
+"startup.errors.php_opt.title" = "PHP is not correctly installed";
+"startup.errors.php_opt.desc" = "PHP alias was not found in `/usr/local/opt` or `/opt/homebrew/opt`. The app will not work correctly until you resolve this issue. If you already have the `php` formula installed, you may need to run `brew install php` in order for PHP Monitor to detect this installation.";
+
+/// 3. Valet not installed
+"startup.errors.valet_executable.title" = "Laravel Valet is not correctly installed";
+"startup.errors.valet_executable.desc" = "You must install Valet with composer. Try running `which valet` in Terminal, it should return `/usr/local/bin/valet` or `/opt/homebrew/bin/valet`. The app will not work correctly until you resolve this issue. (PHP Monitor checks for the existence of `valet` in either of these paths.)";
+
+/// 4. Brew & sudoers
+"startup.errors.sudoers_brew.title" = "Brew has not been added to sudoers.d";
+"startup.errors.sudoers_brew.desc" = "You must run `sudo valet trust` to ensure Valet can start and stop services without having to use sudo every time. The app will not work correctly until you resolve this issue.";
+
+/// 5. Valet & sudoers
+"startup.errors.sudoers_valet.title" = "Valet has not been added to sudoers.d";
+"startup.errors.sudoers_valet.desc" = "You must run `sudo valet trust` to ensure Valet can start and stop services without having to use sudo every time. The app will not work correctly until you resolve this issue.";
+
+/// 6. Multiple services active
+"startup.errors.services.title" = "Multiple PHP services are active";
+"startup.errors.services.desc" = "This can cause php-fpm to serve a more recent version of PHP than the one you'd like to see active. Please terminate all extra PHP processes.\n\nThe easiest solution is to choose the option 'Force load latest PHP version' in the menu bar.\n\nAlternatively, you can fix this manually. You can do this by running `brew services list` and running `sudo brew services stop php@7.3` (and use the version that applies).\n\nPHP Monitor usually handles the starting and stopping of these services, so once the correct version is the only PHP version running you should not have any issues. It is recommended to restart PHP Monitor once you have resolved this issue.\n\nFor more information about this issue, please see the README.md file in the repository on GitHub.";

phpmon/Singletons/App.swift

@@ -1,40 +0,0 @@
-//
-//  StateManager.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 11/07/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
-//
-
-import Cocoa
-
-class App {
-    
-    static let shared = App()
-    
-    /**
-     Whether the application is busy switching versions.
-     */
-    var busy: Bool = false
-    
-    /**
-     The currently active version of PHP.
-     */
-    var currentVersion: PhpVersion? = nil
-    
-    /**
-     All available versions of PHP.
-     */
-    var availablePhpVersions : [String] = []
-    
-    /**
-     The timer that will periodically fetch the PHP version that is currently active.
-     */
-    var timer: Timer?
-    
-    /**
-     The window controller that will show the log.
-     */
-    var windowController: NSWindowController? = nil
-    
-}

phpmon/Singletons/MainMenu.swift

@@ -1,233 +0,0 @@
-//
-//  MainMenu.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 11/07/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
-//
-
-import Cocoa
-
-class MainMenu: NSObject, NSWindowDelegate {
-
-    static let shared = MainMenu()
-    
-    let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
-    
-    // MARK: - UI related
-    
-    public func startup() {
-        // Start with the icon
-        self.setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
-        // Perform environment boot checks
-        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
-            Startup().checkEnvironment(success: {
-                self.onEnvironmentPass()
-            }, failure: {
-                self.onEnvironmentFail()
-            })
-        }
-    }
-    
-    private func onEnvironmentPass() {
-        App.shared.availablePhpVersions = Actions.detectPhpVersions()
-        self.updatePhpVersionInStatusBar()
-        // Schedule a request to fetch the PHP version every 60 seconds
-        DispatchQueue.main.async {
-            App.shared.timer = Timer.scheduledTimer(
-                timeInterval: 60,
-                target: self,
-                selector: #selector(self.updatePhpVersionInStatusBar),
-                userInfo: nil,
-                repeats: true
-            )
-        }
-    }
-    
-    private func onEnvironmentFail() {
-        DispatchQueue.main.async {
-            let close = Alert.present(
-                messageText: "PHP Monitor cannot start",
-                informativeText: "The issue you were just notified about is keeping PHP Monitor from functioning correctly. Please fix the issue and restart PHP Monitor. After clicking on OK, PHP Monitor will close.\n\nIf you have fixed the issue (or don't remember what the exact issue is) you can click on Retry, which will have PHP Monitor retry the startup checks.",
-                buttonTitle: "Close",
-                secondButtonTitle: "Retry"
-            )
-            if (!close) {
-                self.startup()
-            } else {
-                exit(1)
-            }
-        }
-    }
-    
-    public func update() {
-        DispatchQueue.global(qos: .userInitiated).async { [unowned 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 information about services & actions
-            menu.addPhpConfigurationMenuItems()
-            menu.addItem(NSMenuItem.separator())
-            
-            // Add about & quit menu items
-            menu.addItem(NSMenuItem(title: "About PHP Monitor", action: #selector(self.openAbout), keyEquivalent: ""))
-            menu.addItem(NSMenuItem(title: "Quit PHP Monitor", action: #selector(self.terminateApp), keyEquivalent: "q"))
-            
-            // Make sure every item can be interacted with
-            menu.items.forEach({ (item) in
-                item.target = self
-            })
-            
-            // Update the menu item on the main thread
-            DispatchQueue.main.async {
-                self.statusItem.menu = menu
-            }
-        }
-    }
-    
-    func setStatusBarImage(version: String) {
-        self.setStatusBar(image: MenuBarImageGenerator.textToImage(text: version))
-    }
-    
-    func setStatusBar(image: NSImage) {
-        if let button = statusItem.button {
-            image.isTemplate = true
-            button.image = image
-        }
-    }
-    
-    // MARK: - Nicer callbacks
-    
-    private func waitAndExecute(_ execute: @escaping () -> Void, _ completion: @escaping () -> Void = {})
-    {
-        App.shared.busy = true
-        self.setBusyImage()
-        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
-            self.update()
-            execute()
-            App.shared.busy = false
-            DispatchQueue.main.async {
-                self.updatePhpVersionInStatusBar()
-                self.update()
-                completion()
-            }
-        }
-    }
-    
-    // MARK: - Actions
-    
-    @objc func updatePhpVersionInStatusBar() {
-        App.shared.currentVersion = PhpVersion()
-        if (App.shared.busy) {
-            DispatchQueue.main.async {
-                self.setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
-            }
-        } else {
-            DispatchQueue.main.async {
-                self.setStatusBarImage(version: App.shared.currentVersion!.short)
-            }
-        }
-        self.update()
-    }
-    
-    @objc func setBusyImage() {
-        DispatchQueue.main.async {
-            self.setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
-        }
-    }
-    
-    @objc public func restartPhpFpm() {
-        self.waitAndExecute({
-            Actions.restartPhpFpm()
-        })
-    }
-    
-    @objc public func restartNginx() {
-        self.waitAndExecute({
-            Actions.restartNginx()
-        })
-    }
-    
-    @objc public func toggleXdebug() {
-        self.waitAndExecute({
-            Actions.toggleXdebug()
-        })
-    }
-    
-    @objc public func forceRestartLatestPhp() {
-        _ = Alert.present(
-            messageText: "alert.force_reload.title".localized,
-            informativeText: "alert.force_reload.info".localized
-        )
-        self.waitAndExecute({ Actions.fixMyPhp() }, {
-            _ = Alert.present(
-                messageText: "alert.force_reload_done.title".localized,
-                informativeText: "alert.force_reload_done.info".localized
-            )
-        })
-    }
-    
-    @objc public func openActiveConfigFolder() {
-        if (App.shared.currentVersion!.error) {
-            // php version was not identified
-            Actions.openGenericPhpConfigFolder()
-        } else {
-            // php version was identified
-            Actions.openPhpConfigFolder(version: App.shared.currentVersion!.short)
-        }
-        
-    }
-    
-    @objc public func openValetConfigFolder() {
-        Actions.openValetConfigFolder()
-    }
-    
-    @objc public func switchToPhpVersion(sender: AnyObject) {
-        self.setBusyImage()
-        let index = sender.tag!
-        let version = App.shared.availablePhpVersions[index]
-        App.shared.busy = true
-        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
-            // Update the PHP version in the status bar
-            self.updatePhpVersionInStatusBar()
-            // Update the menu
-            self.update()
-            // Switch the PHP version
-            Actions.switchToPhpVersion(
-                version: version,
-                availableVersions: App.shared.availablePhpVersions
-            )
-            // Mark as no longer busy
-            App.shared.busy = false
-            // Perform UI updates on main thread
-            DispatchQueue.main.async {
-                self.updatePhpVersionInStatusBar()
-                self.update()
-            }
-        }
-    }
-    
-    @objc public func openAbout() {
-        NSApplication.shared.activate(ignoringOtherApps: true)
-        NSApplication.shared.orderFrontStandardAboutPanel()
-    }
-    
-    @objc public func terminateApp() {
-        NSApplication.shared.terminate(nil)
-    }
-    
-    // MARK: - Cleanup when window closes
-    
-    func windowWillClose(_ notification: Notification) {
-        App.shared.windowController = nil
-        Shell.user.delegate = nil
-    }
-}

phpmon/Singletons/Shell.swift

@@ -1,68 +0,0 @@
-//
-//  Shell.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 11/06/2019.
-//  Copyright © 2019 Nico Verbruggen. All rights reserved.
-//
-
-import Cocoa
-
-protocol ShellDelegate: class {
-    func didCompleteCommand(historyItem: ShellHistoryItem)
-}
-
-class ShellHistoryItem {
-    var command: String
-    var output: String
-    var date: Date
-    
-    init(command: String, output: String) {
-        self.command = command
-        self.output = output
-        self.date = Date()
-    }
-}
-
-class Shell {
-    
-    // Singleton to access a user shell (with --login)
-    static let user = Shell()
-    
-    var history : [ShellHistoryItem] = []
-    
-    var delegate : ShellDelegate?
-    
-    /// Runs a shell command without using the description.
-    public func run(_ command: String) {
-        // Equivalent of piping to /dev/null; don't do anything with the string
-        _ = self.pipe(command)
-    }
-    
-    /// Runs a shell command and returns the output.
-    public func pipe(_ command: String, shell: String = "/bin/sh") -> String {
-        let task = Process()
-        task.launchPath = shell
-        task.arguments = ["--login", "-c", command]
-        
-        let pipe = Pipe()
-        task.standardOutput = pipe
-        task.launch()
-        
-        let data = pipe.fileHandleForReading.readDataToEndOfFile()
-        
-        let output: String = NSString(data: data, encoding: String.Encoding.utf8.rawValue)! as String
-        
-        let historyItem = ShellHistoryItem(command: command, output: output)
-        
-        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
-            self.history.append(historyItem)
-            // Keep the last 100 items
-            self.history = self.history.suffix(100)
-        }
-        
-        delegate?.didCompleteCommand(historyItem: historyItem)
-
-        return output
-    }
-}

phpmon/View Controllers/Base.lproj/Main.storyboard

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Application-->
-        <scene sceneID="JPo-4y-FX3">
-            <objects>
-                <application id="hnw-xV-0zn" sceneMemberID="viewController">
-                    <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
-                        <items>
-                            <menuItem title="PHP Monitor" id="1Xt-HY-uBw">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="PHP Monitor" systemMenu="apple" id="uQy-DD-JDr">
-                                    <items>
-                                        <menuItem title="About PHP Monitor" id="5kV-Vb-QxS">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
-                                        <menuItem title="Quit PHP Monitor" keyEquivalent="q" id="4sb-4s-VLi">
-                                            <connections>
-                                                <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Help" id="wpr-3q-Mcd">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
-                                    <items>
-                                        <menuItem title="PHP Monitor Help" keyEquivalent="?" id="FKE-Sm-Kum">
-                                            <connections>
-                                                <action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                        </items>
-                    </menu>
-                    <connections>
-                        <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"/>
-            </objects>
-            <point key="canvasLocation" x="-343" y="-16"/>
-        </scene>
-        <!--Log View Controller-->
-        <scene sceneID="hIz-AP-VOD">
-            <objects>
-                <viewController storyboardIdentifier="logWindow" id="XfG-lQ-9wD" customClass="LogViewController" customModule="PHP_Monitor" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" identifier="main" id="m2S-Jp-Qdl">
-                        <rect key="frame" x="0.0" y="0.0" width="662" height="475"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <subviews>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ICa-gx-jgq">
-                                <rect key="frame" x="578" y="8" width="75" height="32"/>
-                                <buttonCell key="cell" type="push" title="Close" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3md-FI-EWa">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="pressed:" target="XfG-lQ-9wD" id="fIC-Bz-vTK"/>
-                                </connections>
-                            </button>
-                            <scrollView borderType="line" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vZy-5S-021">
-                                <rect key="frame" x="15" y="46" width="632" height="414"/>
-                                <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="s5L-AU-0fw">
-                                    <rect key="frame" x="1" y="1" width="630" height="412"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <subviews>
-                                        <textView importsGraphics="NO" richText="NO" verticallyResizable="YES" smartInsertDelete="YES" id="tN6-Y9-1pA">
-                                            <rect key="frame" x="0.0" y="0.0" width="630" height="412"/>
-                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            <size key="minSize" width="630" height="412"/>
-                                            <size key="maxSize" width="640" height="10000000"/>
-                                            <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                        </textView>
-                                    </subviews>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                </clipView>
-                                <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Kho-JF-NZJ">
-                                    <rect key="frame" x="-100" y="-100" width="240" height="16"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                </scroller>
-                                <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="qp7-7R-gTO">
-                                    <rect key="frame" x="615" y="1" width="16" height="412"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                </scroller>
-                            </scrollView>
-                        </subviews>
-                        <constraints>
-                            <constraint firstItem="vZy-5S-021" firstAttribute="leading" secondItem="m2S-Jp-Qdl" secondAttribute="leading" constant="15" id="K0k-oE-r37"/>
-                            <constraint firstAttribute="trailing" secondItem="ICa-gx-jgq" secondAttribute="trailing" constant="15" id="LFS-0E-Ibw"/>
-                            <constraint firstItem="vZy-5S-021" firstAttribute="top" secondItem="m2S-Jp-Qdl" secondAttribute="top" constant="15" id="Nec-oI-CjE"/>
-                            <constraint firstAttribute="trailing" secondItem="vZy-5S-021" secondAttribute="trailing" constant="15" id="kBJ-O5-eYI"/>
-                            <constraint firstAttribute="bottom" secondItem="ICa-gx-jgq" secondAttribute="bottom" constant="15" id="kYB-Fn-DSA"/>
-                            <constraint firstItem="ICa-gx-jgq" firstAttribute="top" secondItem="vZy-5S-021" secondAttribute="bottom" constant="10" id="xdn-yU-LVb"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="textView" destination="tN6-Y9-1pA" id="z77-me-Od6"/>
-                    </connections>
-                </viewController>
-                <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-105" y="377.5"/>
-        </scene>
-    </scenes>
-</document>