♻️ Cleanup

PHP Monitor.xcodeproj/project.pbxproj

@@ -47,8 +47,6 @@
 		C4998F0B2617633900B2526E /* PrefsWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4998F092617633900B2526E /* PrefsWC.swift */; };
 		C49EAB46259FC305007F6C3B /* Paths.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EAB45259FC305007F6C3B /* Paths.swift */; };
 		C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4ACA38E25C754C100060C66 /* PhpExtension.swift */; };
-		C4AF9F6E275445F600D44ED0 /* ValetConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F6D275445F600D44ED0 /* ValetConfiguration.swift */; };
-		C4AF9F6F275445F600D44ED0 /* ValetConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AF9F6D275445F600D44ED0 /* ValetConfiguration.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 */; };
@@ -137,7 +135,6 @@
 		C4998F092617633900B2526E /* PrefsWC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefsWC.swift; sourceTree = "<group>"; };
 		C49EAB45259FC305007F6C3B /* Paths.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Paths.swift; sourceTree = "<group>"; };
 		C4ACA38E25C754C100060C66 /* PhpExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpExtension.swift; sourceTree = "<group>"; };
-		C4AF9F6D275445F600D44ED0 /* ValetConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetConfiguration.swift; sourceTree = "<group>"; };
 		C4AF9F70275445FF00D44ED0 /* valet-config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "valet-config.json"; sourceTree = "<group>"; };
 		C4AF9F76275447F100D44ED0 /* ValetConfigParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetConfigParserTest.swift; sourceTree = "<group>"; };
 		C4AF9F792754499000D44ED0 /* Valet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Valet.swift; sourceTree = "<group>"; };
@@ -296,7 +293,6 @@
 			isa = PBXGroup;
 			children = (
 				C4AF9F792754499000D44ED0 /* Valet.swift */,
-				C4AF9F6D275445F600D44ED0 /* ValetConfiguration.swift */,
 			);
 			path = Valet;
 			sourceTree = "<group>";
@@ -495,7 +491,6 @@
 				C4F2E43A2752F7D00020E974 /* PhpInstallation.swift in Sources */,
 				C41C1B4D22B0215A00E7CF16 /* Actions.swift in Sources */,
 				C48D0CA325CC992000CC7490 /* StatsView.swift in Sources */,
-				C4AF9F6E275445F600D44ED0 /* ValetConfiguration.swift in Sources */,
 				C4F2E4372752F0870020E974 /* HomebrewDiagnostics.swift in Sources */,
 				C41CD0292628D8EE0065BBED /* GlobalKeybindPreference.swift in Sources */,
 				C42295DD2358D02000E263B2 /* Command.swift in Sources */,
@@ -531,7 +526,6 @@
 				C4FBFC532616485F00CDB8E1 /* PhpVersionDetectionTest.swift in Sources */,
 				C43A8A2425D9D20D00591B77 /* BrewJsonParserTest.swift in Sources */,
 				C4F780CA25D80B75000DBC97 /* HomebrewPackage.swift in Sources */,
-				C4AF9F6F275445F600D44ED0 /* ValetConfiguration.swift in Sources */,
 				C4AF9F7B2754499000D44ED0 /* Valet.swift in Sources */,
 				C4F780C025D80B6E000DBC97 /* Startup.swift in Sources */,
 				C4F2E4382752F08D0020E974 /* HomebrewDiagnostics.swift in Sources */,

phpmon-tests/ValetConfigParserTest.swift

@@ -23,7 +23,7 @@ class ValetConfigParserTest: XCTestCase {
             encoding: .utf8
         )
         let config = try! JSONDecoder().decode(
-            ValetConfiguration.self,
+            Valet.Configuration.self,
             from: json!.data(using: .utf8)!
         )
         

phpmon/Domain/Integrations/Valet/Valet.swift

@@ -11,7 +11,7 @@ import Foundation
 class Valet {
     
     var version: String
-    var config: ValetConfiguration
+    var config: Valet.Configuration
     var detectedSites: [String]
     
     init() {
@@ -23,7 +23,7 @@ class Valet {
             .appendingPathComponent(".config/valet/config.json")
         
         self.config = try! JSONDecoder().decode(
-            ValetConfiguration.self,
+            Valet.Configuration.self,
             from: try! String(contentsOf: file, encoding: .utf8).data(using: .utf8)!
         )
         
@@ -33,4 +33,12 @@ class Valet {
         self.detectedSites = []
     }
     
+    // MARK: - Structs
+    
+    struct Configuration: Decodable {
+        let tld: String
+        let paths: [String]
+        let loopback: String
+    }
+    
 }

phpmon/Domain/Integrations/Valet/ValetConfiguration.swift

@@ -1,17 +0,0 @@
-//
-//  ValetConfiguration.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 29/11/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-class ValetConfiguration: Decodable {
-    let tld: String
-    let paths: [String]
-    let loopback: String
-}
-
-