From 6b3c562af271fa212c3ee6841814f99011a60d7e Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Sun, 20 Feb 2022 13:48:37 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixes=20full=20PHP=20version=20(?= =?UTF-8?q?#142)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Common/PHP/PHP Version/PhpVersionNumber.swift | 6 ++++++ phpmon/Domain/Menu/StatusMenu.swift | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/phpmon/Common/PHP/PHP Version/PhpVersionNumber.swift b/phpmon/Common/PHP/PHP Version/PhpVersionNumber.swift index 301aae9..1461df6 100644 --- a/phpmon/Common/PHP/PHP Version/PhpVersionNumber.swift +++ b/phpmon/Common/PHP/PHP Version/PhpVersionNumber.swift @@ -96,6 +96,12 @@ public struct PhpVersionNumber: Equatable { let minor: 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 { return patch ?? (strictFallback ? 0 : constraint?.patch ?? 999) } diff --git a/phpmon/Domain/Menu/StatusMenu.swift b/phpmon/Domain/Menu/StatusMenu.swift index 84905a8..639e2ae 100644 --- a/phpmon/Domain/Menu/StatusMenu.swift +++ b/phpmon/Domain/Menu/StatusMenu.swift @@ -142,7 +142,7 @@ class StatusMenu : NSMenu { let longVersion = PhpEnv.shared.cachedPhpInstallations[shortVersion]!.longVersion 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 brew = (shortVersion == PhpEnv.brewPhpVersion) ? "php" : "php@\(shortVersion)"