From 8304d774c317dfb493d78f6357f301cf467170b5 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Sat, 2 Apr 2022 15:48:21 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactoring=20of=20files?= =?UTF-8?q?=20and=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 116 ++++++++++++++---- ...erTest.swift => HomebrewPackageTest.swift} | 2 +- ...est.swift => NginxConfigurationTest.swift} | 12 +- ...arserTest.swift => PhpExtensionTest.swift} | 2 +- ...est.swift => ValetConfigurationTest.swift} | 2 +- .../NginxConfiguration.swift} | 4 +- .../Proxies/ProxyScanner/ProxyScanner.swift | 15 +++ .../Valet/Proxies/ValetProxy+Fake.swift | 15 +++ .../Valet/{ => Proxies}/ValetProxy.swift | 0 .../Sites/SiteScanner/FakeSiteScanner.swift | 39 ++++++ .../Valet/Sites/SiteScanner/SiteScanner.swift | 18 +++ .../SiteScanner/ValetSiteScanner.swift} | 45 +------ .../Valet/{ => Sites}/ValetSite+Fake.swift | 0 .../Valet/{ => Sites}/ValetSite.swift | 2 +- phpmon/Domain/Integrations/Valet/Valet.swift | 3 + 15 files changed, 194 insertions(+), 81 deletions(-) rename phpmon-tests/Parsers/{BrewJsonParserTest.swift => HomebrewPackageTest.swift} (98%) rename phpmon-tests/Parsers/{NginxConfigParserTest.swift => NginxConfigurationTest.swift} (70%) rename phpmon-tests/Parsers/{ExtensionParserTest.swift => PhpExtensionTest.swift} (98%) rename phpmon-tests/Parsers/{ValetConfigParserTest.swift => ValetConfigurationTest.swift} (95%) rename phpmon/Domain/Integrations/{Valet/NginxConfigParser.swift => Nginx/NginxConfiguration.swift} (96%) create mode 100644 phpmon/Domain/Integrations/Valet/Proxies/ProxyScanner/ProxyScanner.swift create mode 100644 phpmon/Domain/Integrations/Valet/Proxies/ValetProxy+Fake.swift rename phpmon/Domain/Integrations/Valet/{ => Proxies}/ValetProxy.swift (100%) create mode 100644 phpmon/Domain/Integrations/Valet/Sites/SiteScanner/FakeSiteScanner.swift create mode 100644 phpmon/Domain/Integrations/Valet/Sites/SiteScanner/SiteScanner.swift rename phpmon/Domain/Integrations/Valet/{SiteScanner.swift => Sites/SiteScanner/ValetSiteScanner.swift} (65%) rename phpmon/Domain/Integrations/Valet/{ => Sites}/ValetSite+Fake.swift (100%) rename phpmon/Domain/Integrations/Valet/{ => Sites}/ValetSite.swift (99%) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 8c7af16..7e55fa2 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -86,12 +86,12 @@ C42C49DB27C2806F0074ABAC /* MainMenu+FixMyValet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42C49DA27C2806F0074ABAC /* MainMenu+FixMyValet.swift */; }; C42CFB1627DFDE7900862737 /* nginx-site.test in Resources */ = {isa = PBXBuildFile; fileRef = C42CFB1527DFDE7900862737 /* nginx-site.test */; }; C42CFB1827DFDFDC00862737 /* nginx-site-isolated.test in Resources */ = {isa = PBXBuildFile; fileRef = C42CFB1727DFDFDC00862737 /* nginx-site-isolated.test */; }; - C42CFB1A27DFE8BD00862737 /* NginxConfigParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42CFB1927DFE8BD00862737 /* NginxConfigParserTest.swift */; }; + C42CFB1A27DFE8BD00862737 /* NginxConfigurationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42CFB1927DFE8BD00862737 /* NginxConfigurationTest.swift */; }; C43603A0275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */; }; C43603A1275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */; }; C43A8A1A25D9CD1000591B77 /* Utility.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43A8A1925D9CD1000591B77 /* Utility.swift */; }; C43A8A2025D9D1D700591B77 /* brew-formula.json in Resources */ = {isa = PBXBuildFile; fileRef = C43A8A1F25D9D1D700591B77 /* brew-formula.json */; }; - C43A8A2425D9D20D00591B77 /* BrewJsonParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.swift */; }; + C43A8A2425D9D20D00591B77 /* HomebrewPackageTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43A8A2325D9D20D00591B77 /* HomebrewPackageTest.swift */; }; C44067F527E2582B0045BD4E /* DomainListNameCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F427E2582B0045BD4E /* DomainListNameCell.swift */; }; C44067F727E258410045BD4E /* DomainListPhpCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F627E258410045BD4E /* DomainListPhpCell.swift */; }; C44067F927E2585E0045BD4E /* DomainListTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F827E2585E0045BD4E /* DomainListTypeCell.swift */; }; @@ -143,7 +143,7 @@ C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4ACA38E25C754C100060C66 /* PhpExtension.swift */; }; C4AF9F71275445FF00D44ED0 /* valet-config.json in Resources */ = {isa = PBXBuildFile; fileRef = C4AF9F70275445FF00D44ED0 /* valet-config.json */; }; C4AF9F72275445FF00D44ED0 /* valet-config.json in Resources */ = {isa = PBXBuildFile; fileRef = C4AF9F70275445FF00D44ED0 /* valet-config.json */; }; - C4AF9F78275447F100D44ED0 /* ValetConfigParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F76275447F100D44ED0 /* ValetConfigParserTest.swift */; }; + C4AF9F78275447F100D44ED0 /* ValetConfigurationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F76275447F100D44ED0 /* ValetConfigurationTest.swift */; }; C4AF9F7A2754499000D44ED0 /* Valet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F792754499000D44ED0 /* Valet.swift */; }; C4AF9F7B2754499000D44ED0 /* Valet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F792754499000D44ED0 /* Valet.swift */; }; C4AF9F7D275454A900D44ED0 /* ValetVersionExtractorTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F7C275454A900D44ED0 /* ValetVersionExtractorTest.swift */; }; @@ -163,6 +163,14 @@ C4B97B7B275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */; }; C4B97B7C275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */; }; C4BF90C127C57C220054E78C /* MainMenu+FixMyValet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42C49DA27C2806F0074ABAC /* MainMenu+FixMyValet.swift */; }; + C4C0E8DF27F88AEB002D32A9 /* FakeSiteScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0E8DE27F88AEB002D32A9 /* FakeSiteScanner.swift */; }; + C4C0E8E027F88AEB002D32A9 /* FakeSiteScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0E8DE27F88AEB002D32A9 /* FakeSiteScanner.swift */; }; + C4C0E8E227F88B13002D32A9 /* ValetSiteScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0E8E127F88B13002D32A9 /* ValetSiteScanner.swift */; }; + C4C0E8E327F88B13002D32A9 /* ValetSiteScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0E8E127F88B13002D32A9 /* ValetSiteScanner.swift */; }; + C4C0E8E727F88B41002D32A9 /* ProxyScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0E8E627F88B41002D32A9 /* ProxyScanner.swift */; }; + C4C0E8E827F88B41002D32A9 /* ProxyScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0E8E627F88B41002D32A9 /* ProxyScanner.swift */; }; + C4C0E8EA27F88B80002D32A9 /* ValetProxy+Fake.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0E8E927F88B80002D32A9 /* ValetProxy+Fake.swift */; }; + C4C0E8EB27F88B80002D32A9 /* ValetProxy+Fake.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0E8E927F88B80002D32A9 /* ValetProxy+Fake.swift */; }; C4C1019B27C65C6F001FACC2 /* Process.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C1019A27C65C6F001FACC2 /* Process.swift */; }; C4C1019C27C65C6F001FACC2 /* Process.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C1019A27C65C6F001FACC2 /* Process.swift */; }; C4C3ED412783497000AB15D8 /* MainMenu+Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C3ED402783497000AB15D8 /* MainMenu+Startup.swift */; }; @@ -177,8 +185,8 @@ C4CE3BBA27B31F670086CA49 /* ComposerWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CE3BB927B31F670086CA49 /* ComposerWindow.swift */; }; C4CE3BBB27B324230086CA49 /* MainMenu+Switcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CE3BB727B31F2E0086CA49 /* MainMenu+Switcher.swift */; }; C4CE3BBC27B324250086CA49 /* ComposerWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CE3BB927B31F670086CA49 /* ComposerWindow.swift */; }; - C4D5CFCA27E0F9CD00035329 /* NginxConfigParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D5CFC927E0F9CD00035329 /* NginxConfigParser.swift */; }; - C4D5CFCB27E0F9CD00035329 /* NginxConfigParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D5CFC927E0F9CD00035329 /* NginxConfigParser.swift */; }; + C4D5CFCA27E0F9CD00035329 /* NginxConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D5CFC927E0F9CD00035329 /* NginxConfiguration.swift */; }; + C4D5CFCB27E0F9CD00035329 /* NginxConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D5CFC927E0F9CD00035329 /* NginxConfiguration.swift */; }; C4D8016622B1584700C6DA1B /* Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D8016522B1584700C6DA1B /* Startup.swift */; }; C4D89BC62783C99400A02B68 /* ComposerJson.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D89BC52783C99400A02B68 /* ComposerJson.swift */; }; C4D936C927E3EB6100BD69FE /* PhpHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D936C827E3EB6100BD69FE /* PhpHelper.swift */; }; @@ -218,7 +226,7 @@ C4F319C927B034A500AFF46F /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DEB7D327A5D60B00834718 /* Stats.swift */; }; C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F7809B25D80344000DBC97 /* CommandTest.swift */; }; C4F780A825D80AE8000DBC97 /* php.ini in Resources */ = {isa = PBXBuildFile; fileRef = C4F780A725D80AE8000DBC97 /* php.ini */; }; - C4F780AE25D80B37000DBC97 /* ExtensionParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F780AD25D80B37000DBC97 /* ExtensionParserTest.swift */; }; + C4F780AE25D80B37000DBC97 /* PhpExtensionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F780AD25D80B37000DBC97 /* PhpExtensionTest.swift */; }; C4F780B125D80B4D000DBC97 /* PhpExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4ACA38E25C754C100060C66 /* PhpExtension.swift */; }; C4F780B725D80B5D000DBC97 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4811D2322D70A4700B5F6B3 /* App.swift */; }; C4F780BA25D80B62000DBC97 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */; }; @@ -301,11 +309,11 @@ C42C49DA27C2806F0074ABAC /* MainMenu+FixMyValet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+FixMyValet.swift"; sourceTree = ""; }; C42CFB1527DFDE7900862737 /* nginx-site.test */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "nginx-site.test"; sourceTree = ""; }; C42CFB1727DFDFDC00862737 /* nginx-site-isolated.test */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "nginx-site-isolated.test"; sourceTree = ""; }; - C42CFB1927DFE8BD00862737 /* NginxConfigParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NginxConfigParserTest.swift; sourceTree = ""; }; + C42CFB1927DFE8BD00862737 /* NginxConfigurationTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NginxConfigurationTest.swift; sourceTree = ""; }; C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Notifications.swift"; sourceTree = ""; }; C43A8A1925D9CD1000591B77 /* Utility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utility.swift; sourceTree = ""; }; C43A8A1F25D9D1D700591B77 /* brew-formula.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "brew-formula.json"; sourceTree = ""; }; - C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrewJsonParserTest.swift; sourceTree = ""; }; + C43A8A2325D9D20D00591B77 /* HomebrewPackageTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomebrewPackageTest.swift; sourceTree = ""; }; C44067F427E2582B0045BD4E /* DomainListNameCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainListNameCell.swift; sourceTree = ""; }; C44067F627E258410045BD4E /* DomainListPhpCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainListPhpCell.swift; sourceTree = ""; }; C44067F827E2585E0045BD4E /* DomainListTypeCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DomainListTypeCell.swift; sourceTree = ""; }; @@ -339,7 +347,7 @@ C4AC51FB27E27F47008528CA /* DomainListKindCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DomainListKindCell.swift; sourceTree = ""; }; C4ACA38E25C754C100060C66 /* PhpExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpExtension.swift; sourceTree = ""; }; C4AF9F70275445FF00D44ED0 /* valet-config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "valet-config.json"; sourceTree = ""; }; - C4AF9F76275447F100D44ED0 /* ValetConfigParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetConfigParserTest.swift; sourceTree = ""; }; + C4AF9F76275447F100D44ED0 /* ValetConfigurationTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetConfigurationTest.swift; sourceTree = ""; }; C4AF9F792754499000D44ED0 /* Valet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Valet.swift; sourceTree = ""; }; C4AF9F7C275454A900D44ED0 /* ValetVersionExtractorTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetVersionExtractorTest.swift; sourceTree = ""; }; C4B5635D276AB09000F12CCB /* VersionExtractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionExtractor.swift; sourceTree = ""; }; @@ -350,6 +358,10 @@ C4B97B74275CF08C003F3378 /* AppDelegate+MenuOutlets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+MenuOutlets.swift"; sourceTree = ""; }; C4B97B77275CF1B5003F3378 /* App+ActivationPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "App+ActivationPolicy.swift"; sourceTree = ""; }; C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "App+GlobalHotkey.swift"; sourceTree = ""; }; + C4C0E8DE27F88AEB002D32A9 /* FakeSiteScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeSiteScanner.swift; sourceTree = ""; }; + C4C0E8E127F88B13002D32A9 /* ValetSiteScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetSiteScanner.swift; sourceTree = ""; }; + C4C0E8E627F88B41002D32A9 /* ProxyScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyScanner.swift; sourceTree = ""; }; + C4C0E8E927F88B80002D32A9 /* ValetProxy+Fake.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ValetProxy+Fake.swift"; sourceTree = ""; }; C4C1019A27C65C6F001FACC2 /* Process.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Process.swift; sourceTree = ""; }; C4C3ED402783497000AB15D8 /* MainMenu+Startup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+Startup.swift"; sourceTree = ""; }; C4C3ED4227834C5200AB15D8 /* CustomPrefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPrefs.swift; sourceTree = ""; }; @@ -358,7 +370,7 @@ C4CCBA6B275C567B008C7055 /* PMWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PMWindowController.swift; sourceTree = ""; }; C4CE3BB727B31F2E0086CA49 /* MainMenu+Switcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+Switcher.swift"; sourceTree = ""; }; C4CE3BB927B31F670086CA49 /* ComposerWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerWindow.swift; sourceTree = ""; }; - C4D5CFC927E0F9CD00035329 /* NginxConfigParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NginxConfigParser.swift; sourceTree = ""; }; + C4D5CFC927E0F9CD00035329 /* NginxConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NginxConfiguration.swift; sourceTree = ""; }; C4D8016522B1584700C6DA1B /* Startup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Startup.swift; sourceTree = ""; }; C4D89BC52783C99400A02B68 /* ComposerJson.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerJson.swift; sourceTree = ""; }; C4D936C827E3EB6100BD69FE /* PhpHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpHelper.swift; sourceTree = ""; }; @@ -385,7 +397,7 @@ C4F7807D25D7F84B000DBC97 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C4F7809B25D80344000DBC97 /* CommandTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandTest.swift; sourceTree = ""; }; C4F780A725D80AE8000DBC97 /* php.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = php.ini; sourceTree = ""; }; - C4F780AD25D80B37000DBC97 /* ExtensionParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionParserTest.swift; sourceTree = ""; }; + C4F780AD25D80B37000DBC97 /* PhpExtensionTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpExtensionTest.swift; sourceTree = ""; }; C4F8C0A322D4F12C002EFE61 /* DateExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateExtension.swift; sourceTree = ""; }; C4F8C0A522D4FA41002EFE61 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhpVersionDetectionTest.swift; sourceTree = ""; }; @@ -708,11 +720,8 @@ isa = PBXGroup; children = ( C4AF9F792754499000D44ED0 /* Valet.swift */, - C4E4404527C56F4700D225E1 /* ValetSite.swift */, - C4205A7D27F4D21800191A39 /* ValetProxy.swift */, - C41C02A827E61A65009F26CB /* ValetSite+Fake.swift */, - C41C02A527E60D7A009F26CB /* SiteScanner.swift */, - C4D5CFC927E0F9CD00035329 /* NginxConfigParser.swift */, + C4C0E8D927F887BD002D32A9 /* Proxies */, + C4C0E8D827F887A5002D32A9 /* Sites */, ); path = Valet; sourceTree = ""; @@ -720,6 +729,7 @@ C4AF9F6B275445D300D44ED0 /* Integrations */ = { isa = PBXGroup; children = ( + C4C0E8DA27F887CC002D32A9 /* Nginx */, C4D89BC42783C98800A02B68 /* Composer */, C4AF9F6C275445D900D44ED0 /* Homebrew */, C4AF9F6A275445C900D44ED0 /* Valet */, @@ -764,13 +774,59 @@ path = Common; sourceTree = ""; }; + C4C0E8D827F887A5002D32A9 /* Sites */ = { + isa = PBXGroup; + children = ( + C4E4404527C56F4700D225E1 /* ValetSite.swift */, + C41C02A827E61A65009F26CB /* ValetSite+Fake.swift */, + C4C0E8E427F88B1F002D32A9 /* SiteScanner */, + ); + path = Sites; + sourceTree = ""; + }; + C4C0E8D927F887BD002D32A9 /* Proxies */ = { + isa = PBXGroup; + children = ( + C4205A7D27F4D21800191A39 /* ValetProxy.swift */, + C4C0E8E927F88B80002D32A9 /* ValetProxy+Fake.swift */, + C4C0E8E527F88B36002D32A9 /* ProxyScanner */, + ); + path = Proxies; + sourceTree = ""; + }; + C4C0E8DA27F887CC002D32A9 /* Nginx */ = { + isa = PBXGroup; + children = ( + C4D5CFC927E0F9CD00035329 /* NginxConfiguration.swift */, + ); + path = Nginx; + sourceTree = ""; + }; + C4C0E8E427F88B1F002D32A9 /* SiteScanner */ = { + isa = PBXGroup; + children = ( + C41C02A527E60D7A009F26CB /* SiteScanner.swift */, + C4C0E8E127F88B13002D32A9 /* ValetSiteScanner.swift */, + C4C0E8DE27F88AEB002D32A9 /* FakeSiteScanner.swift */, + ); + path = SiteScanner; + sourceTree = ""; + }; + C4C0E8E527F88B36002D32A9 /* ProxyScanner */ = { + isa = PBXGroup; + children = ( + C4C0E8E627F88B41002D32A9 /* ProxyScanner.swift */, + ); + path = ProxyScanner; + sourceTree = ""; + }; C4C1019727C65A11001FACC2 /* Parsers */ = { isa = PBXGroup; children = ( - C4AF9F76275447F100D44ED0 /* ValetConfigParserTest.swift */, - C4F780AD25D80B37000DBC97 /* ExtensionParserTest.swift */, - C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.swift */, - C42CFB1927DFE8BD00862737 /* NginxConfigParserTest.swift */, + C4AF9F76275447F100D44ED0 /* ValetConfigurationTest.swift */, + C4F780AD25D80B37000DBC97 /* PhpExtensionTest.swift */, + C43A8A2325D9D20D00591B77 /* HomebrewPackageTest.swift */, + C42CFB1927DFE8BD00862737 /* NginxConfigurationTest.swift */, ); path = Parsers; sourceTree = ""; @@ -1019,6 +1075,7 @@ C4998F0A2617633900B2526E /* PrefsWC.swift in Sources */, C4F8C0A422D4F12C002EFE61 /* DateExtension.swift in Sources */, C4AF9F7A2754499000D44ED0 /* Valet.swift in Sources */, + C4C0E8EA27F88B80002D32A9 /* ValetProxy+Fake.swift in Sources */, 5420395926135DC100FB00FA /* PrefsVC.swift in Sources */, C43603A0275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */, C4068CA727B07A1300544CD5 /* SelectPreferenceView.swift in Sources */, @@ -1037,6 +1094,7 @@ C40C7F2827721FF600DDDCDC /* ActivePhpInstallation+Checks.swift in Sources */, C4EE55A927708B9E001DF387 /* PMHeaderView.swift in Sources */, C41C02A927E61A65009F26CB /* ValetSite+Fake.swift in Sources */, + C4C0E8DF27F88AEB002D32A9 /* FakeSiteScanner.swift in Sources */, C4F2E4372752F0870020E974 /* HomebrewDiagnostics.swift in Sources */, C40D88EB27F38D7600C94B40 /* DomainListProxiesCell.swift in Sources */, C4CCBA6C275C567B008C7055 /* PMWindowController.swift in Sources */, @@ -1049,6 +1107,7 @@ C4AC51FC27E27F47008528CA /* DomainListKindCell.swift in Sources */, C44C198D276E3A1C0072762D /* ProgressWindow.swift in Sources */, 54D9E0B827E4F51E003B9AD9 /* KeyCombo.swift in Sources */, + C4C0E8E727F88B41002D32A9 /* ProxyScanner.swift in Sources */, C4C3ED4327834C5200AB15D8 /* CustomPrefs.swift in Sources */, 54B48B5F275F66AE006D90C5 /* Application.swift in Sources */, C4B97B78275CF1B5003F3378 /* App+ActivationPolicy.swift in Sources */, @@ -1058,6 +1117,7 @@ C41C1B4922B00A9800E7CF16 /* MenuBarImageGenerator.swift in Sources */, C4F30B03278E16BA00755FCE /* HomebrewService.swift in Sources */, 54D9E0B427E4F51E003B9AD9 /* Key.swift in Sources */, + C4C0E8E227F88B13002D32A9 /* ValetSiteScanner.swift in Sources */, 5420395F2613607600FB00FA /* Preferences.swift in Sources */, C48D0C9325CC804200CC7490 /* XibLoadable.swift in Sources */, 54FCFD2A276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */, @@ -1089,7 +1149,7 @@ C476FF9822B0DD830098105B /* Alert.swift in Sources */, C474B00624C0E98C00066A22 /* LocalNotification.swift in Sources */, C48D0C9625CC80B100CC7490 /* HeaderView.swift in Sources */, - C4D5CFCA27E0F9CD00035329 /* NginxConfigParser.swift in Sources */, + C4D5CFCA27E0F9CD00035329 /* NginxConfiguration.swift in Sources */, C4CE3BBA27B31F670086CA49 /* ComposerWindow.swift in Sources */, C4D9ADC8277611A0007277F4 /* InternalSwitcher.swift in Sources */, C4080FFA27BD956700BF2C6B /* BetterAlertVC.swift in Sources */, @@ -1134,13 +1194,14 @@ C4F780CC25D80B75000DBC97 /* ActivePhpInstallation.swift in Sources */, 54D9E0BB27E4F51E003B9AD9 /* ModifierFlagsExtension.swift in Sources */, C4F780B125D80B4D000DBC97 /* PhpExtension.swift in Sources */, - C4D5CFCB27E0F9CD00035329 /* NginxConfigParser.swift in Sources */, + C4D5CFCB27E0F9CD00035329 /* NginxConfiguration.swift in Sources */, C4068CA827B07A1300544CD5 /* SelectPreferenceView.swift in Sources */, C4F780CE25D80B75000DBC97 /* LocalNotification.swift in Sources */, C40C7F2927721FF600DDDCDC /* ActivePhpInstallation+Checks.swift in Sources */, + C4C0E8E827F88B41002D32A9 /* ProxyScanner.swift in Sources */, C449B4F027EE7FB800C47E8A /* DomainListTLSCell.swift in Sources */, C4FBFC532616485F00CDB8E1 /* PhpVersionDetectionTest.swift in Sources */, - C43A8A2425D9D20D00591B77 /* BrewJsonParserTest.swift in Sources */, + C43A8A2425D9D20D00591B77 /* HomebrewPackageTest.swift in Sources */, C4F780CA25D80B75000DBC97 /* HomebrewPackage.swift in Sources */, C4C8E81C276F54E5003AC782 /* PhpConfigWatcher.swift in Sources */, C4F319C927B034A500AFF46F /* Stats.swift in Sources */, @@ -1149,11 +1210,13 @@ C4AF9F7B2754499000D44ED0 /* Valet.swift in Sources */, C4C1019C27C65C6F001FACC2 /* Process.swift in Sources */, C4F780C025D80B6E000DBC97 /* Startup.swift in Sources */, + C4C0E8E327F88B13002D32A9 /* ValetSiteScanner.swift in Sources */, C4CCBA6D275C567B008C7055 /* PMWindowController.swift in Sources */, C4B5635F276AB09000F12CCB /* VersionExtractor.swift in Sources */, C4BF90C127C57C220054E78C /* MainMenu+FixMyValet.swift in Sources */, + C4C0E8EB27F88B80002D32A9 /* ValetProxy+Fake.swift in Sources */, C4F2E4382752F08D0020E974 /* HomebrewDiagnostics.swift in Sources */, - C4F780AE25D80B37000DBC97 /* ExtensionParserTest.swift in Sources */, + C4F780AE25D80B37000DBC97 /* PhpExtensionTest.swift in Sources */, C4C8E819276F54D8003AC782 /* App+ConfigWatch.swift in Sources */, 54D9E0B927E4F51E003B9AD9 /* KeyCombo.swift in Sources */, C4EED88A27A48778006D7272 /* InterAppHandler.swift in Sources */, @@ -1169,7 +1232,7 @@ C4068CAB27B0890D00544CD5 /* MenuBarIcons.swift in Sources */, C4F30B09278E1A0E00755FCE /* CustomPrefs.swift in Sources */, C415D3E92770F692005EF286 /* AppDelegate+InterApp.swift in Sources */, - C4AF9F78275447F100D44ED0 /* ValetConfigParserTest.swift in Sources */, + C4AF9F78275447F100D44ED0 /* ValetConfigurationTest.swift in Sources */, C4CE3BBC27B324250086CA49 /* ComposerWindow.swift in Sources */, C40B24F427A310830018C7D2 /* StatusMenu.swift in Sources */, C417DC75277614690015E6EE /* Helpers.swift in Sources */, @@ -1193,10 +1256,11 @@ C415938027A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */, C4D9ADC9277611A0007277F4 /* InternalSwitcher.swift in Sources */, C449B4F227EE7FC400C47E8A /* DomainListPhpCell.swift in Sources */, - C42CFB1A27DFE8BD00862737 /* NginxConfigParserTest.swift in Sources */, + C42CFB1A27DFE8BD00862737 /* NginxConfigurationTest.swift in Sources */, C4F30B0B278E203C00755FCE /* MainMenu+Startup.swift in Sources */, C40B24F227A310770018C7D2 /* Events.swift in Sources */, C4F30B0A278E1A1A00755FCE /* ComposerJson.swift in Sources */, + C4C0E8E027F88AEB002D32A9 /* FakeSiteScanner.swift in Sources */, C4AF9F7D275454A900D44ED0 /* ValetVersionExtractorTest.swift in Sources */, C4B56362276AB0A500F12CCB /* VersionExtractorTest.swift in Sources */, C4B585452770FE3900DA4FBE /* Command.swift in Sources */, diff --git a/phpmon-tests/Parsers/BrewJsonParserTest.swift b/phpmon-tests/Parsers/HomebrewPackageTest.swift similarity index 98% rename from phpmon-tests/Parsers/BrewJsonParserTest.swift rename to phpmon-tests/Parsers/HomebrewPackageTest.swift index 2ef438c..770dd76 100644 --- a/phpmon-tests/Parsers/BrewJsonParserTest.swift +++ b/phpmon-tests/Parsers/HomebrewPackageTest.swift @@ -8,7 +8,7 @@ import XCTest -class BrewJsonParserTest: XCTestCase { +class HomebrewPackageTest: XCTestCase { // - MARK: SYNTHETIC TESTS diff --git a/phpmon-tests/Parsers/NginxConfigParserTest.swift b/phpmon-tests/Parsers/NginxConfigurationTest.swift similarity index 70% rename from phpmon-tests/Parsers/NginxConfigParserTest.swift rename to phpmon-tests/Parsers/NginxConfigurationTest.swift index 8338db2..9dcdb00 100644 --- a/phpmon-tests/Parsers/NginxConfigParserTest.swift +++ b/phpmon-tests/Parsers/NginxConfigurationTest.swift @@ -1,5 +1,5 @@ // -// NginxConfigParserTest.swift +// NginxConfigurationTest.swift // phpmon-tests // // Created by Nico Verbruggen on 29/11/2021. @@ -8,7 +8,7 @@ import XCTest -class NginxConfigParserTest: XCTestCase { +class NginxConfigurationTest: XCTestCase { static var regularUrl: URL { return Bundle(for: Self.self).url(forResource: "nginx-site", withExtension: "test")! @@ -24,21 +24,21 @@ class NginxConfigParserTest: XCTestCase { func testCanDetermineIsolation() throws { XCTAssertNil( - NginxConfigParser(filePath: NginxConfigParserTest.regularUrl.path).isolatedVersion + NginxConfiguration(filePath: NginxConfigurationTest.regularUrl.path).isolatedVersion ) XCTAssertEqual( "8.1", - NginxConfigParser(filePath: NginxConfigParserTest.isolatedUrl.path).isolatedVersion + NginxConfiguration(filePath: NginxConfigurationTest.isolatedUrl.path).isolatedVersion ) } func testCanDetermineProxy() throws { - let proxied = NginxConfigParser(filePath: NginxConfigParserTest.proxyUrl.path) + let proxied = NginxConfiguration(filePath: NginxConfigurationTest.proxyUrl.path) XCTAssertTrue(proxied.contents.contains("# valet stub: proxy.valet.conf")) XCTAssertEqual("http://127.0.0.1:90", proxied.proxy) - let normal = NginxConfigParser(filePath: NginxConfigParserTest.regularUrl.path) + let normal = NginxConfiguration(filePath: NginxConfigurationTest.regularUrl.path) XCTAssertFalse(normal.contents.contains("# valet stub: proxy.valet.conf")) XCTAssertEqual(nil, normal.proxy) } diff --git a/phpmon-tests/Parsers/ExtensionParserTest.swift b/phpmon-tests/Parsers/PhpExtensionTest.swift similarity index 98% rename from phpmon-tests/Parsers/ExtensionParserTest.swift rename to phpmon-tests/Parsers/PhpExtensionTest.swift index c6d58cd..d36682e 100644 --- a/phpmon-tests/Parsers/ExtensionParserTest.swift +++ b/phpmon-tests/Parsers/PhpExtensionTest.swift @@ -8,7 +8,7 @@ import XCTest -class ExtensionParserTest: XCTestCase { +class PhpExtensionTest: XCTestCase { static var phpIniFileUrl: URL { return Bundle(for: Self.self).url(forResource: "php", withExtension: "ini")! diff --git a/phpmon-tests/Parsers/ValetConfigParserTest.swift b/phpmon-tests/Parsers/ValetConfigurationTest.swift similarity index 95% rename from phpmon-tests/Parsers/ValetConfigParserTest.swift rename to phpmon-tests/Parsers/ValetConfigurationTest.swift index 76259fe..447a2d9 100644 --- a/phpmon-tests/Parsers/ValetConfigParserTest.swift +++ b/phpmon-tests/Parsers/ValetConfigurationTest.swift @@ -8,7 +8,7 @@ import XCTest -class ValetConfigParserTest: XCTestCase { +class ValetConfigurationTest: XCTestCase { static var jsonConfigFileUrl: URL { return Bundle(for: Self.self).url( diff --git a/phpmon/Domain/Integrations/Valet/NginxConfigParser.swift b/phpmon/Domain/Integrations/Nginx/NginxConfiguration.swift similarity index 96% rename from phpmon/Domain/Integrations/Valet/NginxConfigParser.swift rename to phpmon/Domain/Integrations/Nginx/NginxConfiguration.swift index 0b51798..2d66dff 100644 --- a/phpmon/Domain/Integrations/Valet/NginxConfigParser.swift +++ b/phpmon/Domain/Integrations/Nginx/NginxConfiguration.swift @@ -1,5 +1,5 @@ // -// NginxConfigParser.swift +// NginxConfiguration.swift // PHP Monitor // // Created by Nico Verbruggen on 15/03/2022. @@ -8,7 +8,7 @@ import Foundation -class NginxConfigParser { +class NginxConfiguration { var contents: String! diff --git a/phpmon/Domain/Integrations/Valet/Proxies/ProxyScanner/ProxyScanner.swift b/phpmon/Domain/Integrations/Valet/Proxies/ProxyScanner/ProxyScanner.swift new file mode 100644 index 0000000..1b0cb90 --- /dev/null +++ b/phpmon/Domain/Integrations/Valet/Proxies/ProxyScanner/ProxyScanner.swift @@ -0,0 +1,15 @@ +// +// ProxyScanner.swift +// PHP Monitor +// +// Created by Nico Verbruggen on 02/04/2022. +// Copyright © 2022 Nico Verbruggen. All rights reserved. +// + +import Foundation + +protocol ProxyScanner { + + // TODO + +} diff --git a/phpmon/Domain/Integrations/Valet/Proxies/ValetProxy+Fake.swift b/phpmon/Domain/Integrations/Valet/Proxies/ValetProxy+Fake.swift new file mode 100644 index 0000000..acef5f4 --- /dev/null +++ b/phpmon/Domain/Integrations/Valet/Proxies/ValetProxy+Fake.swift @@ -0,0 +1,15 @@ +// +// ValetProxy+Fake.swift +// PHP Monitor +// +// Created by Nico Verbruggen on 02/04/2022. +// Copyright © 2022 Nico Verbruggen. All rights reserved. +// + +import Foundation + +extension ValetProxy { + + // + +} diff --git a/phpmon/Domain/Integrations/Valet/ValetProxy.swift b/phpmon/Domain/Integrations/Valet/Proxies/ValetProxy.swift similarity index 100% rename from phpmon/Domain/Integrations/Valet/ValetProxy.swift rename to phpmon/Domain/Integrations/Valet/Proxies/ValetProxy.swift diff --git a/phpmon/Domain/Integrations/Valet/Sites/SiteScanner/FakeSiteScanner.swift b/phpmon/Domain/Integrations/Valet/Sites/SiteScanner/FakeSiteScanner.swift new file mode 100644 index 0000000..d7882d6 --- /dev/null +++ b/phpmon/Domain/Integrations/Valet/Sites/SiteScanner/FakeSiteScanner.swift @@ -0,0 +1,39 @@ +// +// FakeSiteScanner.swift +// PHP Monitor +// +// Created by Nico Verbruggen on 02/04/2022. +// Copyright © 2022 Nico Verbruggen. All rights reserved. +// + +class FakeSiteScanner: SiteScanner +{ + let fakes = [ + ValetSite(fakeWithName: "laravel", tld: "test", secure: true, path: "~/Code/laravel/framework", linked: true), + + ValetSite(fakeWithName: "tailwind", tld: "test", secure: true, path: "~/Code/tailwind/site", linked: true, constraint: "8.0"), + + ValetSite(fakeWithName: "forge", tld: "test", secure: true, path: "~/Code/laravel/forge", linked: true), + + ValetSite(fakeWithName: "concord", tld: "test", secure: false, + path: "~/Code/concord", linked: true, driver: "Laravel (^8.0)", constraint: "^7.4", isolated: "7.4"), + + ValetSite(fakeWithName: "drupal", tld: "test", secure: false, + path: "~/Sites/drupal", linked: false, driver: "Drupal", constraint: "^7.4", isolated: "7.4"), + + ValetSite(fakeWithName: "wordpress", tld: "test", secure: false, + path: "~/Sites/wordpress", linked: false, driver: "WordPress", constraint: "^7.4", isolated: "7.4") + ] + + func resolveSiteCount(paths: [String]) -> Int { + return fakes.count + } + + func resolveSitesFrom(paths: [String]) -> [ValetSite] { + return fakes + } + + func resolveSite(path: String) -> ValetSite? { + return nil + } +} diff --git a/phpmon/Domain/Integrations/Valet/Sites/SiteScanner/SiteScanner.swift b/phpmon/Domain/Integrations/Valet/Sites/SiteScanner/SiteScanner.swift new file mode 100644 index 0000000..e744abc --- /dev/null +++ b/phpmon/Domain/Integrations/Valet/Sites/SiteScanner/SiteScanner.swift @@ -0,0 +1,18 @@ +// +// ValetSiteScanner.swift +// PHP Monitor +// +// Created by Nico Verbruggen on 19/03/2022. +// Copyright © 2022 Nico Verbruggen. All rights reserved. +// + +import Foundation + +protocol SiteScanner +{ + func resolveSiteCount(paths: [String]) -> Int + + func resolveSitesFrom(paths: [String]) -> [ValetSite] + + func resolveSite(path: String) -> ValetSite? +} diff --git a/phpmon/Domain/Integrations/Valet/SiteScanner.swift b/phpmon/Domain/Integrations/Valet/Sites/SiteScanner/ValetSiteScanner.swift similarity index 65% rename from phpmon/Domain/Integrations/Valet/SiteScanner.swift rename to phpmon/Domain/Integrations/Valet/Sites/SiteScanner/ValetSiteScanner.swift index c1f1fc9..140dd68 100644 --- a/phpmon/Domain/Integrations/Valet/SiteScanner.swift +++ b/phpmon/Domain/Integrations/Valet/Sites/SiteScanner/ValetSiteScanner.swift @@ -2,53 +2,12 @@ // ValetSiteScanner.swift // PHP Monitor // -// Created by Nico Verbruggen on 19/03/2022. +// Created by Nico Verbruggen on 02/04/2022. // Copyright © 2022 Nico Verbruggen. All rights reserved. // import Foundation -protocol SiteScanner -{ - func resolveSiteCount(paths: [String]) -> Int - - func resolveSitesFrom(paths: [String]) -> [ValetSite] - - func resolveSite(path: String) -> ValetSite? -} - -class FakeSiteScanner: SiteScanner -{ - let fakes = [ - ValetSite(fakeWithName: "laravel", tld: "test", secure: true, path: "~/Code/laravel/framework", linked: true), - - ValetSite(fakeWithName: "tailwind", tld: "test", secure: true, path: "~/Code/tailwind/site", linked: true, constraint: "8.0"), - - ValetSite(fakeWithName: "forge", tld: "test", secure: true, path: "~/Code/laravel/forge", linked: true), - - ValetSite(fakeWithName: "concord", tld: "test", secure: false, - path: "~/Code/concord", linked: true, driver: "Laravel (^8.0)", constraint: "^7.4", isolated: "7.4"), - - ValetSite(fakeWithName: "drupal", tld: "test", secure: false, - path: "~/Sites/drupal", linked: false, driver: "Drupal", constraint: "^7.4", isolated: "7.4"), - - ValetSite(fakeWithName: "wordpress", tld: "test", secure: false, - path: "~/Sites/wordpress", linked: false, driver: "WordPress", constraint: "^7.4", isolated: "7.4") - ] - - func resolveSiteCount(paths: [String]) -> Int { - return fakes.count - } - - func resolveSitesFrom(paths: [String]) -> [ValetSite] { - return fakes - } - - func resolveSite(path: String) -> ValetSite? { - return nil - } -} - class ValetSiteScanner: SiteScanner { func resolveSiteCount(paths: [String]) -> Int { @@ -64,7 +23,7 @@ class ValetSiteScanner: SiteScanner }.reduce(0, +) } - + func resolveSitesFrom(paths: [String]) -> [ValetSite] { var sites: [ValetSite] = [] diff --git a/phpmon/Domain/Integrations/Valet/ValetSite+Fake.swift b/phpmon/Domain/Integrations/Valet/Sites/ValetSite+Fake.swift similarity index 100% rename from phpmon/Domain/Integrations/Valet/ValetSite+Fake.swift rename to phpmon/Domain/Integrations/Valet/Sites/ValetSite+Fake.swift diff --git a/phpmon/Domain/Integrations/Valet/ValetSite.swift b/phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift similarity index 99% rename from phpmon/Domain/Integrations/Valet/ValetSite.swift rename to phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift index ed87be0..5d96431 100644 --- a/phpmon/Domain/Integrations/Valet/ValetSite.swift +++ b/phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift @@ -224,7 +224,7 @@ class ValetSite { public static func isolatedVersion(_ filePath: String) -> String? { if Filesystem.fileExists(filePath) { - return NginxConfigParser + return NginxConfiguration .init(filePath: filePath) .isolatedVersion } diff --git a/phpmon/Domain/Integrations/Valet/Valet.swift b/phpmon/Domain/Integrations/Valet/Valet.swift index 32e4794..529d0d2 100644 --- a/phpmon/Domain/Integrations/Valet/Valet.swift +++ b/phpmon/Domain/Integrations/Valet/Valet.swift @@ -26,6 +26,9 @@ class Valet { /// A cached list of sites that were detected after analyzing the paths set up for Valet. var sites: [ValetSite] = [] + /// A cached list of proxies that were detecting after analyzing the Nginx paths. + var proxies: [ValetProxy] = [] + /// Whether we're busy with some blocking operation. var isBusy: Bool = false