phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 03:50:08 +02:00
Code Releases Activity

✅ Fix tests

Browse Source
This commit is contained in:
Nico Verbruggen
2023-02-26 14:45:15 +01:00
parent 81eb2fee90
commit c7eb1d5ce5
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PHP Monitor.xcodeproj/project.pbxproj
View File

@ -723,6 +723,9 @@
C4FACE83288F1F9700FC478F /* OnboardingWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FACE82288F1F9700FC478F /* OnboardingWindowController.swift */; }; C4FACE83288F1F9700FC478F /* OnboardingWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FACE82288F1F9700FC478F /* OnboardingWindowController.swift */; };
C4FBFC532616485F00CDB8E1 /* PhpVersionDetectionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */; }; C4FBFC532616485F00CDB8E1 /* PhpVersionDetectionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */; };
C4FC21B128391F8E00D368BB /* MainMenu+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F361602836BFD9003598CC /* MainMenu+Actions.swift */; }; C4FC21B128391F8E00D368BB /* MainMenu+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F361602836BFD9003598CC /* MainMenu+Actions.swift */; };
C4FD87A829AB9ABD0002D701 /* PhpConfigChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43FDBE829A932B0003D85EC /* PhpConfigChecker.swift */; };
C4FD87A929AB9ABD0002D701 /* PhpConfigChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43FDBE829A932B0003D85EC /* PhpConfigChecker.swift */; };
C4FD87AA29AB9ABD0002D701 /* PhpConfigChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43FDBE829A932B0003D85EC /* PhpConfigChecker.swift */; };
C4FE011128084FC200D1DE6D /* SelectionVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FE011028084FC200D1DE6D /* SelectionVC.swift */; }; C4FE011128084FC200D1DE6D /* SelectionVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FE011028084FC200D1DE6D /* SelectionVC.swift */; };
C4FE011228084FC200D1DE6D /* SelectionVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FE011028084FC200D1DE6D /* SelectionVC.swift */; }; C4FE011228084FC200D1DE6D /* SelectionVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FE011028084FC200D1DE6D /* SelectionVC.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@ -2282,6 +2285,7 @@
C471E82D28F9BB650021E251 /* AlertableError.swift in Sources */, C471E82D28F9BB650021E251 /* AlertableError.swift in Sources */,
C471E82E28F9BB650021E251 /* Errors.swift in Sources */, C471E82E28F9BB650021E251 /* Errors.swift in Sources */,
C471E82F28F9BB650021E251 /* Alert.swift in Sources */, C471E82F28F9BB650021E251 /* Alert.swift in Sources */,
C4FD87A929AB9ABD0002D701 /* PhpConfigChecker.swift in Sources */,
C471E83028F9BB650021E251 /* Application.swift in Sources */, C471E83028F9BB650021E251 /* Application.swift in Sources */,
C471E83128F9BB650021E251 /* LocalNotification.swift in Sources */, C471E83128F9BB650021E251 /* LocalNotification.swift in Sources */,
C471E83228F9BB650021E251 /* MenuBarImageGenerator.swift in Sources */, C471E83228F9BB650021E251 /* MenuBarImageGenerator.swift in Sources */,
@ -2546,6 +2550,7 @@
C471E8EA28F9BB8F0021E251 /* SectionHeaderView.swift in Sources */, C471E8EA28F9BB8F0021E251 /* SectionHeaderView.swift in Sources */,
C4D36604291132B7006BD146 /* ValetScanners.swift in Sources */, C4D36604291132B7006BD146 /* ValetScanners.swift in Sources */,
C471E8EB28F9BB8F0021E251 /* HeaderView.swift in Sources */, C471E8EB28F9BB8F0021E251 /* HeaderView.swift in Sources */,
C4FD87A829AB9ABD0002D701 /* PhpConfigChecker.swift in Sources */,
C45B9151295608E300F4EC78 /* ValetServicesManager.swift in Sources */, C45B9151295608E300F4EC78 /* ValetServicesManager.swift in Sources */,
C471E8EC28F9BB8F0021E251 /* SwiftUIHelper.swift in Sources */, C471E8EC28F9BB8F0021E251 /* SwiftUIHelper.swift in Sources */,
C471E8EE28F9BB8F0021E251 /* HotKey.swift in Sources */, C471E8EE28F9BB8F0021E251 /* HotKey.swift in Sources */,
@ -2734,6 +2739,7 @@
C4E49DE828F764050026AC4E /* ActiveCommand.swift in Sources */, C4E49DE828F764050026AC4E /* ActiveCommand.swift in Sources */,
C4CE3BBB27B324230086CA49 /* MainMenu+Switcher.swift in Sources */, C4CE3BBB27B324230086CA49 /* MainMenu+Switcher.swift in Sources */,
C46E20702829D27F00D909D6 /* AppUpdaterCheckTest.swift in Sources */, C46E20702829D27F00D909D6 /* AppUpdaterCheckTest.swift in Sources */,
C4FD87AA29AB9ABD0002D701 /* PhpConfigChecker.swift in Sources */,
C485707D28BF45A200539B36 /* WarningView.swift in Sources */, C485707D28BF45A200539B36 /* WarningView.swift in Sources */,
C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */, C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */,
C44CCD4127AFE2FC00CE40E5 /* AlertableError.swift in Sources */, C44CCD4127AFE2FC00CE40E5 /* AlertableError.swift in Sources */,

2
phpmon/Domain/App/AppVersion.swift
View File

@ -15,7 +15,7 @@ class AppVersion: Comparable {
init(version: String, build: String?, suffix: String? = nil) { init(version: String, build: String?, suffix: String? = nil) {
self.version = version self.version = version
self.build = Int(build ?? "0") self.build = build == nil ? nil : Int(build!)
self.suffix = suffix self.suffix = suffix
} }

5
phpmon/Domain/Integrations/Homebrew/CaskFile.swift
View File

@ -40,12 +40,17 @@ struct CaskFile {
let lines = string.split(separator: "\n") let lines = string.split(separator: "\n")
.filter { $0 != "" } .filter { $0 != "" }
.map { line in
return line.trimmingCharacters(in: .whitespacesAndNewlines)
}
if lines.count < 4 { if lines.count < 4 {
Log.err("The CaskFile is <4 lines long, which is too short") Log.err("The CaskFile is <4 lines long, which is too short")
return nil return nil
} }
print(lines)
if !lines.first!.starts(with: "cask") || !lines.last!.starts(with: "end") { if !lines.first!.starts(with: "cask") || !lines.last!.starts(with: "end") {
Log.err("The CaskFile does not start with 'cask' or does not end with 'end'") Log.err("The CaskFile does not start with 'cask' or does not end with 'end'")
return nil return nil

2
tests/Shared/TestableConfigurations.swift
View File

@ -138,7 +138,7 @@ class TestableConfigurations {
: .instant(ShellStrings.shared.brewServicesAsRoot), : .instant(ShellStrings.shared.brewServicesAsRoot),
"/opt/homebrew/bin/brew services info --all --json" "/opt/homebrew/bin/brew services info --all --json"
: .instant(ShellStrings.shared.brewServicesAsUser), : .instant(ShellStrings.shared.brewServicesAsUser),
"curl -s --max-time 5 '\(Constants.Urls.StableBuildCaskFile.absoluteString)' | grep version" "curl -s --max-time 10 '\(Constants.Urls.DevBuildCaskFile.absoluteString)'"
: .instant("version '5.6.2_976'"), : .instant("version '5.6.2_976'"),
"/opt/homebrew/bin/brew unlink php" "/opt/homebrew/bin/brew unlink php"
: .delayed(0.2, "OK"), : .delayed(0.2, "OK"),

6
tests/unit/Versions/ValetVersionExtractorTest.swift
View File

@ -37,10 +37,4 @@ class ValetVersionExtractorTest: XCTestCase {
XCTAssertEqual(version.major, 3) XCTAssertEqual(version.major, 3)
} }
func test_can_determine_valet_version() async {
let version = await valet("--version", sudo: false)
XCTAssert(version.contains("Laravel Valet 2") || version.contains("Laravel Valet 3"))
}
} }