diff --git a/phpmon-tests/Parsers/NginxConfigParserTest.swift b/phpmon-tests/Parsers/NginxConfigParserTest.swift index 8d31048..096673d 100644 --- a/phpmon-tests/Parsers/NginxConfigParserTest.swift +++ b/phpmon-tests/Parsers/NginxConfigParserTest.swift @@ -20,12 +20,12 @@ class NginxConfigParserTest: XCTestCase { func testCanDetermineIsolation() throws { XCTAssertNil( - NginxConfigParser(filePath: NginxConfigParserTest.regularUrl.path).isolatedVersion() + NginxConfigParser(filePath: NginxConfigParserTest.regularUrl.path).isolatedVersion ) XCTAssertEqual( "8.1", - NginxConfigParser(filePath: NginxConfigParserTest.isolatedUrl.path).isolatedVersion() + NginxConfigParser(filePath: NginxConfigParserTest.isolatedUrl.path).isolatedVersion ) } diff --git a/phpmon/Domain/Integrations/Valet/NginxConfigParser.swift b/phpmon/Domain/Integrations/Valet/NginxConfigParser.swift index 0756a65..db17bfe 100644 --- a/phpmon/Domain/Integrations/Valet/NginxConfigParser.swift +++ b/phpmon/Domain/Integrations/Valet/NginxConfigParser.swift @@ -16,7 +16,7 @@ class NginxConfigParser { self.contents = try! String(contentsOfFile: filePath) } - public func isolatedVersion() -> String? { + lazy var isolatedVersion: String? = { let regex = try! NSRegularExpression( pattern: #"(ISOLATED_PHP_VERSION=(php@)?)((?\d)(.)?(?\d))"#, options: [] @@ -35,5 +35,5 @@ class NginxConfigParser { let minor: String = contents[minorRange] return "\(major).\(minor)" - } + }() } diff --git a/phpmon/Domain/Integrations/Valet/ValetSite.swift b/phpmon/Domain/Integrations/Valet/ValetSite.swift index c17cd9b..ba8adc6 100644 --- a/phpmon/Domain/Integrations/Valet/ValetSite.swift +++ b/phpmon/Domain/Integrations/Valet/ValetSite.swift @@ -89,8 +89,6 @@ class ValetSite { public func determineIsolated() { if let version = ValetSite.isolatedVersion("~/.config/valet/Nginx/\(self.name).\(self.tld)") { self.isolatedPhpVersion = PhpEnv.shared.cachedPhpInstallations[version] - } else { - self.isolatedPhpVersion = nil } } @@ -205,7 +203,9 @@ class ValetSite { public static func isolatedVersion(_ filePath: String) -> String? { if Filesystem.fileExists(filePath) { - return NginxConfigParser.init(filePath: filePath).isolatedVersion() + return NginxConfigParser + .init(filePath: filePath) + .isolatedVersion } return nil