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

🐛 Fixes full PHP version (#142)

Browse Source
This commit is contained in:
Nico Verbruggen
2022-02-20 13:48:37 +01:00
parent e3ae878cae
commit 6b3c562af2
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpmon/Common/PHP/PHP Version/PhpVersionNumber.swift
View File

@ -96,6 +96,12 @@ public struct PhpVersionNumber: Equatable {
let minor: Int let minor: Int
let patch: Int? let patch: Int?
public func toString() -> String {
return self.patch == nil
? "\(major).\(minor)"
: "\(major).\(minor).\(patch!)"
}
public func patch(_ strictFallback: Bool = true, _ constraint: PhpVersionNumber? = nil) -> Int { public func patch(_ strictFallback: Bool = true, _ constraint: PhpVersionNumber? = nil) -> Int {
return patch ?? (strictFallback ? 0 : constraint?.patch ?? 999) return patch ?? (strictFallback ? 0 : constraint?.patch ?? 999)
} }

2
phpmon/Domain/Menu/StatusMenu.swift
View File

@ -142,7 +142,7 @@ class StatusMenu : NSMenu {
let longVersion = PhpEnv.shared.cachedPhpInstallations[shortVersion]!.longVersion let longVersion = PhpEnv.shared.cachedPhpInstallations[shortVersion]!.longVersion
let long = Preferences.preferences[.fullPhpVersionDynamicIcon] as! Bool let long = Preferences.preferences[.fullPhpVersionDynamicIcon] as! Bool
let versionString = long ? longVersion.homebrewVersion : shortVersion let versionString = long ? longVersion.toString() : shortVersion
let action = #selector(MainMenu.switchToPhpVersion(sender:)) let action = #selector(MainMenu.switchToPhpVersion(sender:))
let brew = (shortVersion == PhpEnv.brewPhpVersion) ? "php" : "php@\(shortVersion)" let brew = (shortVersion == PhpEnv.brewPhpVersion) ? "php" : "php@\(shortVersion)"