From a22346ed354f4c588e808cfa8cbc7342a1cbfc16 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Mon, 25 Nov 2024 14:04:17 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20issue=20with=20formulae=20?= =?UTF-8?q?upgrades=20for=20tap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Common/Core/Constants.swift | 2 +- .../Integrations/Homebrew/BrewPhpFormulaeHandler.swift | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/phpmon/Common/Core/Constants.swift b/phpmon/Common/Core/Constants.swift index f0819f9..56d88a3 100644 --- a/phpmon/Common/Core/Constants.swift +++ b/phpmon/Common/Core/Constants.swift @@ -111,7 +111,7 @@ struct Constants { static let FrequentlyAskedQuestions = URL( string: "https://phpmon.app/faq" )! - + static let WikiPhpUnavailable = URL( string: "https://phpmon.app/php-unavailable" )! diff --git a/phpmon/Domain/Integrations/Homebrew/BrewPhpFormulaeHandler.swift b/phpmon/Domain/Integrations/Homebrew/BrewPhpFormulaeHandler.swift index b61ece8..ae8adfd 100644 --- a/phpmon/Domain/Integrations/Homebrew/BrewPhpFormulaeHandler.swift +++ b/phpmon/Domain/Integrations/Homebrew/BrewPhpFormulaeHandler.swift @@ -39,7 +39,7 @@ class BrewPhpFormulaeHandler: HandlesBrewPhpFormulae { OutdatedFormulae.self, from: rawJsonText ).formulae.filter({ formula in - formula.name.starts(with: "php") + formula.name.starts(with: "shivammathur/php/php") || formula.name.starts(with: "php") }) } @@ -53,7 +53,8 @@ class BrewPhpFormulaeHandler: HandlesBrewPhpFormulae { fullVersion = install.isPreRelease ? "\(fullVersion!)-dev" : fullVersion upgradeVersion = outdated?.first(where: { formula in - return formula.name == install.formulaName + return formula.name.replacingOccurrences(of: "shivammathur/php/", with: "") + == install.formulaName.replacingOccurrences(of: "shivammathur/php/", with: "") })?.current_version isPrerelease = install.isPreRelease