🚀 Version 7.0.3

Mind you, the interaction with the domain list controller also needs to
be abstracted away, but this is fine, for now.

PHP Monitor.xcodeproj/project.pbxproj

@@ -53,7 +53,6 @@
 		C40175B92903108900763A68 /* ValetInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40175B72903108900763A68 /* ValetInteractor.swift */; };
 		C40175BA2903108900763A68 /* ValetInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40175B72903108900763A68 /* ValetInteractor.swift */; };
 		C40175BB2903108900763A68 /* ValetInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40175B72903108900763A68 /* ValetInteractor.swift */; };
-		C40508AF28ADA23D008FAC1F /* NoDomainResultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40508AE28ADA23D008FAC1F /* NoDomainResultsView.swift */; };
 		C40508B128ADAB44008FAC1F /* NSMenuItemExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40508B028ADAB44008FAC1F /* NSMenuItemExtension.swift */; };
 		C405A4D024B9B9140062FAFA /* InternetAccessPolicy.strings in Resources */ = {isa = PBXBuildFile; fileRef = C405A4CE24B9B9130062FAFA /* InternetAccessPolicy.strings */; };
 		C405A4D124B9B9140062FAFA /* InternetAccessPolicy.plist in Resources */ = {isa = PBXBuildFile; fileRef = C405A4CF24B9B9140062FAFA /* InternetAccessPolicy.plist */; };
@@ -176,6 +175,10 @@
 		C43A8A1A25D9CD1000591B77 /* Utility.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43A8A1925D9CD1000591B77 /* Utility.swift */; };
 		C43A8A2025D9D1D700591B77 /* brew-formula.json in Resources */ = {isa = PBXBuildFile; fileRef = C43A8A1F25D9D1D700591B77 /* brew-formula.json */; };
 		C43A8A2425D9D20D00591B77 /* HomebrewPackageTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43A8A2325D9D20D00591B77 /* HomebrewPackageTest.swift */; };
+		C43B8FD52BA9BAD3000C02BE /* UnavailableContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43B8FD42BA9BAD3000C02BE /* UnavailableContentView.swift */; };
+		C43B8FD62BA9C689000C02BE /* UnavailableContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43B8FD42BA9BAD3000C02BE /* UnavailableContentView.swift */; };
+		C43B8FD72BA9C689000C02BE /* UnavailableContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43B8FD42BA9BAD3000C02BE /* UnavailableContentView.swift */; };
+		C43B8FD82BA9C689000C02BE /* UnavailableContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43B8FD42BA9BAD3000C02BE /* UnavailableContentView.swift */; };
 		C43BCD4429FBEF40001547BC /* ModifyPhpVersionCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43BCD4329FBEF40001547BC /* ModifyPhpVersionCommand.swift */; };
 		C43BCD4529FBEF40001547BC /* ModifyPhpVersionCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43BCD4329FBEF40001547BC /* ModifyPhpVersionCommand.swift */; };
 		C43BCD4629FBEF40001547BC /* ModifyPhpVersionCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43BCD4329FBEF40001547BC /* ModifyPhpVersionCommand.swift */; };
@@ -484,7 +487,6 @@
 		C471E88128F9BB650021E251 /* NoWarningsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C708C28AA7F7900E8D498 /* NoWarningsView.swift */; };
 		C471E88228F9BB650021E251 /* OnboardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E9D2BF2878B336008FFDAD /* OnboardingView.swift */; };
 		C471E88328F9BB650021E251 /* VersionPopoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44264BF2850BD2A007400F1 /* VersionPopoverView.swift */; };
-		C471E88428F9BB650021E251 /* NoDomainResultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40508AE28ADA23D008FAC1F /* NoDomainResultsView.swift */; };
 		C471E88528F9BB650021E251 /* ServicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B6091C2853AB9700C95265 /* ServicesView.swift */; };
 		C471E88628F9BB650021E251 /* StatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4709CA128524B3400088BB8 /* StatsView.swift */; };
 		C471E88728F9BB650021E251 /* SectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B609192853AAD300C95265 /* SectionHeaderView.swift */; };
@@ -572,7 +574,6 @@
 		C471E8E428F9BB8F0021E251 /* NoWarningsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C708C28AA7F7900E8D498 /* NoWarningsView.swift */; };
 		C471E8E528F9BB8F0021E251 /* OnboardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E9D2BF2878B336008FFDAD /* OnboardingView.swift */; };
 		C471E8E628F9BB8F0021E251 /* VersionPopoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44264BF2850BD2A007400F1 /* VersionPopoverView.swift */; };
-		C471E8E728F9BB8F0021E251 /* NoDomainResultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40508AE28ADA23D008FAC1F /* NoDomainResultsView.swift */; };
 		C471E8E828F9BB8F0021E251 /* ServicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B6091C2853AB9700C95265 /* ServicesView.swift */; };
 		C471E8E928F9BB8F0021E251 /* StatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4709CA128524B3400088BB8 /* StatsView.swift */; };
 		C471E8EA28F9BB8F0021E251 /* SectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B609192853AAD300C95265 /* SectionHeaderView.swift */; };
@@ -821,6 +822,10 @@
 		C4E6840C2AF26B830023ED25 /* BrewTapFormulae.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E684082AF26B830023ED25 /* BrewTapFormulae.swift */; };
 		C4E9D2C02878B336008FFDAD /* OnboardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E9D2BF2878B336008FFDAD /* OnboardingView.swift */; };
 		C4E9D90129CBA09E00BD28D4 /* PHP Monitor Self-Updater.app in Resources */ = {isa = PBXBuildFile; fileRef = C4E9D90029CBA09E00BD28D4 /* PHP Monitor Self-Updater.app */; };
+		C4EA3C472BA4F947007B0BA7 /* CustomButtonStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EA3C462BA4F947007B0BA7 /* CustomButtonStyles.swift */; };
+		C4EA3C482BA4F947007B0BA7 /* CustomButtonStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EA3C462BA4F947007B0BA7 /* CustomButtonStyles.swift */; };
+		C4EA3C492BA4F947007B0BA7 /* CustomButtonStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EA3C462BA4F947007B0BA7 /* CustomButtonStyles.swift */; };
+		C4EA3C4A2BA4F947007B0BA7 /* CustomButtonStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EA3C462BA4F947007B0BA7 /* CustomButtonStyles.swift */; };
 		C4EB53E528551F9B006F9937 /* HeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EB53E428551F9B006F9937 /* HeaderView.swift */; };
 		C4EB53E728553117006F9937 /* ArrayExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EB53E628553117006F9937 /* ArrayExtension.swift */; };
 		C4EC1E73279DFCF40010F296 /* Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EC1E72279DFCF40010F296 /* Events.swift */; };
@@ -924,7 +929,6 @@
 		54FCFD2C276C8D67004CE748 /* HotkeyPreferenceView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HotkeyPreferenceView.xib; sourceTree = "<group>"; };
 		54FCFD2F276C8DA4004CE748 /* HotkeyPreferenceView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HotkeyPreferenceView.swift; sourceTree = "<group>"; };
 		C40175B72903108900763A68 /* ValetInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetInteractor.swift; sourceTree = "<group>"; };
-		C40508AE28ADA23D008FAC1F /* NoDomainResultsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoDomainResultsView.swift; sourceTree = "<group>"; };
 		C40508B028ADAB44008FAC1F /* NSMenuItemExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSMenuItemExtension.swift; sourceTree = "<group>"; };
 		C405A4CE24B9B9130062FAFA /* InternetAccessPolicy.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = InternetAccessPolicy.strings; sourceTree = "<group>"; };
 		C405A4CF24B9B9140062FAFA /* InternetAccessPolicy.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = InternetAccessPolicy.plist; sourceTree = "<group>"; };
@@ -998,6 +1002,7 @@
 		C43A8A1925D9CD1000591B77 /* Utility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utility.swift; sourceTree = "<group>"; };
 		C43A8A1F25D9D1D700591B77 /* brew-formula.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "brew-formula.json"; sourceTree = "<group>"; };
 		C43A8A2325D9D20D00591B77 /* HomebrewPackageTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomebrewPackageTest.swift; sourceTree = "<group>"; };
+		C43B8FD42BA9BAD3000C02BE /* UnavailableContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnavailableContentView.swift; sourceTree = "<group>"; };
 		C43BCD4329FBEF40001547BC /* ModifyPhpVersionCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModifyPhpVersionCommand.swift; sourceTree = "<group>"; };
 		C43FDBE829A932B0003D85EC /* PhpConfigChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpConfigChecker.swift; sourceTree = "<group>"; };
 		C44067F427E2582B0045BD4E /* DomainListNameCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainListNameCell.swift; sourceTree = "<group>"; };
@@ -1153,6 +1158,7 @@
 		C4E713572570151400007428 /* docs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = docs; sourceTree = "<group>"; };
 		C4E9D2BF2878B336008FFDAD /* OnboardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingView.swift; sourceTree = "<group>"; };
 		C4E9D90029CBA09E00BD28D4 /* PHP Monitor Self-Updater.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; path = "PHP Monitor Self-Updater.app"; sourceTree = "<group>"; };
+		C4EA3C462BA4F947007B0BA7 /* CustomButtonStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomButtonStyles.swift; sourceTree = "<group>"; };
 		C4EB53E428551F9B006F9937 /* HeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderView.swift; sourceTree = "<group>"; };
 		C4EB53E628553117006F9937 /* ArrayExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayExtension.swift; sourceTree = "<group>"; };
 		C4EC1E72279DFCF40010F296 /* Events.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Events.swift; sourceTree = "<group>"; };
@@ -1578,7 +1584,6 @@
 				C4D5576329C77CC5001A44CD /* PhpVersionManagerWindowController.swift */,
 				C43931C429C4BD610069165B /* PhpVersionManagerView.swift */,
 				C42106652AFA9FF400DF3732 /* PhpVersionManagerView+Actions.swift */,
-				C48DDD0C29C75C9E00D032D9 /* BlockingOverlayView.swift */,
 			);
 			path = UI;
 			sourceTree = "<group>";
@@ -1963,6 +1968,9 @@
 			children = (
 				C44264BD2850B86C007400F1 /* SwiftUIHelper.swift */,
 				C451AFF52969E40F0078E617 /* HelpButton.swift */,
+				C4EA3C462BA4F947007B0BA7 /* CustomButtonStyles.swift */,
+				C48DDD0C29C75C9E00D032D9 /* BlockingOverlayView.swift */,
+				C43B8FD42BA9BAD3000C02BE /* UnavailableContentView.swift */,
 			);
 			path = Common;
 			sourceTree = "<group>";
@@ -1982,7 +1990,6 @@
 			isa = PBXGroup;
 			children = (
 				C44264BF2850BD2A007400F1 /* VersionPopoverView.swift */,
-				C40508AE28ADA23D008FAC1F /* NoDomainResultsView.swift */,
 			);
 			path = Domains;
 			sourceTree = "<group>";
@@ -2330,7 +2337,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1420;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1530;
 				ORGANIZATIONNAME = "Nico Verbruggen";
 				TargetAttributes = {
 					C406A5EF298AD2CE00B5B85A = {
@@ -2543,6 +2550,7 @@
 				C4205A7E27F4D21800191A39 /* ValetProxy.swift in Sources */,
 				C4C8E818276F54D8003AC782 /* App+ConfigWatch.swift in Sources */,
 				C4E49DE728F764050026AC4E /* ActiveCommand.swift in Sources */,
+				C43B8FD52BA9BAD3000C02BE /* UnavailableContentView.swift in Sources */,
 				54FCFD30276C8DA4004CE748 /* HotkeyPreferenceView.swift in Sources */,
 				C450C8C628C919EC002A2B4B /* PreferenceName.swift in Sources */,
 				C4E4404627C56F4700D225E1 /* ValetSite.swift in Sources */,
@@ -2565,6 +2573,7 @@
 				031E2B692B1525A7007C29E1 /* BrewPhpExtension.swift in Sources */,
 				C4AD38B228ECD9D300FA8D83 /* TestableFileSystem.swift in Sources */,
 				C4EB53E528551F9B006F9937 /* HeaderView.swift in Sources */,
+				C4EA3C472BA4F947007B0BA7 /* CustomButtonStyles.swift in Sources */,
 				C40FE737282ABA4F00A302C2 /* AppVersion.swift in Sources */,
 				C44A874828905BB000498BC4 /* ProgressVC.swift in Sources */,
 				C4CCBA6C275C567B008C7055 /* PMWindowController.swift in Sources */,
@@ -2683,7 +2692,6 @@
 				54D9E0BA27E4F51E003B9AD9 /* ModifierFlagsExtension.swift in Sources */,
 				C4C3ED412783497000AB15D8 /* MainMenu+Startup.swift in Sources */,
 				C42106662AFA9FF400DF3732 /* PhpVersionManagerView+Actions.swift in Sources */,
-				C40508AF28ADA23D008FAC1F /* NoDomainResultsView.swift in Sources */,
 				C4B79ECB29CA475900A483EE /* RemovePhpVersionCommand.swift in Sources */,
 				C40D725F2A018AE30054A067 /* BrewFormula+UI.swift in Sources */,
 				C4D89BC62783C99400A02B68 /* ComposerJson.swift in Sources */,
@@ -2801,6 +2809,7 @@
 				C471E86E28F9BB650021E251 /* MenuBarIcons.swift in Sources */,
 				C471E86F28F9BB650021E251 /* Stats.swift in Sources */,
 				C4CE7F9829683B43000102CF /* PhpVersionNumberCollection.swift in Sources */,
+				C4EA3C492BA4F947007B0BA7 /* CustomButtonStyles.swift in Sources */,
 				C471E87028F9BB650021E251 /* GlobalKeybindPreference.swift in Sources */,
 				C471E87228F9BB650021E251 /* CheckboxPreferenceView.swift in Sources */,
 				C471E87428F9BB650021E251 /* SelectPreferenceView.swift in Sources */,
@@ -2817,7 +2826,6 @@
 				C471E88128F9BB650021E251 /* NoWarningsView.swift in Sources */,
 				C471E88228F9BB650021E251 /* OnboardingView.swift in Sources */,
 				C471E88328F9BB650021E251 /* VersionPopoverView.swift in Sources */,
-				C471E88428F9BB650021E251 /* NoDomainResultsView.swift in Sources */,
 				C4513F952B13E30C001AD760 /* BrewExtensionsObservable.swift in Sources */,
 				C471E88528F9BB650021E251 /* ServicesView.swift in Sources */,
 				C471E88628F9BB650021E251 /* StatsView.swift in Sources */,
@@ -2834,6 +2842,7 @@
 				C471E88F28F9BB650021E251 /* ModifierFlagsExtension.swift in Sources */,
 				C456A0CD2AA6166F0080144F /* BytePhpPreference.swift in Sources */,
 				C471E7E928F9BAC20021E251 /* Paths.swift in Sources */,
+				C43B8FD72BA9C689000C02BE /* UnavailableContentView.swift in Sources */,
 				C45B91552956123A00F4EC78 /* FakeServicesManager.swift in Sources */,
 				C471E7FE28F9BACE0021E251 /* HomebrewDecodable.swift in Sources */,
 				C4415E8F2B0287E90035F520 /* BrewFormulaeObservable.swift in Sources */,
@@ -2966,6 +2975,7 @@
 				C471E8B828F9BB8F0021E251 /* StatusMenu+Items.swift in Sources */,
 				C471E8B928F9BB8F0021E251 /* DomainListCellProtocol.swift in Sources */,
 				C471E8BA28F9BB8F0021E251 /* DomainListTLSCell.swift in Sources */,
+				C43B8FD82BA9C689000C02BE /* UnavailableContentView.swift in Sources */,
 				C471E8BB28F9BB8F0021E251 /* DomainListNameCell.swift in Sources */,
 				C471E8BC28F9BB8F0021E251 /* DomainListPhpCell.swift in Sources */,
 				C471E8BD28F9BB8F0021E251 /* DomainListTypeCell.swift in Sources */,
@@ -2990,6 +3000,7 @@
 				C41ADCEB2970CCC700120423 /* FSNotifier.swift in Sources */,
 				C471E8CA28F9BB8F0021E251 /* OnboardingWindowController.swift in Sources */,
 				C456A0C92AA614BD0080144F /* PhpPreference.swift in Sources */,
+				C4EA3C4A2BA4F947007B0BA7 /* CustomButtonStyles.swift in Sources */,
 				C4D4CB3A29C109CF00DB9F93 /* InternalSwitcher+Valet.swift in Sources */,
 				C471E8CB28F9BB8F0021E251 /* PreferencesWindowController.swift in Sources */,
 				C471E8CC28F9BB8F0021E251 /* PreferencesWindowController+Hotkey.swift in Sources */,
@@ -3024,7 +3035,6 @@
 				C4B79EBF29CA38DB00A483EE /* BrewCommand.swift in Sources */,
 				C45D654F29F52F74004C28F9 /* BrewPermissionFixer.swift in Sources */,
 				C471E8E628F9BB8F0021E251 /* VersionPopoverView.swift in Sources */,
-				C471E8E728F9BB8F0021E251 /* NoDomainResultsView.swift in Sources */,
 				C471E8E828F9BB8F0021E251 /* ServicesView.swift in Sources */,
 				C4E2E85F28FC282B003B070C /* TestableConfiguration.swift in Sources */,
 				C471E8E928F9BB8F0021E251 /* StatsView.swift in Sources */,
@@ -3253,6 +3263,7 @@
 				C489E0BC2A220A4200323F5E /* FakeBrewFormulaeHandler.swift in Sources */,
 				C4CE3BBB27B324230086CA49 /* MainMenu+Switcher.swift in Sources */,
 				C4B79ECC29CA475900A483EE /* RemovePhpVersionCommand.swift in Sources */,
+				C43B8FD62BA9C689000C02BE /* UnavailableContentView.swift in Sources */,
 				C4FD87AA29AB9ABD0002D701 /* PhpConfigChecker.swift in Sources */,
 				C485707D28BF45A200539B36 /* WarningView.swift in Sources */,
 				C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */,
@@ -3272,6 +3283,7 @@
 				031E2B6A2B1525A7007C29E1 /* BrewPhpExtension.swift in Sources */,
 				C4998F0B2617633900B2526E /* PreferencesWindowController.swift in Sources */,
 				C485707228BF453800539B36 /* SwiftUIHelper.swift in Sources */,
+				C4EA3C482BA4F947007B0BA7 /* CustomButtonStyles.swift in Sources */,
 				C4F2E43B27530F750020E974 /* PhpInstallation.swift in Sources */,
 				C4F780BD25D80B65000DBC97 /* Constants.swift in Sources */,
 				C44C198E276E3A1C0072762D /* TerminalProgressWindowController.swift in Sources */,
@@ -3655,7 +3667,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1425;
+				CURRENT_PROJECT_VERSION = 1460;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -3668,7 +3680,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 7.0.1;
+				MARKETING_VERSION = 7.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3686,7 +3698,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1425;
+				CURRENT_PROJECT_VERSION = 1460;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -3699,7 +3711,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 7.0.1;
+				MARKETING_VERSION = 7.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3927,7 +3939,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1425;
+				CURRENT_PROJECT_VERSION = 1460;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -3940,7 +3952,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 7.0.1;
+				MARKETING_VERSION = 7.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME) DEV";
@@ -4044,7 +4056,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1425;
+				CURRENT_PROJECT_VERSION = 1460;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -4057,7 +4069,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 7.0.1;
+				MARKETING_VERSION = 7.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME) DEV";
@@ -4161,7 +4173,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1425;
+				CURRENT_PROJECT_VERSION = 1460;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -4174,7 +4186,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 7.0.1;
+				MARKETING_VERSION = 7.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME) EAP";
@@ -4343,7 +4355,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1425;
+				CURRENT_PROJECT_VERSION = 1460;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -4356,7 +4368,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 7.0.1;
+				MARKETING_VERSION = 7.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap;
 				PRODUCT_MODULE_NAME = PHP_Monitor;
 				PRODUCT_NAME = "$(TARGET_NAME) EAP";

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

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

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

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

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

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

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

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

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

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

SECURITY.md

@@ -4,19 +4,20 @@
 
 Generally speaking, only the latest version of **PHP Monitor** is supported, except during transition periods (for example, when particular system requirements go up):
 
-| Version | Apple Silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Recommended Valet Version |
+| Version | Apple Silicon | Supported          | Supported macOS | Minimum Deployment | Detected PHP Versions | Recommended Valet Version |
 | ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
-| 6.2      | ✅ Universal binary | ✅ Yes | Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0) | macOS 12.4 | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
+| 7.0      | ✅ Universal binary | ✅ Yes | Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
 
 ## Legacy versions
 
 These versions of PHP Monitor are no longer supported, but if you’re using an older computer with an older version of Homebrew, Valet or macOS, you might want to use one of these versions.
 
-| Version | Apple Silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Minimum Required Valet Version |
+| Version | Apple Silicon | Supported          | Supported macOS | Minimum Deployment | Detected PHP Versions | Minimum Required Valet Version |
 | ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
-| 6.1      | ✅ Universal binary | ❌ | Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0) | macOS 12.4 | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
+| 6.2      | ✅ Universal binary | ❌ | Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
-| 6.0      | ✅ Universal binary | ❌ | Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4 | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
+| 6.1      | ✅ Universal binary | ❌ | Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
-| 5.8       | ✅ Universal binary | ❌ | Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4 | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
+| 6.0      | ✅ Universal binary | ❌ | Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
+| 5.8       | ✅ Universal binary | ❌ | Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
 | 5.7       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0)<br/>Ventura (13.0) | macOS 11+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
 | 5.6       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0)<br/>Ventura (13.0) | macOS 11+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x) | 3.0 recommended<br/> 2.16.2 minimum |
 | 4.1       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0) | macOS 11+ | PHP 5.6—PHP 8.2 | 2.16.2 |

phpmon/Assets.xcassets/SpinnerBackground.colorset/Contents.json

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

phpmon/Assets.xcassets/StatusColorBlue.colorset/Contents.json

@@ -24,7 +24,7 @@
         "components" : {
           "alpha" : "1.000",
           "blue" : "0.988",
-          "green" : "0.723",
+          "green" : "0.444",
           "red" : "0.277"
         }
       },

phpmon/Assets.xcassets/StatusColorYellowTranslucent.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.300",
+          "blue" : "0.180",
+          "green" : "0.841",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.300",
+          "blue" : "0.426",
+          "green" : "0.809",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "php.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

phpmon/Assets.xcassets/php.imageset/php.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="800" viewBox="0 0 24 24"><path d="M7.01 10.207h-.944l-.515 2.648h.838c.556 0 .97-.105 1.242-.314.272-.21.455-.559.55-1.049.092-.47.05-.802-.124-.995-.175-.193-.523-.29-1.047-.29zM12 5.688C5.373 5.688 0 8.514 0 12s5.373 6.313 12 6.313S24 15.486 24 12c0-3.486-5.373-6.312-12-6.312zm-3.26 7.451c-.261.25-.575.438-.917.551-.336.108-.765.164-1.285.164H5.357l-.327 1.681H3.652l1.23-6.326h2.65c.797 0 1.378.209 1.744.628.366.418.476 1.002.33 1.752a2.836 2.836 0 0 1-.305.847c-.143.255-.33.49-.561.703zm4.024.715.543-2.799c.063-.318.039-.536-.068-.651-.107-.116-.336-.174-.687-.174H11.46l-.704 3.625H9.388l1.23-6.327h1.367l-.327 1.682h1.218c.767 0 1.295.134 1.586.401s.378.7.263 1.299l-.572 2.944h-1.389zm7.597-2.265a2.782 2.782 0 0 1-.305.847c-.143.255-.33.49-.561.703a2.44 2.44 0 0 1-.917.551c-.336.108-.765.164-1.286.164h-1.18l-.327 1.682h-1.378l1.23-6.326h2.649c.797 0 1.378.209 1.744.628.366.417.477 1.001.331 1.751zm-2.595-1.382h-.943l-.516 2.648h.838c.557 0 .971-.105 1.242-.314.272-.21.455-.559.551-1.049.092-.47.049-.802-.125-.995s-.524-.29-1.047-.29z"/></svg>

phpmon/Common/Core/Constants.swift

@@ -30,7 +30,7 @@ struct Constants {
      will be displayed to let them know that certain operations
      will not work correctly and that they need to update their app.
      */
-    static let PhpFormulaeCutoffDate = "2024-11-01"
+    static let PhpFormulaeCutoffDate = "2024-11-01" // YYYY-MM-DD
 
     /**
      * The PHP versions that are considered pre-release versions.
@@ -54,6 +54,17 @@ struct Constants {
             })
     }
 
+    /**
+     The Homebrew services that should be automatically
+     detected and show up in the list of managed services.
+     */
+    static let DetectedHomebrewServices: Set = [
+        "mailhog",
+        "mysql@",
+        "postgresql@",
+        "redis"
+    ]
+
     /**
      * The PHP versions supported by this application.
      * Any other PHP versions are considered invalid.
@@ -78,14 +89,14 @@ struct Constants {
         3: // Valet v3 dropped support for v5.6
         [
             "7.0", "7.1", "7.2", "7.3", "7.4",
-            "8.0", "8.1", "8.2",
+            "8.0", "8.1", "8.2", "8.3",
-            "8.3", "8.4" // dev
+            "8.4" // dev
         ],
         4: // Valet v4 dropped support for v7.0
         [
             "7.1", "7.2", "7.3", "7.4",
-            "8.0", "8.1", "8.2",
+            "8.0", "8.1", "8.2", "8.3",
-            "8.3", "8.4" // dev
+            "8.4" // dev
         ]
     ]
 

phpmon/Common/Helpers/PMWindowController.swift

@@ -29,6 +29,8 @@ class PMWindowController: NSWindowController, NSWindowDelegate {
         App.shared.remove(window: windowName)
     }
 
+    func windowDidResize(_ notification: Notification) {}
+
     deinit {
         Log.perf("deinit: \(String(describing: self)).\(#function)")
     }

phpmon/Common/PHP/PhpInstallation.swift

@@ -22,6 +22,16 @@ class PhpInstallation {
         return self.iniFiles.flatMap({ $0.extensions })
     }
 
+    var formulaName: String {
+        let version = self.versionNumber.short
+
+        if version == PhpEnvironments.brewPhpAlias {
+            return "php"
+        }
+
+        return "php@\(self.versionNumber.short)"
+    }
+
     /**
      In order to determine details about a PHP installation,
      we’ll simply run `php-config --version` in the relevant directory.

phpmon/Domain/App/AppDelegate.swift

@@ -23,12 +23,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
      */
     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.
@@ -96,7 +90,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
         }
 
         self.state = App.shared
-        self.menu = MainMenu.shared
         self.paths = Paths.shared
         self.valet = Valet.shared
         self.brew = Brew.shared
@@ -132,7 +125,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
         setupNotifications()
 
         Task { // Make sure the menu performs its initial checks
-            await menu.startup()
+            await MainMenu.shared.startup()
         }
     }
 

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Search Toolbar Item" minToolsVersion="12.0" minSystemVersion="11.0"/>
@@ -429,7 +429,7 @@
                                 </toolbarItem>
                                 <searchToolbarItem implicitItemIdentifier="7C834FBE-7118-4082-A09F-7CBECEC1356A" label="Search" paletteLabel="Search" visibilityPriority="1001" id="G2g-jS-RVc">
                                     <nil key="toolTip"/>
-                                    <searchField key="view" focusRingType="none" verticalHuggingPriority="750" textCompletion="NO" id="0gE-Yr-MLy">
+                                    <searchField key="view" verticalHuggingPriority="750" textCompletion="NO" id="0gE-Yr-MLy">
                                         <rect key="frame" x="0.0" y="0.0" width="100" height="21"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" sendsSearchStringImmediately="YES" id="vp9-vH-goQ">
@@ -575,7 +575,7 @@ Gw
                                     <constraint firstAttribute="bottom" secondItem="8zu-cF-KCX" secondAttribute="bottom" constant="20" symbolic="YES" id="wIl-uw-y3p"/>
                                 </constraints>
                             </visualEffectView>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="U1c-qS-cIm">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="U1c-qS-cIm">
                                 <rect key="frame" x="98" y="153" width="384" height="19"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="380" id="WgB-hj-d4P"/>
@@ -586,7 +586,7 @@ Gw
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yI6-qf-htf">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yI6-qf-htf">
                                 <rect key="frame" x="98" y="127" width="384" height="16"/>
                                 <textFieldCell key="cell" selectable="YES" title="This is a slightly more expanded explanation." id="rY3-Nd-Iit">
                                     <font key="font" metaFont="system"/>
@@ -610,7 +610,7 @@ Gw
                                 </constraints>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="7eT-Hw-EL9"/>
                             </imageView>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hml-dl-Cah">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hml-dl-Cah">
                                 <rect key="frame" x="98" y="70" width="384" height="42"/>
                                 <textFieldCell key="cell" selectable="YES" id="7iW-Lc-DqO">
                                     <font key="font" metaFont="smallSystem"/>
@@ -699,7 +699,7 @@ Gw
                                     <action selector="pressedCancel:" target="glS-wF-sEU" id="q0L-YZ-F3J"/>
                                 </connections>
                             </button>
-                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZX9-s1-23i">
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZX9-s1-23i">
                                 <rect key="frame" x="20" y="150" width="440" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Enter a domain name here." drawsBackground="YES" id="NFa-1D-Bi4">
                                     <font key="font" metaFont="system"/>
@@ -710,7 +710,7 @@ Gw
                                     <outlet property="delegate" destination="glS-wF-sEU" id="Dyf-0M-Gwj"/>
                                 </connections>
                             </textField>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VzR-5a-cmT">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VzR-5a-cmT">
                                 <rect key="frame" x="18" y="128" width="444" height="14"/>
                                 <textFieldCell key="cell" title="[i18n] Preview text here" id="bJr-s6-tdP">
                                     <font key="font" metaFont="smallSystem"/>
@@ -728,7 +728,7 @@ Gw
                                     <action selector="pressedSecure:" target="glS-wF-sEU" id="OIj-Pz-5Ea"/>
                                 </connections>
                             </button>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mmQ-7e-dlb">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mmQ-7e-dlb">
                                 <rect key="frame" x="18" y="60" width="444" height="28"/>
                                 <textFieldCell key="cell" title="[i18n] Securing a domain requires administrative privileges. 
You may be prompted for your password or Touch ID." id="4gd-KM-5Fu">
                                     <font key="font" metaFont="smallSystem"/>
@@ -743,7 +743,7 @@ Gw
                                     <url key="url" string="file:///Users/"/>
                                 </pathCell>
                             </pathControl>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P0B-Ht-R8n">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P0B-Ht-R8n">
                                 <rect key="frame" x="18" y="209" width="128" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="[i18n] Link a Folder" id="S4j-ZC-ddT">
                                     <font key="font" textStyle="headline" name=".SFNS-Bold"/>
@@ -751,7 +751,7 @@ Gw
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="900-Z2-tID">
+                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="900-Z2-tID">
                                 <rect key="frame" x="140" y="23" width="180" height="14"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="That domain name already exists." id="jOt-n6-TQf">
                                     <font key="font" metaFont="smallSystem"/>
@@ -886,7 +886,7 @@ Gw
                                                             <rect key="frame" x="69" y="0.0" width="200" height="54"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="XJL-Uw-frD">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="XJL-Uw-frD">
                                                                     <rect key="frame" x="3" y="26" width="145" height="16"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="my-domain-name.test" id="SGC-Gm-Mxd">
                                                                         <font key="font" metaFont="systemSemibold" size="13"/>
@@ -894,7 +894,7 @@ Gw
                                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                 </textField>
-                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="CXK-Q9-CpO">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="CXK-Q9-CpO">
                                                                     <rect key="frame" x="3" y="12" width="75" height="14"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="~/path/to/site" id="fe7-Ha-mR9">
                                                                         <font key="font" metaFont="smallSystem"/>
@@ -1027,7 +1027,7 @@ Gw
                                                             <rect key="frame" x="470" y="0.0" width="97" height="54"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ljl-8B-key">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ljl-8B-key">
                                                                     <rect key="frame" x="6" y="26" width="93" height="14"/>
                                                                     <textFieldCell key="cell" alignment="left" title="Laravel" id="0lu-L6-oKr">
                                                                         <font key="font" metaFont="smallSystem"/>
@@ -1035,7 +1035,7 @@ Gw
                                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                 </textField>
-                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aPK-Xc-J4B">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aPK-Xc-J4B">
                                                                     <rect key="frame" x="6" y="15" width="93" height="11"/>
                                                                     <textFieldCell key="cell" alignment="left" title="PHP 8.0" id="puf-Jh-ham">
                                                                         <font key="font" metaFont="miniSystem"/>
@@ -1092,9 +1092,18 @@ Gw
                                     <constraint firstAttribute="height" constant="30" id="lfW-dB-Eu3"/>
                                 </constraints>
                             </progressIndicator>
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="wcV-ed-8Bv">
+                                <rect key="frame" x="113" y="5" width="400" height="300"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="400" id="HCo-LG-x3N"/>
+                                    <constraint firstAttribute="height" constant="300" id="Xpi-Rl-xmb"/>
+                                </constraints>
+                            </customView>
                         </subviews>
                         <constraints>
                             <constraint firstItem="p0j-eB-I2i" firstAttribute="leading" secondItem="rIZ-4U-bhj" secondAttribute="leading" id="2Tx-yb-xrv"/>
+                            <constraint firstItem="wcV-ed-8Bv" firstAttribute="centerX" secondItem="rIZ-4U-bhj" secondAttribute="centerX" id="DPz-kQ-aP0"/>
+                            <constraint firstItem="wcV-ed-8Bv" firstAttribute="centerY" secondItem="rIZ-4U-bhj" secondAttribute="centerY" id="HCW-zJ-gSY"/>
                             <constraint firstItem="p0j-eB-I2i" firstAttribute="top" secondItem="rIZ-4U-bhj" secondAttribute="top" id="Pst-5A-dI0"/>
                             <constraint firstAttribute="bottom" secondItem="p0j-eB-I2i" secondAttribute="bottom" id="QEw-5m-u1s"/>
                             <constraint firstItem="ZiS-Gq-TLQ" firstAttribute="centerY" secondItem="rIZ-4U-bhj" secondAttribute="centerY" constant="-10" id="XqX-Tf-8ck"/>
@@ -1103,6 +1112,7 @@ Gw
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="noResultsView" destination="wcV-ed-8Bv" id="K3s-fb-1aN"/>
                         <outlet property="progressIndicator" destination="ZiS-Gq-TLQ" id="Ylb-Vk-uub"/>
                         <outlet property="tableView" destination="cp3-34-pQj" id="sdw-Ac-27X"/>
                     </connections>
@@ -1125,7 +1135,7 @@ Gw
                                     <rect key="frame" x="0.0" y="0.0" width="540" height="286"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QCK-Z9-w7g">
+                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QCK-Z9-w7g">
                                             <rect key="frame" x="20" y="196" width="500" height="21"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" title="http://127.0.0.1:80" placeholderString="http://127.0.0.1:80" drawsBackground="YES" id="muS-8M-KSy">
                                                 <font key="font" metaFont="system"/>
@@ -1136,7 +1146,7 @@ Gw
                                                 <outlet property="delegate" destination="dwh-CF-6iv" id="lNE-OI-G93"/>
                                             </connections>
                                         </textField>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Uib-vA-HRc">
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Uib-vA-HRc">
                                             <rect key="frame" x="18" y="221" width="325" height="14"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="[i18n] Proxy subject (usually: protocol, IP address and port)" id="G1Z-3f-BhL">
                                                 <font key="font" metaFont="systemMedium" size="11"/>
@@ -1144,7 +1154,7 @@ Gw
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mlA-Zt-Hu8">
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mlA-Zt-Hu8">
                                             <rect key="frame" x="18" y="172" width="112" height="14"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="[i18n] Domain name" id="dQs-oZ-80e">
                                                 <font key="font" metaFont="systemMedium" size="11"/>
@@ -1152,7 +1162,7 @@ Gw
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SNw-oQ-bnb">
+                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SNw-oQ-bnb">
                                             <rect key="frame" x="20" y="147" width="500" height="21"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Enter a domain name here." drawsBackground="YES" id="gTQ-Y2-Y9w">
                                                 <font key="font" metaFont="system"/>
@@ -1208,7 +1218,7 @@ Gw
                                     <action selector="pressedCancel:" target="dwh-CF-6iv" id="J2T-Zj-A0j"/>
                                 </connections>
                             </button>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JSZ-x8-Pqi">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JSZ-x8-Pqi">
                                 <rect key="frame" x="18" y="128" width="504" height="14"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="500" id="sF1-RG-URI"/>
@@ -1229,7 +1239,7 @@ Gw
                                     <action selector="pressedSecure:" target="dwh-CF-6iv" id="b74-8T-AzO"/>
                                 </connections>
                             </button>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5x7-ll-2f7">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5x7-ll-2f7">
                                 <rect key="frame" x="18" y="60" width="504" height="28"/>
                                 <textFieldCell key="cell" title="[i18n] Securing a domain requires administrative privileges. 
You may be prompted for your password or Touch ID." id="IMB-O5-ZOy">
                                     <font key="font" metaFont="smallSystem"/>
@@ -1237,7 +1247,7 @@ Gw
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DAh-br-Dfx">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DAh-br-Dfx">
                                 <rect key="frame" x="18" y="250" width="123" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="[i18n] Add a Proxy" id="AZ1-04-kUl">
                                     <font key="font" textStyle="headline" name=".SFNS-Bold"/>
@@ -1245,7 +1255,7 @@ Gw
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="w0k-CK-0u4">
+                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="w0k-CK-0u4">
                                 <rect key="frame" x="191" y="23" width="180" height="14"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="That domain name already exists." id="4sH-94-UJl">
                                     <font key="font" metaFont="smallSystem"/>
@@ -1389,7 +1399,7 @@ Gw
                                             <real value="3.4028234663852886e+38"/>
                                         </customSpacing>
                                     </stackView>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fJK-Ke-IK3">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fJK-Ke-IK3">
                                         <rect key="frame" x="18" y="138" width="504" height="19"/>
                                         <textFieldCell key="cell" selectable="YES" alignment="left" title="[i18n] What kind of domain would you like to set up?" id="agk-Nj-FLd">
                                             <font key="font" metaFont="systemBold" size="15"/>
@@ -1397,7 +1407,7 @@ Gw
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <textField wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="urj-Xq-TrJ">
+                                    <textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="urj-Xq-TrJ">
                                         <rect key="frame" x="18" y="60" width="504" height="70"/>
                                         <constraints>
                                             <constraint firstAttribute="width" relation="lessThanOrEqual" constant="500" id="tbl-AV-4qB"/>

phpmon/Domain/Integrations/Homebrew/BrewPhpFormulaeHandler.swift

@@ -44,14 +44,13 @@ class BrewPhpFormulaeHandler: HandlesBrewPhpFormulae {
         }
 
         return Brew.phpVersionFormulae.map { (version, formula) in
-            let fullVersion = PhpEnvironments.shared.cachedPhpInstallations[version]?
+            var fullVersion: String?
-                .versionNumber.text
-
             var upgradeVersion: String?
 
-            if let version = fullVersion {
+            if let install = PhpEnvironments.shared.cachedPhpInstallations[version] {
+                fullVersion = install.versionNumber.text
                 upgradeVersion = outdated?.first(where: { formula in
-                    return formula.installed_versions.contains(version)
+                    return formula.name == install.formulaName
                 })?.current_version
             }
 

phpmon/Domain/Menu/StatusMenu+Items.swift

@@ -242,7 +242,7 @@ extension StatusMenu {
         addLoadedPresets()
     }
 
-    private func addEmptyPresetHelp() {
+    @MainActor private func addEmptyPresetHelp() {
         addItem(NSMenuItem(title: "mi_presets_title".localized, submenu: [
             NSMenuItem(title: "mi_no_presets".localized),
             NSMenuItem.separator(),
@@ -251,7 +251,7 @@ extension StatusMenu {
         ], target: MainMenu.shared))
     }
 
-    private func addLoadedPresets() {
+    @MainActor private func addLoadedPresets() {
         addItem(NSMenuItem(title: "mi_presets_title".localized, submenu: [
             NSMenuItem.separator(),
             HeaderView.asMenuItem(text: "mi_apply_presets_title".localized)
@@ -266,7 +266,7 @@ extension StatusMenu {
 
     // MARK: - Xdebug
 
-    func addXdebugMenuItem() {
+    @MainActor func addXdebugMenuItem() {
         if !Xdebug.enabled {
             addItem(NSMenuItem.separator())
             return
@@ -286,7 +286,7 @@ extension StatusMenu {
 
     // MARK: - PHP Doctor
 
-    func addPhpDoctorMenuItem() {
+    @MainActor func addPhpDoctorMenuItem() {
         if !Preferences.isEnabled(.showPhpDoctorSuggestions) ||
             !WarningManager.shared.hasWarnings() {
             return
@@ -302,7 +302,7 @@ extension StatusMenu {
 
     // MARK: - First Aid & Services
 
-    func addFirstAidAndServicesMenuItems() {
+    @MainActor func addFirstAidAndServicesMenuItems() {
         let services = NSMenuItem(title: "mi_other".localized)
 
         var items: [NSMenuItem] = [
@@ -359,7 +359,7 @@ extension StatusMenu {
 
     // MARK: - Other helper methods to generate menu items
 
-    func addExtensionItem(_ phpExtension: PhpExtension, _ shortcutKey: Int) {
+    @MainActor func addExtensionItem(_ phpExtension: PhpExtension, _ shortcutKey: Int) {
         let keyEquivalent = shortcutKey < 9 ? "\(shortcutKey)" : ""
 
         let menuItem = ExtensionMenuItem(

phpmon/Domain/SwiftUI/Common/BlockingOverlayView.swift

@@ -29,7 +29,7 @@ struct BlockingOverlayView<Content: View>: View {
 
     var body: some View {
         ZStack(alignment: .center) {
-            content().opacity(isBlocking ? 0.2 : 1)
+            content().opacity(isBlocking ? 0 : 1)
             if isBlocking {
                 VStack {
                     ActivityIndicator()
@@ -44,7 +44,8 @@ struct BlockingOverlayView<Content: View>: View {
                         .padding(.top, -4)
                 }.padding(60)
             }
-        }.background(Color.white)
+        }
+        .background(Color.spinnerBackground)
         .disabled(isBlocking)
     }
 }

phpmon/Domain/SwiftUI/Common/CustomButtonStyles.swift

@@ -0,0 +1,36 @@
+//
+//  CustomButtonStyles.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 15/03/2024.
+//  Copyright © 2024 Nico Verbruggen. All rights reserved.
+//
+
+import SwiftUI
+
+public struct CustomButtonStyle: ButtonStyle {
+    @Environment(\.isEnabled) var isEnabled
+
+    public func makeBody(configuration: Self.Configuration) -> some View {
+        configuration.label
+            .padding(.vertical, 4)
+            .padding(.horizontal, 8)
+            .foregroundStyle(.white)
+            .background(.statusColorBlue, in: .rect(cornerRadius: 8, style: .continuous))
+            .opacity({
+                if configuration.isPressed {
+                    return 0.4
+                }
+
+                if !isEnabled {
+                    return 0.2
+                }
+
+                return 1.0
+            }())
+    }
+}
+
+extension ButtonStyle where Self == CustomButtonStyle {
+    static var custom: CustomButtonStyle { .init() }
+}

phpmon/Domain/SwiftUI/Common/UnavailableContentView.swift

@@ -0,0 +1,67 @@
+//
+//  NoDomainsView.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 19/03/2024.
+//  Copyright © 2024 Nico Verbruggen. All rights reserved.
+//
+
+import SwiftUI
+
+struct UnavailableContentView: View {
+    var title: String
+    var description: String
+    var icon: String
+    var button: String?
+    var action: (() -> Void)?
+
+    init(
+        title: String,
+        description: String,
+        icon: String,
+        button: String? = nil,
+        action: (() -> Void)? = nil
+    ) {
+        self.title = title
+        self.description = description
+        self.icon = icon
+        self.button = button
+        self.action = action
+    }
+
+    var body: some View {
+        Group {
+            VStack(spacing: 15) {
+                Image(systemName: self.icon)
+                    .resizable()
+                    .frame(width: 48, height: 48)
+                    .foregroundColor(Color.appPrimary)
+                    .padding(.bottom, 10)
+                Text(self.title)
+                    .font(.system(size: 18, weight: .bold))
+
+                Text(self.description)
+                    .foregroundStyle(Color.secondary)
+                    .multilineTextAlignment(.center)
+
+                if self.button != nil {
+                    Button(self.button!) {
+                        self.action!()
+                    }.buttonStyle(.custom)
+                }
+            }
+        }
+        .padding(30)
+        .frame(maxWidth: 400)
+    }
+}
+
+#Preview {
+    UnavailableContentView(
+        title: "domain_list.domains_empty.title".localized,
+        description: "domain_list.domains_empty.desc".localized,
+        icon: "globe",
+        button: "domain_list.domains_empty.button".localized,
+        action: {}
+    )
+}

phpmon/Domain/SwiftUI/Domains/NoDomainResultsView.swift

@@ -1,35 +0,0 @@
-//
-//  NoDomainResults.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 15/08/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import SwiftUI
-
-struct NoDomainResults: View {
-    @State var searching: Bool = false
-
-    var body: some View {
-        VStack(alignment: .center, spacing: 15) {
-            Image(systemName: searching ? "magnifyingglass.circle.fill" : "questionmark.circle.fill")
-                .resizable()
-                .renderingMode(.template)
-                .frame(width: 24, height: 24)
-            VStack(alignment: .center) {
-                Text(
-                    searching
-                    ? "domain_list.no_domains_for_search_query".localizedForSwiftUI
-                    : "domain_list.no_domains".localizedForSwiftUI
-                )
-            }
-        }
-        .frame(minWidth: 0, maxWidth: .infinity)
-        .padding(25)
-    }
-}
-
-#Preview {
-    NoDomainResults()
-}

phpmon/Domain/SwiftUI/Domains/VersionPopoverView.swift

@@ -14,8 +14,16 @@ struct VersionPopoverView: View {
 
     @State var validPhpVersions: [VersionNumber]
 
+    @State var prefersIsolationSuggestions: Bool
+
     @State var parent: NSPopover!
 
+    let rows = [
+        GridItem(.flexible()),
+        GridItem(.flexible()),
+        GridItem(.flexible())
+    ]
+
     var body: some View {
         VStack(alignment: .leading, spacing: 10) {
             Text(getTitleText())
@@ -32,14 +40,29 @@ struct VersionPopoverView: View {
                         message: "alert.php_suggestions".localized,
                         color: Color("AppColor")
                     )
-                    HStack {
+                    if prefersIsolationSuggestions {
-                        ForEach(validPhpVersions, id: \.self) { version in
+                        // SITE ISOLATION (preferred)
-                            Button("site_link.switch_to_php".localized(version.short), action: {
+                        LazyVGrid(columns: self.rows, alignment: .leading, spacing: 5, content: {
-                                MainMenu.shared.switchToPhpVersion(version.short)
+                            ForEach(validPhpVersions, id: \.self) { version in
-                                parent?.close()
+                                Button("site_link.isolate_php".localized(version.short), action: {
-                            })
+                                    App.shared.domainListWindowController?.contentVC
-                        }
+                                        .isolateSite(site: site, version: version.short)
-                    }.padding(EdgeInsets(top: 10, leading: 0, bottom: 0, trailing: 0))
+                                    parent?.close()
+                                }).padding(EdgeInsets(top: 3, leading: 0, bottom: 3, trailing: 0))
+                            }
+                        }).padding(EdgeInsets(top: 5, leading: 0, bottom: 0, trailing: 0))
+                    } else {
+                        // GLOBAL SWITCHER
+                        LazyVGrid(columns: self.rows, alignment: .leading, spacing: 5, content: {
+                            ForEach(validPhpVersions, id: \.self) { version in
+                                Button("site_link.switch_to_php".localized(version.short), action: {
+                                    MainMenu.shared.switchToPhpVersion(version.short)
+                                    parent?.close()
+                                }).padding(EdgeInsets(top: 3, leading: 0, bottom: 3, trailing: 0))
+                            }
+                        }).padding(EdgeInsets(top: 5, leading: 0, bottom: 0, trailing: 0))
+                    }
+
                 }
             } else {
                 if site.preferredPhpVersionSource == .unknown {
@@ -137,6 +160,7 @@ struct DisclaimerView: View {
             constraint: ""
         ),
         validPhpVersions: [],
+        prefersIsolationSuggestions: false,
         parent: nil
     )
 }
@@ -152,6 +176,7 @@ struct DisclaimerView: View {
             constraint: "^8.1"
         ),
         validPhpVersions: [],
+        prefersIsolationSuggestions: false,
         parent: nil
     )
 }
@@ -168,6 +193,7 @@ struct DisclaimerView: View {
             isolated: "8.0"
         ),
         validPhpVersions: [],
+        prefersIsolationSuggestions: false,
         parent: nil
     )
 }
@@ -184,6 +210,7 @@ struct DisclaimerView: View {
             isolated: "7.4"
         ),
         validPhpVersions: [],
+        prefersIsolationSuggestions: false,
         parent: nil
     )
 }
@@ -200,8 +227,12 @@ struct DisclaimerView: View {
         ),
         validPhpVersions: [
             VersionNumber(major: 8, minor: 0, patch: 0),
-            VersionNumber(major: 8, minor: 1, patch: 0)
+            VersionNumber(major: 8, minor: 1, patch: 0),
+            VersionNumber(major: 8, minor: 2, patch: 0),
+            VersionNumber(major: 8, minor: 3, patch: 0),
+            VersionNumber(major: 8, minor: 4, patch: 0)
         ],
+        prefersIsolationSuggestions: true,
         parent: nil
     )
 }

phpmon/Modules/Domain List/UI/Cells/DomainListPhpCell.swift

@@ -70,7 +70,12 @@ class DomainListPhpCell: NSTableCellView, DomainListCellProtocol {
         let button = self.buttonPhpVersion!
         let popover = NSPopover()
 
-        let view = VersionPopoverView(site: site, validPhpVersions: validPhpSuggestions, parent: popover)
+        let view = VersionPopoverView(
+            site: site,
+            validPhpVersions: validPhpSuggestions,
+            prefersIsolationSuggestions: Valet.enabled(feature: .isolatedSites),
+            parent: popover
+        )
 
         popover.contentViewController = NSHostingController(rootView: view)
         popover.behavior = .transient

phpmon/Modules/Domain List/UI/DomainListVC+Actions.swift

@@ -126,17 +126,17 @@ extension DomainListVC {
         }
     }
 
-    @objc func isolateSite(sender: PhpMenuItem) {
+    public func isolateSite(site: ValetSite, version: String) {
-        guard let site = selectedSite else {
-            return
-        }
-
         waitAndExecute {
             do {
                 // Instruct Valet to isolate a given PHP version
-                try await site.isolate(version: sender.version)
+                try await site.isolate(version: version)
-                // Reload the UI
+                // Reload the UI if it's the same site
-                self.reloadSelectedRow()
+                if self.selectedSite?.absolutePath == site.absolutePath {
+                    self.reloadSelectedRow()
+                } else {
+                    await self.reloadDomains()
+                }
             } catch {
                 // Notify the user about a failed command
                 let error = error as! ValetInteractionError
@@ -145,7 +145,15 @@ extension DomainListVC {
         }
     }
 
-    @objc func removeIsolatedSite() {
+    @objc func isolateSiteViaMenuItem(sender: PhpMenuItem) {
+        guard let site = selectedSite else {
+            return
+        }
+
+        self.isolateSite(site: site, version: sender.version)
+    }
+
+    @objc func removeIsolatedSiteViaMenuItem() {
         guard let site = selectedSite else {
             return
         }

phpmon/Modules/Domain List/UI/DomainListVC+ContextMenu.swift

@@ -121,7 +121,7 @@ extension DomainListVC {
         for version in PhpEnvironments.shared.availablePhpVersions.reversed() {
             let item = PhpMenuItem(
                 title: "domain_list.always_use_php".localized(version),
-                action: #selector(self.isolateSite),
+                action: #selector(self.isolateSiteViaMenuItem),
                 keyEquivalent: ""
             )
             if site.servingPhpVersion == version && site.isolatedPhpVersion != nil {
@@ -137,7 +137,7 @@ extension DomainListVC {
             items.append(NSMenuItem.separator())
             items.append(NSMenuItem(
                 title: "domain_list.remove_isolation".localized,
-                action: #selector(self.removeIsolatedSite)
+                action: #selector(self.removeIsolatedSiteViaMenuItem)
             ))
         }
 

phpmon/Modules/Domain List/UI/DomainListVC.swift

@@ -8,12 +8,14 @@
 
 import Cocoa
 import Carbon
+import SwiftUI
 
 class DomainListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource {
 
     // MARK: - Outlets
 
     @IBOutlet weak var tableView: PMTableView!
+    @IBOutlet weak var noResultsView: NSView!
     @IBOutlet weak var progressIndicator: NSProgressIndicator!
 
     // MARK: - Variables
@@ -93,6 +95,8 @@ class DomainListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource
     override func viewDidLoad() {
         tableView.doubleAction = #selector(self.doubleClicked(sender:))
 
+        addNoResultsView()
+
         let mapping = [
             "SECURE": "domain_list.columns.secure",
             "DOMAIN": "domain_list.columns.domain",
@@ -115,6 +119,25 @@ class DomainListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource
         }
     }
 
+    private func addNoResultsView() {
+        let child = NSHostingController(
+            rootView: UnavailableContentView(
+                title: "domain_list.domains_empty.title".localized,
+                description: "domain_list.domains_empty.desc".localized,
+                icon: "globe",
+                button: "domain_list.domains_empty.button".localized,
+                action: {
+                    App.shared.domainListWindowController?
+                        .pressedAddLink(nil)
+                }
+            )
+            .frame(width: 400, height: 300)
+        ).view
+
+        self.noResultsView.addSubview(child)
+        child.frame = self.noResultsView.bounds
+    }
+
     // MARK: - Async Operations
 
     /**
@@ -132,6 +155,7 @@ class DomainListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource
         tableView.alphaValue = 0.3
         tableView.isEnabled = false
         tableView.selectRowIndexes([], byExtendingSelection: true)
+        noResultsView.isHidden = true
     }
 
     /**
@@ -142,6 +166,7 @@ class DomainListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource
         progressIndicator.stopAnimation(nil)
         tableView.alphaValue = 1.0
         tableView.isEnabled = true
+        updateNoResultsView()
     }
 
     /**
@@ -282,9 +307,14 @@ class DomainListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource
 
         Task { @MainActor in
             self.tableView.reloadData()
+            updateNoResultsView()
         }
     }
 
+    func updateNoResultsView() {
+        self.noResultsView.isHidden = !domains.isEmpty
+    }
+
     func searchedFor(text: String) {
         lastSearchedFor = text
 

phpmon/Modules/PHP Extension Manager/UI/PhpExtensionManagerView.swift

@@ -58,7 +58,7 @@ struct PhpExtensionManagerView: View {
                 .searchable(text: $searchText)
             }
         }
-        .frame(width: 600, height: 600)
+        .frame(minWidth: 600, minHeight: 600)
         .onAppear {
             Task {
                 await delay(seconds: 1)

phpmon/Modules/PHP Extension Manager/UI/PhpExtensionManagerWindowController.swift

@@ -1,5 +1,5 @@
 //
-//  PhpVersionManagerWindowController.swift
+//  PhpExtensionManagerWindowController.swift
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 13/11/2023.
@@ -28,7 +28,7 @@ class PhpExtensionManagerWindowController: PMWindowController {
 
         guard let window = windowController.window else { return }
         window.title = "phpextman.window.title".localized
-        window.styleMask = [.titled, .closable, .miniaturizable]
+        window.styleMask = [.titled, .closable, .miniaturizable, .resizable]
         window.titlebarAppearsTransparent = false
         window.delegate = delegate ?? windowController
         window.contentView = NSHostingView(rootView: windowController.view)

phpmon/Modules/PHP Version Manager/UI/PhpVersionManagerView.swift

@@ -94,6 +94,8 @@ struct PhpVersionManagerView: View {
         VStack {
             header.padding(10)
 
+            Divider()
+
             if self.hasUpdates {
                 hasUpdatesView
             } else {
@@ -134,16 +136,17 @@ struct PhpVersionManagerView: View {
                     .listStyle(PlainListStyle())
                 }
             }
-        }.frame(width: 600, height: 600)
+        }
+        .frame(minWidth: 600, minHeight: 600)
     }
 
     // MARK: View Variables
 
     private var header: some View {
         HStack(alignment: .center, spacing: 15) {
-            Image(systemName: "arrow.down.to.line.circle.fill")
+            Image.init(.php)
                 .resizable()
-                .frame(width: 40, height: 40)
+                .frame(width: 50, height: 50)
                 .foregroundColor(Color.blue)
                 .padding(12)
             VStack(alignment: .leading, spacing: 5) {
@@ -160,44 +163,43 @@ struct PhpVersionManagerView: View {
 
     private var hasUpdatesView: some View {
         Group {
-            Divider()
             HStack(alignment: .center, spacing: 15) {
                 Text("phpman.has_updates.description".localizedForSwiftUI)
-                    .foregroundColor(.gray)
                     .font(.system(size: 11))
 
-                Button("phpman.has_updates.button".localizedForSwiftUI, action: {
+                Button(action: {
                     Task { await self.upgradeAll(self.formulae.upgradeable) }
-
+                }, label: {
+                    Label("phpman.has_updates.button".localizedForSwiftUI,
+                          systemImage: "arrowshape.up.circle.fill")
                 })
+                .buttonStyle(.custom)
                 .focusable(false)
                 .disabled(self.status.busy)
             }
             .padding(10)
         }
+        .background(.statusColorYellowTranslucent)
+        .cornerRadius(5)
     }
 
     private var noUpdatesView: some View {
-        Group {
+        HStack(alignment: .center, spacing: 15) {
-            Divider()
+            Button {
-
+                Task { await self.reload() }
-            HStack(alignment: .center, spacing: 15) {
+            } label: {
-                Button {
+                Image(systemName: "arrow.clockwise")
-                    Task { await self.reload() }
+                    .buttonStyle(.automatic)
-                } label: {
+                    .controlSize(.large)
-                    Image(systemName: "arrow.clockwise")
-                        .buttonStyle(.automatic)
-                        .controlSize(.large)
-                }
-                .focusable(false)
-                .disabled(self.status.busy)
-
-                Text("phpman.refresh.button.description".localizedForSwiftUI)
-                    .foregroundColor(.gray)
-                    .font(.system(size: 11))
             }
-            .padding(10)
+            .focusable(false)
+            .disabled(self.status.busy)
+
+            Text("phpman.refresh.button.description".localizedForSwiftUI)
+                .foregroundColor(.gray)
+                .font(.system(size: 11))
         }
+        .padding(10)
     }
 
     private var prereleaseBadge: some View {
@@ -205,7 +207,7 @@ struct PhpVersionManagerView: View {
             .font(.system(size: 9))
             .padding(.horizontal, 5)
             .padding(.vertical, 1)
-            .background(Color.appPrimary)
+            .background(Color.statusColorBlue)
             .foregroundColor(Color.white)
             .clipShape(Capsule())
             .fixedSize(horizontal: true, vertical: true)

phpmon/Modules/PHP Version Manager/UI/PhpVersionManagerWindowController.swift

@@ -30,7 +30,7 @@ class PhpVersionManagerWindowController: PMWindowController {
 
         guard let window = windowController.window else { return }
         window.title = ""
-        window.styleMask = [.titled, .closable, .miniaturizable]
+        window.styleMask = [.titled, .closable, .miniaturizable, .resizable]
         window.titlebarAppearsTransparent = true
         window.delegate = delegate ?? windowController
         window.contentView = NSHostingView(rootView: windowController.view)

phpmon/de.lproj/Localizable.strings

@@ -134,7 +134,7 @@ und PHP Monitor neu starten, damit die Erweiterungen sichtbar werden. Wenn das P
 "phpman.refresh.button" = "Aktualisierungen suchen";
 "phpman.refresh.button.description" = "Sie können auf die Schaltfläche Aktualisieren klicken, um zu prüfen, ob Aktualisierungen für die installierten PHP-Versionen verfügbar sind.";
 
-"phpman.has_updates.description" = "Ein oder mehrere Aktualisierungen sind verfügbar. (Bitte beachten Sie, dass PHP Monitor PHP-Versionen immer im Ganzen installiert oder aktualisiert, so dass Sie immer alle Installationen auf einmal aktualisieren).";
+"phpman.has_updates.description" = "**Ein oder mehrere Aktualisierungen sind verfügbar.** Bitte beachten Sie, dass PHP Monitor PHP-Versionen immer im Ganzen installiert oder aktualisiert, so dass Sie immer alle Installationen auf einmal aktualisieren.";
 "phpman.has_updates.button" = "Alle aktualisieren";
 
 "phpman.warnings.unsupported.title" = "Ihre Version von Homebrew kann Probleme verursachen";

phpmon/en.lproj/Localizable.strings

@@ -158,7 +158,7 @@ and restart PHP Monitor for extensions to become visible. If the problem persist
 "phpman.refresh.button" = "Search for Updates";
 "phpman.refresh.button.description" = "You can press the refresh button to check if any updates are available to installed PHP versions.";
 
-"phpman.has_updates.description" = "One or more updates are available. (Please note that PHP Monitor will always install or update PHP versions in bulk, so you will always upgrade all installations at once.)";
+"phpman.has_updates.description" = "**One or more updates are available.** PHP Monitor will always install or update PHP versions in bulk, so you will always upgrade all installations at once.";
 "phpman.has_updates.button" = "Upgrade All";
 
 "phpman.warnings.outdated.title" = "This version of PHP Monitor is outdated";
@@ -239,8 +239,9 @@ You may be asked for your password during the uninstallation process if file per
 "domain_list.title" = "Domains";
 "domain_list.subtitle" = "";
 
-"domain_list.no_domains" = "You have not set up any domains or proxies yet.";
+"domain_list.domains_empty.title" = "No domains available.";
-"domain_list.no_domains_for_search_query" = "There are no results for your search query.";
+"domain_list.domains_empty.desc" = "No domains were found for this search query or you haven't linked any domains yet.";
+"domain_list.domains_empty.button" = "Add domain...";
 
 "domain_list.tooltips.isolated" = "This domain is isolated and using PHP %@ instead of the globally linked PHP.";
 "domain_list.tooltips.checkmark" = "This domain is being served with a version of PHP that is compatible with this requirement (PHP %@). Click on the PHP version next to this checkmark to find out more information about how this requirement was determined.";
@@ -261,6 +262,7 @@ You may be asked for your password during the uninstallation process if file per
 "domain_list.confirm_unlink_desc" = "No files will be removed. You can always link the folder again by clicking on the + button and selecting the original folder.";
 "site_link.close" = "Close";
 "site_link.switch_to_php" = "Switch to PHP %@";
+"site_link.isolate_php" = "Isolate PHP %@";
 
 "domain_list.confirm_unproxy" = "Are you sure you want to remove the proxy '%@'?";
 "domain_list.confirm_unproxy_desc" = "You can always recreate proxy the again by clicking on the + button.";

phpmon/fr.lproj/Localizable.strings

@@ -150,7 +150,7 @@ et redémarrer PHP Monitor pour que les extensions deviennent visibles. Si le pr
 "phpman.refresh.button" = "Rechercher des mises à jour";
 "phpman.refresh.button.description" = "Vous pouvez appuyer sur le bouton de rafraîchissement pour vérifier si des mises à jour sont disponibles pour les versions de PHP installées.";
 
-"phpman.has_updates.description" = "Une ou plusieurs mises à jour sont disponibles. (Veuillez noter que PHP Monitor installera ou mettra toujours à jour les versions de PHP en bloc, vous mettrez donc à jour toutes les installations en une seule fois.)";
+"phpman.has_updates.description" = "**Une ou plusieurs mises à jour sont disponibles.** PHP Monitor installera ou mettra toujours à jour les versions de PHP en bloc, vous mettrez donc à jour toutes les installations en une seule fois.";
 "phpman.has_updates.button" = "Tout mettre à jour";
 
 "phpman.warnings.unsupported.title" = "Votre version de Homebrew peut causer des problèmes";

phpmon/nl.lproj/Localizable.strings

@@ -135,7 +135,7 @@ en PHP Monitor herstarten om de extensies zichtbaar te maken. Als het probleem z
 "phpman.refresh.button" = "Zoek naar updates";
 "phpman.refresh.button.description" = "Je kunt op de vernieuwen-knop drukken om te controleren of er updates beschikbaar zijn voor geïnstalleerde PHP-versies.";
 
-"phpman.has_updates.description" = "Er zijn één of meer updates beschikbaar. (Houd er rekening mee dat PHP Monitor altijd PHP-versies in bulk installeert of bijwerkt, dus u zult altijd alle installaties tegelijk upgraden.)";
+"phpman.has_updates.description" = "**Er zijn één of meer updates beschikbaar.** PHP Monitor werkt alle versies in één keer bij, hou hier rekening mee.";
 "phpman.has_updates.button" = "Alles bijwerken";
 
 "phpman.warnings.unsupported.title" = "Uw versie van Homebrew kan problemen veroorzaken";

phpmon/pt-PT.lproj/Localizable.strings

@@ -134,7 +134,7 @@ e reiniciar o PHP Monitor para que as extensões se tornem visíveis. Se o probl
 "phpman.refresh.button" = "Procurar atualizações";
 "phpman.refresh.button.description" = "Você pode premir o botão de atualização para verificar se há atualizações disponíveis para as versões do PHP instaladas.";
 
-"phpman.has_updates.description" = "Estão disponiveis uma ou mais atualizações. (Por favor, tenha em conta que o PHP Monitor instalará ou atualizará as versões do PHP em bloco,  ou seja, atualizará todas as instalações PHP de uma só vez.)";
+"phpman.has_updates.description" = "**Estão disponiveis uma ou mais atualizações.** Por favor, tenha em conta que o PHP Monitor instalará ou atualizará as versões do PHP em bloco, ou seja, atualizará todas as instalações PHP de uma só vez.";
 "phpman.has_updates.button" = "Atualizar tudo";
 
 "phpman.warnings.unsupported.title" = "A versão instalada do Homebrew pode causar problemas";

phpmon/vi.lproj/Localizable.strings

@@ -134,7 +134,7 @@ và khởi động lại PHP Monitor để các tiện ích mở rộng trở n
 "phpman.refresh.button" = "Tìm kiếm Cập nhật";
 "phpman.refresh.button.description" = "Bạn có thể nhấn nút làm mới để kiểm tra xem có sẵn các cập nhật cho các phiên bản PHP đã cài đặt.";
 
-"phpman.has_updates.description" = "Một hoặc nhiều cập nhật có sẵn. (Vui lòng lưu ý rằng PHP Monitor sẽ luôn cài đặt hoặc cập nhật các phiên bản PHP theo lô, vì vậy bạn sẽ luôn nâng cấp tất cả các cài đặt cùng một lúc.)";
+"phpman.has_updates.description" = "**Một hoặc nhiều cập nhật có sẵn.** Vui lòng lưu ý rằng PHP Monitor sẽ luôn cài đặt hoặc cập nhật các phiên bản PHP theo lô, vì vậy bạn sẽ luôn nâng cấp tất cả các cài đặt cùng một lúc.";
 "phpman.has_updates.button" = "Nâng cấp Tất cả";
 
 "phpman.warnings.unsupported.title" = "Phiên bản Homebrew của bạn có thể gây ra vấn đề";

tests/unit/Parsers/HomebrewUpgradableTest.swift

@@ -28,6 +28,8 @@ class HomebrewUpgradableTest: XCTestCase {
                 : .instant("/opt/homebrew/etc/php/7.4/conf.d/php-memory-limits.ini")
         ])
 
+        // This config file assumes our PHP alias (`php`) is v8.2
+        PhpEnvironments.brewPhpAlias = "8.2"
         let env = PhpEnvironments.shared
         env.cachedPhpInstallations = [
             "8.1": PhpInstallation("8.1.16"),