♻️ Filesystem to FileSystem / ActiveFileSystem

PHP Monitor.xcodeproj/project.pbxproj

@@ -74,8 +74,6 @@
 		C415D3E92770F692005EF286 /* AppDelegate+InterApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3E72770F692005EF286 /* AppDelegate+InterApp.swift */; };
 		C417DC74277614690015E6EE /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = C417DC73277614690015E6EE /* Helpers.swift */; };
 		C417DC75277614690015E6EE /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = C417DC73277614690015E6EE /* Helpers.swift */; };
-		C4188989275FE8CB001EF227 /* Filesystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4188988275FE8CB001EF227 /* Filesystem.swift */; };
-		C418898A275FE8CB001EF227 /* Filesystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4188988275FE8CB001EF227 /* Filesystem.swift */; };
 		C41C02A627E60D7A009F26CB /* SiteScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C02A527E60D7A009F26CB /* SiteScanner.swift */; };
 		C41C02A927E61A65009F26CB /* ValetSite+Fake.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C02A827E61A65009F26CB /* ValetSite+Fake.swift */; };
 		C41C02AA27E61CA3009F26CB /* SiteScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C02A527E60D7A009F26CB /* SiteScanner.swift */; };
@@ -150,10 +148,10 @@
 		C46E206D28299B3800D909D6 /* AppUpdateChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46E206C28299B3800D909D6 /* AppUpdateChecker.swift */; };
 		C46E206E28299B3800D909D6 /* AppUpdateChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46E206C28299B3800D909D6 /* AppUpdateChecker.swift */; };
 		C46E20702829D27F00D909D6 /* AppUpdaterCheckTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46E206F2829D27F00D909D6 /* AppUpdaterCheckTest.swift */; };
-		C46EBC4428DB95F0007ACC74 /* Shellable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46EBC4328DB95F0007ACC74 /* Shellable.swift */; };
+		C46EBC4428DB95F0007ACC74 /* ShellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46EBC4328DB95F0007ACC74 /* ShellProtocol.swift */; };
-		C46EBC4528DB95F0007ACC74 /* Shellable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46EBC4328DB95F0007ACC74 /* Shellable.swift */; };
+		C46EBC4528DB95F0007ACC74 /* ShellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46EBC4328DB95F0007ACC74 /* ShellProtocol.swift */; };
-		C46EBC4728DB9644007ACC74 /* SystemShell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46EBC4628DB9644007ACC74 /* SystemShell.swift */; };
+		C46EBC4728DB9644007ACC74 /* RealShell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46EBC4628DB9644007ACC74 /* RealShell.swift */; };
-		C46EBC4828DB9644007ACC74 /* SystemShell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46EBC4628DB9644007ACC74 /* SystemShell.swift */; };
+		C46EBC4828DB9644007ACC74 /* RealShell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46EBC4628DB9644007ACC74 /* RealShell.swift */; };
 		C46EBC4A28DB966A007ACC74 /* TestableShell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46EBC4928DB966A007ACC74 /* TestableShell.swift */; };
 		C46EBC4B28DB966A007ACC74 /* TestableShell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46EBC4928DB966A007ACC74 /* TestableShell.swift */; };
 		C46FA23F246C358E00944F05 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46FA23E246C358E00944F05 /* StringExtension.swift */; };
@@ -208,8 +206,8 @@
 		C4A81CA528C67101008DD9D1 /* PMTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A81CA328C67101008DD9D1 /* PMTableView.swift */; };
 		C4AC51FC27E27F47008528CA /* DomainListKindCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AC51FB27E27F47008528CA /* DomainListKindCell.swift */; };
 		C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4ACA38E25C754C100060C66 /* PhpExtension.swift */; };
-		C4AD38B228ECD9D300FA8D83 /* TestableFilesystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AD38B128ECD9D300FA8D83 /* TestableFilesystem.swift */; };
+		C4AD38B228ECD9D300FA8D83 /* TestableFileSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AD38B128ECD9D300FA8D83 /* TestableFileSystem.swift */; };
-		C4AD38B328ECD9D300FA8D83 /* TestableFilesystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AD38B128ECD9D300FA8D83 /* TestableFilesystem.swift */; };
+		C4AD38B328ECD9D300FA8D83 /* TestableFileSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AD38B128ECD9D300FA8D83 /* TestableFileSystem.swift */; };
 		C4AD38B528ECE2DB00FA8D83 /* brew-formula.json in Resources */ = {isa = PBXBuildFile; fileRef = C43A8A1F25D9D1D700591B77 /* brew-formula.json */; };
 		C4AD38B628ECE56D00FA8D83 /* TestableConfigurations.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40F505428ECA64E004AD45B /* TestableConfigurations.swift */; };
 		C4AF9F72275445FF00D44ED0 /* valet-config.json in Resources */ = {isa = PBXBuildFile; fileRef = C4AF9F70275445FF00D44ED0 /* valet-config.json */; };
@@ -247,6 +245,9 @@
 		C4C3643A28AE4FCE00C0770E /* StatusMenu+Items.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C3643828AE4FCE00C0770E /* StatusMenu+Items.swift */; };
 		C4C3ED412783497000AB15D8 /* MainMenu+Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C3ED402783497000AB15D8 /* MainMenu+Startup.swift */; };
 		C4C3ED4327834C5200AB15D8 /* CustomPrefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C3ED4227834C5200AB15D8 /* CustomPrefs.swift */; };
+		C4C8900328F0E28800CE5E97 /* FileSystemProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C8900228F0E28800CE5E97 /* FileSystemProtocol.swift */; };
+		C4C8900528F0E3D100CE5E97 /* RealFileSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C8900428F0E3D100CE5E97 /* RealFileSystem.swift */; };
+		C4C8900728F0E3EF00CE5E97 /* ActiveFileSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C8900628F0E3EF00CE5E97 /* ActiveFileSystem.swift */; };
 		C4C8E818276F54D8003AC782 /* App+ConfigWatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C8E817276F54D8003AC782 /* App+ConfigWatch.swift */; };
 		C4C8E819276F54D8003AC782 /* App+ConfigWatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C8E817276F54D8003AC782 /* App+ConfigWatch.swift */; };
 		C4C8E81B276F54E5003AC782 /* PhpConfigWatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C8E81A276F54E5003AC782 /* PhpConfigWatcher.swift */; };
@@ -376,7 +377,6 @@
 		C415D3E72770F692005EF286 /* AppDelegate+InterApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+InterApp.swift"; sourceTree = "<group>"; };
 		C4168F4427ADB4A3003B6C39 /* DEVELOPER.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = DEVELOPER.md; sourceTree = "<group>"; };
 		C417DC73277614690015E6EE /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = "<group>"; };
-		C4188988275FE8CB001EF227 /* Filesystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Filesystem.swift; sourceTree = "<group>"; };
 		C41C02A527E60D7A009F26CB /* SiteScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteScanner.swift; sourceTree = "<group>"; };
 		C41C02A827E61A65009F26CB /* ValetSite+Fake.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ValetSite+Fake.swift"; sourceTree = "<group>"; };
 		C41C1B3322B0097F00E7CF16 /* PHP Monitor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "PHP Monitor.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -430,8 +430,8 @@
 		C464ADB1275A87CA003FCD53 /* DomainListCellProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainListCellProtocol.swift; sourceTree = "<group>"; };
 		C46E206C28299B3800D909D6 /* AppUpdateChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUpdateChecker.swift; sourceTree = "<group>"; };
 		C46E206F2829D27F00D909D6 /* AppUpdaterCheckTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppUpdaterCheckTest.swift; sourceTree = "<group>"; };
-		C46EBC4328DB95F0007ACC74 /* Shellable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shellable.swift; sourceTree = "<group>"; };
+		C46EBC4328DB95F0007ACC74 /* ShellProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShellProtocol.swift; sourceTree = "<group>"; };
-		C46EBC4628DB9644007ACC74 /* SystemShell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemShell.swift; sourceTree = "<group>"; };
+		C46EBC4628DB9644007ACC74 /* RealShell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealShell.swift; sourceTree = "<group>"; };
 		C46EBC4928DB966A007ACC74 /* TestableShell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestableShell.swift; sourceTree = "<group>"; };
 		C46FA23E246C358E00944F05 /* StringExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtension.swift; sourceTree = "<group>"; };
 		C46FA9872822EFDC00D78807 /* PhpConfigurationFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpConfigurationFile.swift; sourceTree = "<group>"; };
@@ -457,7 +457,7 @@
 		C4A81CA328C67101008DD9D1 /* PMTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PMTableView.swift; sourceTree = "<group>"; };
 		C4AC51FB27E27F47008528CA /* DomainListKindCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DomainListKindCell.swift; sourceTree = "<group>"; };
 		C4ACA38E25C754C100060C66 /* PhpExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpExtension.swift; sourceTree = "<group>"; };
-		C4AD38B128ECD9D300FA8D83 /* TestableFilesystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestableFilesystem.swift; sourceTree = "<group>"; };
+		C4AD38B128ECD9D300FA8D83 /* TestableFileSystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestableFileSystem.swift; sourceTree = "<group>"; };
 		C4AF9F70275445FF00D44ED0 /* valet-config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "valet-config.json"; sourceTree = "<group>"; };
 		C4AF9F76275447F100D44ED0 /* ValetConfigurationTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetConfigurationTest.swift; sourceTree = "<group>"; };
 		C4AF9F792754499000D44ED0 /* Valet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Valet.swift; sourceTree = "<group>"; };
@@ -479,6 +479,9 @@
 		C4C3643828AE4FCE00C0770E /* StatusMenu+Items.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StatusMenu+Items.swift"; sourceTree = "<group>"; };
 		C4C3ED402783497000AB15D8 /* MainMenu+Startup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+Startup.swift"; sourceTree = "<group>"; };
 		C4C3ED4227834C5200AB15D8 /* CustomPrefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPrefs.swift; sourceTree = "<group>"; };
+		C4C8900228F0E28800CE5E97 /* FileSystemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSystemProtocol.swift; sourceTree = "<group>"; };
+		C4C8900428F0E3D100CE5E97 /* RealFileSystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealFileSystem.swift; sourceTree = "<group>"; };
+		C4C8900628F0E3EF00CE5E97 /* ActiveFileSystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActiveFileSystem.swift; sourceTree = "<group>"; };
 		C4C8E817276F54D8003AC782 /* App+ConfigWatch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "App+ConfigWatch.swift"; sourceTree = "<group>"; };
 		C4C8E81A276F54E5003AC782 /* PhpConfigWatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhpConfigWatcher.swift; sourceTree = "<group>"; };
 		C4CCBA6B275C567B008C7055 /* PMWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PMWindowController.swift; sourceTree = "<group>"; };
@@ -905,7 +908,6 @@
 			children = (
 				C476FF9722B0DD830098105B /* Alert.swift */,
 				54B48B5E275F66AE006D90C5 /* Application.swift */,
-				C4188988275FE8CB001EF227 /* Filesystem.swift */,
 				C474B00524C0E98C00066A22 /* LocalNotification.swift */,
 				C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */,
 				C4CCBA6B275C567B008C7055 /* PMWindowController.swift */,
@@ -987,6 +989,7 @@
 			isa = PBXGroup;
 			children = (
 				C4F787A728EF812600790735 /* Testables */,
+				C4C8900128F0E27900CE5E97 /* Filesystem */,
 				C4F787A628EF811000790735 /* Shell */,
 				C40C7F2127721F7300DDDCDC /* Core */,
 				54B20EDF263AA22C00D3250E /* PHP */,
@@ -1106,6 +1109,16 @@
 			path = Commands;
 			sourceTree = "<group>";
 		};
+		C4C8900128F0E27900CE5E97 /* Filesystem */ = {
+			isa = PBXGroup;
+			children = (
+				C4C8900628F0E3EF00CE5E97 /* ActiveFileSystem.swift */,
+				C4C8900428F0E3D100CE5E97 /* RealFileSystem.swift */,
+				C4C8900228F0E28800CE5E97 /* FileSystemProtocol.swift */,
+			);
+			path = Filesystem;
+			sourceTree = "<group>";
+		};
 		C4C8E81D276F5686003AC782 /* Watcher */ = {
 			isa = PBXGroup;
 			children = (
@@ -1196,8 +1209,8 @@
 			isa = PBXGroup;
 			children = (
 				03E36FE628D9219000636F7F /* ActiveShell.swift */,
-				C46EBC4628DB9644007ACC74 /* SystemShell.swift */,
+				C46EBC4628DB9644007ACC74 /* RealShell.swift */,
-				C46EBC4328DB95F0007ACC74 /* Shellable.swift */,
+				C46EBC4328DB95F0007ACC74 /* ShellProtocol.swift */,
 			);
 			path = Shell;
 			sourceTree = "<group>";
@@ -1207,7 +1220,7 @@
 			children = (
 				C40F505428ECA64E004AD45B /* TestableConfigurations.swift */,
 				C46EBC4928DB966A007ACC74 /* TestableShell.swift */,
-				C4AD38B128ECD9D300FA8D83 /* TestableFilesystem.swift */,
+				C4AD38B128ECD9D300FA8D83 /* TestableFileSystem.swift */,
 			);
 			path = Testables;
 			sourceTree = "<group>";
@@ -1380,6 +1393,7 @@
 			files = (
 				C47699EF28A2F2A30060FEB8 /* WarningManager.swift in Sources */,
 				C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */,
+				C4C8900728F0E3EF00CE5E97 /* ActiveFileSystem.swift in Sources */,
 				C4D8016622B1584700C6DA1B /* Startup.swift in Sources */,
 				C42C49DB27C2806F0074ABAC /* MainMenu+FixMyValet.swift in Sources */,
 				C48D6C70279CD2AC00F26D7E /* PhpVersionNumber.swift in Sources */,
@@ -1390,6 +1404,7 @@
 				C4C0E8EA27F88B80002D32A9 /* ValetProxy+Fake.swift in Sources */,
 				C4EB53E728553117006F9937 /* ArrayExtension.swift in Sources */,
 				5420395926135DC100FB00FA /* PrefsVC.swift in Sources */,
+				C4C8900328F0E28800CE5E97 /* FileSystemProtocol.swift in Sources */,
 				C43603A0275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */,
 				5489625828312FAD004F647A /* CreatedFromFile.swift in Sources */,
 				C4068CA727B07A1300544CD5 /* SelectPreferenceView.swift in Sources */,
@@ -1413,7 +1428,7 @@
 				C44264BE2850B86C007400F1 /* SwiftUIHelper.swift in Sources */,
 				C4E9D2C02878B336008FFDAD /* OnboardingView.swift in Sources */,
 				C4F2E4372752F0870020E974 /* HomebrewDiagnostics.swift in Sources */,
-				C4AD38B228ECD9D300FA8D83 /* TestableFilesystem.swift in Sources */,
+				C4AD38B228ECD9D300FA8D83 /* TestableFileSystem.swift in Sources */,
 				C4EB53E528551F9B006F9937 /* HeaderView.swift in Sources */,
 				C40FE737282ABA4F00A302C2 /* AppVersion.swift in Sources */,
 				C44A874828905BB000498BC4 /* ProgressVC.swift in Sources */,
@@ -1441,7 +1456,7 @@
 				C415937F27A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */,
 				C4811D2422D70A4700B5F6B3 /* App.swift in Sources */,
 				C495F5AF28A42E080087F70A /* EnvironmentCheck.swift in Sources */,
-				C46EBC4428DB95F0007ACC74 /* Shellable.swift in Sources */,
+				C46EBC4428DB95F0007ACC74 /* ShellProtocol.swift in Sources */,
 				C41C1B4922B00A9800E7CF16 /* MenuBarImageGenerator.swift in Sources */,
 				C4F30B03278E16BA00755FCE /* HomebrewService.swift in Sources */,
 				54D9E0B427E4F51E003B9AD9 /* Key.swift in Sources */,
@@ -1461,7 +1476,7 @@
 				03E36FE728D9219000636F7F /* ActiveShell.swift in Sources */,
 				C4D9ADBF277610E1007277F4 /* PhpSwitcher.swift in Sources */,
 				C45E76142854A65300B4FE0C /* ServicesManager.swift in Sources */,
-				C46EBC4728DB9644007ACC74 /* SystemShell.swift in Sources */,
+				C46EBC4728DB9644007ACC74 /* RealShell.swift in Sources */,
 				C4AD38B628ECE56D00FA8D83 /* TestableConfigurations.swift in Sources */,
 				C4068CAA27B0890D00544CD5 /* MenuBarIcons.swift in Sources */,
 				C44264C02850BD2A007400F1 /* VersionPopoverView.swift in Sources */,
@@ -1477,6 +1492,7 @@
 				C4C1019B27C65C6F001FACC2 /* Process.swift in Sources */,
 				C4EC1E73279DFCF40010F296 /* Events.swift in Sources */,
 				C44067FB27E25FD70045BD4E /* DomainListTLSCell.swift in Sources */,
+				C4C8900528F0E3D100CE5E97 /* RealFileSystem.swift in Sources */,
 				C4A81CA428C67101008DD9D1 /* PMTableView.swift in Sources */,
 				C4927F0B27B2DFC200C55AFD /* Errors.swift in Sources */,
 				C4B5853E2770FE3900DA4FBE /* Paths.swift in Sources */,
@@ -1484,7 +1500,6 @@
 				C4FE011128084FC200D1DE6D /* SelectionVC.swift in Sources */,
 				C4709CA228524B3400088BB8 /* StatsView.swift in Sources */,
 				C44CCD4027AFE2FC00CE40E5 /* AlertableError.swift in Sources */,
-				C4188989275FE8CB001EF227 /* Filesystem.swift in Sources */,
 				C4B6091D2853AB9700C95265 /* ServicesView.swift in Sources */,
 				C40508B128ADAB44008FAC1F /* NSMenuItemExtension.swift in Sources */,
 				C4B97B7B275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */,
@@ -1532,7 +1547,7 @@
 				C413E43528DA3EB100AE33C7 /* FakeShellTest.swift in Sources */,
 				C4205A7F27F4D21800191A39 /* ValetProxy.swift in Sources */,
 				C42F26742805B4B400938AC7 /* DomainListable.swift in Sources */,
-				C46EBC4528DB95F0007ACC74 /* Shellable.swift in Sources */,
+				C46EBC4528DB95F0007ACC74 /* ShellProtocol.swift in Sources */,
 				C44B3A4728E5C70100718CB1 /* TimeIntervalExtension.swift in Sources */,
 				C4F780C425D80B75000DBC97 /* MainMenu.swift in Sources */,
 				54FCFD2B276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */,
@@ -1600,7 +1615,7 @@
 				C41E871B2763D42300161EE0 /* DomainListVC+ContextMenu.swift in Sources */,
 				C40C7F3127722E8D00DDDCDC /* Logger.swift in Sources */,
 				C4068CAB27B0890D00544CD5 /* MenuBarIcons.swift in Sources */,
-				C4AD38B328ECD9D300FA8D83 /* TestableFilesystem.swift in Sources */,
+				C4AD38B328ECD9D300FA8D83 /* TestableFileSystem.swift in Sources */,
 				C40C5C9D2846A40600E28255 /* Preset.swift in Sources */,
 				C4F30B09278E1A0E00755FCE /* CustomPrefs.swift in Sources */,
 				C40FE738282ABA4F00A302C2 /* AppVersion.swift in Sources */,
@@ -1650,7 +1665,7 @@
 				C4F780B725D80B5D000DBC97 /* App.swift in Sources */,
 				C4927F0C27B2DFC200C55AFD /* Errors.swift in Sources */,
 				C485707628BF455100539B36 /* SectionHeaderView.swift in Sources */,
-				C46EBC4828DB9644007ACC74 /* SystemShell.swift in Sources */,
+				C46EBC4828DB9644007ACC74 /* RealShell.swift in Sources */,
 				C4E4404727C56F4700D225E1 /* ValetSite.swift in Sources */,
 				C44CCD4A27AFF3BC00CE40E5 /* MainMenu+Async.swift in Sources */,
 				C449B4F327EE7FC600C47E8A /* DomainListTypeCell.swift in Sources */,
@@ -1671,7 +1686,6 @@
 				C464ADB0275A7A6A003FCD53 /* DomainListVC.swift in Sources */,
 				C43A8A1A25D9CD1000591B77 /* Utility.swift in Sources */,
 				C46EBC4B28DB966A007ACC74 /* TestableShell.swift in Sources */,
-				C418898A275FE8CB001EF227 /* Filesystem.swift in Sources */,
 				C40FE73B282ABB2E00A302C2 /* AppVersionTest.swift in Sources */,
 				C4F780C625D80B75000DBC97 /* XibLoadable.swift in Sources */,
 				C46E206E28299B3800D909D6 /* AppUpdateChecker.swift in Sources */,

phpmon/Common/Core/Helpers.swift

@@ -32,7 +32,7 @@ func sed(file: String, original: String, replacement: String) async {
 
     // Check if gsed exists; it is able to follow symlinks,
     // which we want to do to toggle the extension
-    if Filesystem.fileExists("\(Paths.binPath)/gsed") {
+    if FileSystem.fileExists("\(Paths.binPath)/gsed") {
         await Shell.quiet("\(Paths.binPath)/gsed -i --follow-symlinks 's/\(e_original)/\(e_replacement)/g' \(file)")
     } else {
         await Shell.quiet("sed -i '' 's/\(e_original)/\(e_replacement)/g' \(file)")

phpmon/Common/Core/Paths.swift

@@ -63,7 +63,7 @@ public class Paths {
 
     public static var homePath: String {
         // TODO: Depending on the filesystem abstraction, return the correct information
-        if Shell is SystemShell {
+        if Shell is RealShell {
             return NSHomeDirectory()
         }
 
@@ -91,9 +91,9 @@ public class Paths {
     // (PHP Monitor will not use the user's own PATH)
 
     private func detectComposerBinary() {
-        if Filesystem.fileExists("/usr/local/bin/composer") {
+        if FileSystem.fileExists("/usr/local/bin/composer") {
             Paths.composer = "/usr/local/bin/composer"
-        } else if Filesystem.fileExists("/opt/homebrew/bin/composer") {
+        } else if FileSystem.fileExists("/opt/homebrew/bin/composer") {
             Paths.composer = "/opt/homebrew/bin/composer"
         } else {
             Paths.composer = nil

phpmon/Common/Filesystem/ActiveFileSystem.swift

@@ -0,0 +1,26 @@
+//
+//  FS.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 08/10/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+var FileSystem: FileSystemProtocol {
+    return ActiveFileSystem.shared
+}
+
+class ActiveFileSystem {
+    static var shared: FileSystemProtocol = RealFileSystem()
+
+    public static func useTestable(_ files: [String: FakeFile]) {
+        // TODO
+        // Self.shared = TestableShell(expectations: expectations)
+    }
+
+    public static func useSystem() {
+        Self.shared = RealFileSystem()
+    }
+}

phpmon/Common/Filesystem/FileSystemProtocol.swift

@@ -0,0 +1,36 @@
+//
+//  FileSystemProtocol.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 08/10/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+protocol FileSystemProtocol {
+    /**
+     Checks if a given path is a file *and* executable.
+     */
+    func isExecutableFile(_ path: String) -> Bool
+
+    /**
+     Checks if a file or directory exists at the provided path.
+     */
+    func exists(_ path: String) -> Bool
+
+    /**
+     Checks if a file exists at the provided path.
+     */
+    func fileExists(_ path: String) -> Bool
+
+    /**
+     Checks if a directory exists at the provided path.
+     */
+    func directoryExists(_ path: String) -> Bool
+
+    /**
+     Checks if a given file is a symbolic link.
+     */
+    func fileIsSymlink(_ path: String) -> Bool
+}

phpmon/Common/Filesystem/RealFileSystem.swift

@@ -1,20 +1,24 @@
 //
-//  Filesystem.swift
+//  RealFileSystem.swift
 //  PHP Monitor
 //
-//  Created by Nico Verbruggen on 07/12/2021.
+//  Created by Nico Verbruggen on 08/10/2022.
 //  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
-import Cocoa
 import Foundation
 
-class Filesystem {
+extension String {
+    var replacingTildeWithHomeDirectory: String {
+        return self.replacingOccurrences(of: "~", with: Paths.homePath)
+    }
+}
 
+class RealFileSystem: FileSystemProtocol {
     /**
      Checks if a given path is a file *and* executable.
      */
-    public static func isExecutableFile(_ path: String) -> Bool {
+    func isExecutableFile(_ path: String) -> Bool {
         return FileManager.default.isExecutableFile(
             atPath: path.replacingTildeWithHomeDirectory
         )
@@ -23,7 +27,7 @@ class Filesystem {
     /**
      Checks if a file or directory exists at the provided path.
      */
-    public static func exists(_ path: String) -> Bool {
+    func exists(_ path: String) -> Bool {
         return FileManager.default.fileExists(
             atPath: path.replacingTildeWithHomeDirectory
         )
@@ -32,7 +36,7 @@ class Filesystem {
     /**
      Checks if a file exists at the provided path.
      */
-    public static func fileExists(_ path: String) -> Bool {
+    func fileExists(_ path: String) -> Bool {
         var isDirectory: ObjCBool = true
         let exists = FileManager.default.fileExists(
             atPath: path.replacingTildeWithHomeDirectory,
@@ -45,7 +49,7 @@ class Filesystem {
     /**
      Checks if a directory exists at the provided path.
      */
-    public static func directoryExists(_ path: String) -> Bool {
+    func directoryExists(_ path: String) -> Bool {
         var isDirectory: ObjCBool = true
         let exists = FileManager.default.fileExists(
             atPath: path.replacingTildeWithHomeDirectory,
@@ -58,7 +62,7 @@ class Filesystem {
     /**
      Checks if a given file is a symbolic link.
      */
-    public static func fileIsSymlink(_ path: String) -> Bool {
+    func fileIsSymlink(_ path: String) -> Bool {
         do {
             let attribs = try FileManager.default.attributesOfItem(atPath: path)
             return attribs[.type] as! FileAttributeType == FileAttributeType.typeSymbolicLink
@@ -66,13 +70,4 @@ class Filesystem {
             return false
         }
     }
-
-}
-
-extension String {
-
-    var replacingTildeWithHomeDirectory: String {
-        return self.replacingOccurrences(of: "~", with: Paths.homePath)
-    }
-
 }

phpmon/Common/PHP/ActivePhpInstallation.swift

@@ -134,7 +134,7 @@ class ActivePhpInstallation {
         }
 
         // Make sure to check if valet-fpm.conf exists. If it does, we should be fine :)
-        return Filesystem.fileExists("\(Paths.etcPath)/php/\(self.version.short)/php-fpm.d/valet-fpm.conf")
+        return FileSystem.fileExists("\(Paths.etcPath)/php/\(self.version.short)/php-fpm.d/valet-fpm.conf")
     }
 
     // MARK: - Structs

phpmon/Common/PHP/PHP Version/PhpEnv.swift

@@ -96,7 +96,7 @@ class PhpEnv {
         let phpAlias = homebrewPackage.version
 
         // Avoid inserting a duplicate
-        if !versionsOnly.contains(phpAlias) && Filesystem.fileExists("\(Paths.optPath)/php/bin/php") {
+        if !versionsOnly.contains(phpAlias) && FileSystem.fileExists("\(Paths.optPath)/php/bin/php") {
             versionsOnly.append(phpAlias)
         }
 
@@ -145,7 +145,7 @@ class PhpEnv {
             // is supported and where the binary exists (avoids broken installs)
             if !output.contains(version)
                 && supported.contains(version)
-                && (checkBinaries ? Filesystem.fileExists("\(Paths.optPath)/php@\(version)/bin/php") : true) {
+                && (checkBinaries ? FileSystem.fileExists("\(Paths.optPath)/php@\(version)/bin/php") : true) {
                 output.append(version)
             }
         }

phpmon/Common/PHP/PHP Version/PhpHelper.swift

@@ -27,11 +27,11 @@ class PhpHelper {
 
         Task { // Create the appropriate folders and check if the files exist
             do {
-                if !Filesystem.directoryExists("~/.config/phpmon/bin") {
+                if !FileSystem.directoryExists("~/.config/phpmon/bin") {
                     await Shell.quiet("mkdir -p ~/.config/phpmon/bin")
                 }
 
-                if Filesystem.fileExists(destination) {
+                if FileSystem.fileExists(destination) {
                     let contents = try String(contentsOfFile: destination)
                     if !contents.contains(keyPhrase) {
                         Log.info("The file at '\(destination)' already exists and was not generated by PHP Monitor "
@@ -64,7 +64,7 @@ class PhpHelper {
                 )
 
                 // Make sure the file is executable
-                if !Filesystem.isExecutableFile(destination) {
+                if !FileSystem.isExecutableFile(destination) {
                     await Shell.quiet("chmod +x \(destination)")
                 }
 
@@ -90,13 +90,13 @@ class PhpHelper {
         let source = "\(Paths.homePath)/.config/phpmon/bin/pm\(dotless)"
         let destination = "/usr/local/bin/pm\(dotless)"
 
-        if !Filesystem.fileExists(destination) {
+        if !FileSystem.fileExists(destination) {
             Log.info("Creating new symlink: \(destination)")
             await Shell.quiet("ln -s \(source) \(destination)")
             return
         }
 
-        if !Filesystem.fileIsSymlink(destination) {
+        if !FileSystem.fileIsSymlink(destination) {
             Log.info("Overwriting existing file with new symlink: \(destination)")
             await Shell.quiet("ln -fs \(source) \(destination)")
             return

phpmon/Common/PHP/PhpInstallation.swift

@@ -21,7 +21,7 @@ class PhpInstallation {
         let phpConfigExecutablePath = "\(Paths.optPath)/php@\(version)/bin/php-config"
         self.versionNumber = PhpVersionNumber.make(from: version)!
 
-        if Filesystem.fileExists(phpConfigExecutablePath) {
+        if FileSystem.fileExists(phpConfigExecutablePath) {
             let longVersionString = Command.execute(
                 path: phpConfigExecutablePath,
                 arguments: ["--version"]

phpmon/Common/Shell/ActiveShell.swift

@@ -8,18 +8,18 @@
 
 import Foundation
 
-var Shell: Shellable {
+var Shell: ShellProtocol {
     return ActiveShell.shared
 }
 
 class ActiveShell {
-    static var shared: Shellable = SystemShell()
+    static var shared: ShellProtocol = RealShell()
 
     public static func useTestable(_ expectations: [String: BatchFakeShellOutput]) {
         Self.shared = TestableShell(expectations: expectations)
     }
 
     public static func useSystem() {
-        Self.shared = SystemShell()
+        Self.shared = RealShell()
     }
 }

phpmon/Common/Shell/RealShell.swift

@@ -1,5 +1,5 @@
 //
-//  SystemShell.swift
+//  RealShell.swift
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 21/09/2022.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-class SystemShell: Shellable {
+class RealShell: ShellProtocol {
     /**
      The launch path of the terminal in question that is used.
      On macOS, we use /bin/sh since it's pretty fast.
@@ -19,7 +19,7 @@ class SystemShell: Shellable {
      For some commands, we need to know what's in the user's PATH.
      The entire PATH is retrieved here, so we can set the PATH in our own terminal as necessary.
      */
-    private(set) var PATH: String = { return SystemShell.getPath() }()
+    private(set) var PATH: String = { return RealShell.getPath() }()
 
     /**
      Exports are additional environment variables set by the user via the custom configuration.

phpmon/Common/Shell/ShellProtocol.swift

@@ -1,5 +1,5 @@
 //
-//  Shellable.swift
+//  ShellProtocol.swift
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 21/09/2022.
@@ -8,28 +8,7 @@
 
 import Foundation
 
-enum ShellStream {
+protocol ShellProtocol {
-    case stdOut, stdErr, stdIn
-}
-
-struct ShellOutput {
-    var out: String
-    var err: String
-
-    var hasError: Bool {
-        return err.lengthOfBytes(using: .utf8) > 0
-    }
-
-    static func out(_ out: String?, _ err: String? = nil) -> ShellOutput {
-        return ShellOutput(out: out ?? "", err: err ?? "")
-    }
-
-    static func err(_ err: String?) -> ShellOutput {
-        return ShellOutput(out: "", err: err ?? "")
-    }
-}
-
-protocol Shellable {
     /**
      The PATH for the current shell.
      */
@@ -69,6 +48,27 @@ protocol Shellable {
     ) async throws -> (Process, ShellOutput)
 }
 
+enum ShellStream {
+    case stdOut, stdErr, stdIn
+}
+
+struct ShellOutput {
+    var out: String
+    var err: String
+
+    var hasError: Bool {
+        return err.lengthOfBytes(using: .utf8) > 0
+    }
+
+    static func out(_ out: String?, _ err: String? = nil) -> ShellOutput {
+        return ShellOutput(out: out ?? "", err: err ?? "")
+    }
+
+    static func err(_ err: String?) -> ShellOutput {
+        return ShellOutput(out: "", err: err ?? "")
+    }
+}
+
 enum ShellError: Error {
     case timedOut
 }

phpmon/Common/Testables/TestableFileSystem.swift

@@ -0,0 +1,49 @@
+//
+//  TestableFileSystem.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 04/10/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+class TestableFileSystem: FileSystemProtocol {
+    func isExecutableFile(_ path: String) -> Bool {
+        // TODO
+        return false
+    }
+
+    func exists(_ path: String) -> Bool {
+        // TODO
+        return false
+    }
+
+    func fileExists(_ path: String) -> Bool {
+        // TODO
+        return false
+    }
+
+    func directoryExists(_ path: String) -> Bool {
+        // TODO
+        return false
+    }
+
+    func fileIsSymlink(_ path: String) -> Bool {
+        // TODO
+        return false
+    }
+}
+
+enum FakeFileType {
+    case binary, text, directory, symlink
+}
+
+struct FakeFile {
+    var type: FakeFileType
+    var content: String?
+
+    public static func fake(_ type: FakeFileType, _ content: String? = nil) -> FakeFile {
+        return FakeFile(type: type, content: content)
+    }
+}

phpmon/Common/Testables/TestableFilesystem.swift

@@ -1,24 +0,0 @@
-//
-//  TestableFilesystem.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 04/10/2022.
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-class TestableFilesystem {}
-
-enum FakeFileType {
-    case binary, text, directory, symlink
-}
-
-struct FakeFile {
-    var type: FakeFileType
-    var content: String?
-
-    public static func fake(_ type: FakeFileType, _ content: String? = nil) -> FakeFile {
-        return FakeFile(type: type, content: content)
-    }
-}

phpmon/Common/Testables/TestableShell.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public class TestableShell: Shellable {
+public class TestableShell: ShellProtocol {
     var PATH: String {
         return "/usr/local/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin"
     }

phpmon/Domain/App/Startup.swift

@@ -105,7 +105,7 @@ class Startup {
         // The PHP binary must exist.
         // =================================================================================
         EnvironmentCheck(
-            command: { return !Filesystem.fileExists(Paths.php) },
+            command: { return !FileSystem.fileExists(Paths.php) },
             name: "`\(Paths.php)` exists",
             titleText: "startup.errors.php_binary.title".localized,
             subtitleText: "startup.errors.php_binary.subtitle".localized,
@@ -130,7 +130,7 @@ class Startup {
         // =================================================================================
         EnvironmentCheck(
             command: {
-                return !(Filesystem.fileExists(Paths.valet) || Filesystem.fileExists("~/.composer/vendor/bin/valet"))
+                return !(FileSystem.fileExists(Paths.valet) || FileSystem.fileExists("~/.composer/vendor/bin/valet"))
             },
             name: "`valet` binary exists",
             titleText: "startup.errors.valet_executable.title".localized,
@@ -176,7 +176,7 @@ class Startup {
         // =================================================================================
         EnvironmentCheck(
             command: {
-                return !Filesystem.directoryExists("~/.config/valet")
+                return !FileSystem.directoryExists("~/.config/valet")
             },
             name: "`.config/valet` not empty (Valet installed)",
             titleText: "startup.errors.valet_not_installed.title".localized,

phpmon/Domain/DomainList/AddSiteVC.swift

@@ -55,7 +55,7 @@ class AddSiteVC: NSViewController, NSTextFieldDelegate {
         let path = pathControl.url!.path
         let name = inputDomainName.stringValue
 
-        if !Filesystem.exists(path) {
+        if !FileSystem.exists(path) {
             Alert.confirm(
                 onWindow: view.window!,
                 messageText: "domain_list.alert.folder_missing.title".localized,

phpmon/Domain/Integrations/Composer/PhpFrameworks.swift

@@ -71,7 +71,7 @@ struct PhpFrameworks {
     public static func detectFallbackDependency(_ basePath: String) -> String? {
         for entry in Self.FileMapping {
             let found = entry.value
-                .map { path in return Filesystem.exists(basePath + path) }
+                .map { path in return FileSystem.exists(basePath + path) }
                 .contains(true)
 
             if found {

phpmon/Domain/Integrations/Valet/Proxies/ValetProxy.swift

@@ -18,7 +18,7 @@ class ValetProxy: DomainListable {
         self.domain = configuration.domain
         self.tld = configuration.tld
         self.target = configuration.proxy!
-        self.secured = Filesystem.fileExists("~/.config/valet/Certificates/\(self.domain).\(self.tld).key")
+        self.secured = FileSystem.fileExists("~/.config/valet/Certificates/\(self.domain).\(self.tld).key")
     }
 
     // MARK: - DomainListable Protocol

phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift

@@ -119,7 +119,7 @@ class ValetSite: DomainListable {
      - Note: The file is not validated, only its presence is checked.
      */
     public func determineSecured() {
-        secured = Filesystem.fileExists("~/.config/valet/Certificates/\(self.name).\(self.tld).key")
+        secured = FileSystem.fileExists("~/.config/valet/Certificates/\(self.name).\(self.tld).key")
     }
 
     /**
@@ -188,7 +188,7 @@ class ValetSite: DomainListable {
         let path = "\(absolutePath)/composer.json"
 
         do {
-            if Filesystem.fileExists(path) {
+            if FileSystem.fileExists(path) {
                 let decoded = try JSONDecoder().decode(
                     ComposerJson.self,
                     from: String(contentsOf: URL(fileURLWithPath: path), encoding: .utf8).data(using: .utf8)!
@@ -209,7 +209,7 @@ class ValetSite: DomainListable {
         let path = "\(absolutePath)/.valetphprc"
 
         do {
-            if Filesystem.fileExists(path) {
+            if FileSystem.fileExists(path) {
                 let contents = try String(contentsOf: URL(fileURLWithPath: path), encoding: .utf8)
                 if let version = VersionExtractor.from(contents) {
                     self.composerPhp = version
@@ -224,7 +224,7 @@ class ValetSite: DomainListable {
     // MARK: - File Parsing
 
     public static func isolatedVersion(_ filePath: String) -> String? {
-        if Filesystem.fileExists(filePath) {
+        if FileSystem.fileExists(filePath) {
             return NginxConfigurationFile
                 .from(filePath: filePath)?
                 .isolatedVersion ?? nil

phpmon/Domain/Preferences/CustomPrefs.swift

@@ -51,7 +51,7 @@ extension Preferences {
 
         // Attempt to load the file if it exists
         let url = URL(fileURLWithPath: "\(Paths.homePath)/.config/phpmon/config.json")
-        if Filesystem.fileExists(url.path) {
+        if FileSystem.fileExists(url.path) {
 
             Log.info("A custom ~/.config/phpmon/config.json file was found. Attempting to parse...")
             loadCustomPreferencesFile(url)
@@ -61,7 +61,7 @@ extension Preferences {
     }
 
     func moveOutdatedConfigurationFile() async {
-        if Filesystem.fileExists("~/.phpmon.conf.json") && !Filesystem.fileExists("~/.config/phpmon/config.json") {
+        if FileSystem.fileExists("~/.phpmon.conf.json") && !FileSystem.fileExists("~/.config/phpmon/config.json") {
             Log.info("An outdated configuration file was found. Moving it...")
             await Shell.quiet("cp ~/.phpmon.conf.json ~/.config/phpmon/config.json")
             Log.info("The configuration file was copied successfully!")
@@ -87,7 +87,7 @@ extension Preferences {
 
             if customPreferences.hasEnvironmentVariables() {
                 Log.info("Configuring the additional exports...")
-                if let shell = Shell as? SystemShell {
+                if let shell = Shell as? RealShell {
                     shell.exports = customPreferences.getEnvironmentVariables()
                 }
             }

phpmon/Domain/Watcher/PhpConfigWatcher.swift

@@ -51,7 +51,7 @@ class PhpConfigWatcher {
         eventMask: DispatchSource.FileSystemEvent,
         behaviour: FSWatcherBehaviour = .reloadsMenu
     ) {
-        if !Filesystem.exists(url.path) {
+        if !FileSystem.exists(url.path) {
             Log.warn("No watcher was created for \(url.path) because the requested file does not exist.")
             return
         }