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

🐛 Correctly handle mismatches when upgrading PHP

Browse Source
This commit is contained in:
Nico Verbruggen
2023-11-24 20:23:12 +01:00
parent 141c06d14b
commit 7159ca8612
11 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
phpmon/Common/PHP/PHP Version/PhpEnvironments.swift
View File

@ -37,7 +37,27 @@ class PhpEnvironments {
from: brewPhpAlias.data(using: .utf8)!
).first!
Log.info("[BREW] On your system, the `php` formula means version \(homebrewPackage.version)!")
Log.info("[BREW] On your system, the `php` formula means version \(homebrewPackage.version).")
// Check if that version actually corresponds to an older version
let phpConfigExecutablePath = "\(Paths.optPath)/php/bin/php-config"
if FileSystem.fileExists(phpConfigExecutablePath) {
let longVersionString = Command.execute(
path: phpConfigExecutablePath,
arguments: ["--version"],
trimNewlines: false
).trimmingCharacters(in: .whitespacesAndNewlines)
if let version = try? VersionNumber.parse(longVersionString) {
PhpEnvironments.brewPhpAlias = version.short
if version.short != homebrewPackage.version {
Log.info("[BREW] An older version of `php` is actually installed (\(version.short)).")
}
} else {
Log.warn("Could not determine the actual version of the php binary; assuming Homebrew is correct.")
PhpEnvironments.brewPhpAlias = homebrewPackage.version
}
}
}
// MARK: - Properties
@ -77,7 +97,12 @@ class PhpEnvironments {
As such, we take that information from Homebrew.
*/
static var brewPhpAlias: String {
static var brewPhpAlias: String = ""
/**
It's possible for the alias to be newer than the actual installed version of PHP.
*/
static var homebrewBrewPhpAlias: String {
if PhpEnvironments.shared.homebrewPackage == nil { return "8.2" }
return PhpEnvironments.shared.homebrewPackage.version
@ -144,7 +169,12 @@ class PhpEnvironments {
// Avoid inserting a duplicate
if !supportedVersions.contains(phpAlias) && FileSystem.fileExists("\(Paths.optPath)/php/bin/php") {
supportedVersions.insert(phpAlias)
let phpAliasInstall = PhpInstallation(phpAlias)
// Before inserting, ensure that the actual output matches the alias
// if that isn't the case, our formula remains out-of-date
if !phpAliasInstall.missingBinary {
supportedVersions.insert(phpAlias)
}
}
availablePhpVersions = Array(supportedVersions)

6
phpmon/Common/PHP/PhpInstallation.swift
View File

@ -12,6 +12,8 @@ class PhpInstallation {
var versionNumber: VersionNumber
var missingBinary: Bool = false
var isHealthy: Bool = true
/**
@ -35,6 +37,10 @@ class PhpInstallation {
// The parser should always work, or the string has to be very unusual.
// If so, the app SHOULD crash, so that the users report what's up.
self.versionNumber = try! VersionNumber.parse(longVersionString)
} else {
// Keep track that the `php-config` binary is missing; this often means there's a mismatch between
// the `php` version alias and the actual installed version (e.g. you haven't upgraded `php`)
missingBinary = true
}
if FileSystem.fileExists(phpExecutablePath) {

10
phpmon/Domain/Integrations/Homebrew/BrewFormula.swift
View File

@ -8,7 +8,7 @@
import Foundation
struct BrewFormula {
struct BrewFormula: Equatable {
/// Name of the formula.
let name: String
@ -48,6 +48,12 @@ struct BrewFormula {
return upgradeVersion != nil
}
/// Whether this formula alias is different.
var hasUpgradedFormulaAlias: Bool {
return self.shortVersion == PhpEnvironments.homebrewBrewPhpAlias
&& PhpEnvironments.homebrewBrewPhpAlias != PhpEnvironments.brewPhpAlias
}
/// The associated Homebrew folder with this PHP formula.
var homebrewFolder: String {
let resolved = name
@ -60,7 +66,7 @@ struct BrewFormula {
/// The short version associated with this formula, if installed.
var shortVersion: String? {
guard let version = self.installedVersion else {
return nil
return self.displayName.replacingOccurrences(of: "PHP ", with: "")
}
return VersionNumber.make(from: version)?.short ?? nil

7
phpmon/Domain/Integrations/Homebrew/BrewFormulaeHandler.swift
View File

@ -44,7 +44,8 @@ class BrewFormulaeHandler: HandlesBrewFormulae {
}
return Brew.phpVersionFormulae.map { (version, formula) in
let fullVersion = PhpEnvironments.shared.cachedPhpInstallations[version]?.versionNumber.text
let fullVersion = PhpEnvironments.shared.cachedPhpInstallations[version]?
.versionNumber.text
var upgradeVersion: String?
@ -54,13 +55,15 @@ class BrewFormulaeHandler: HandlesBrewFormulae {
})?.current_version
}
return BrewFormula(
let formula = BrewFormula(
name: formula,
displayName: "PHP \(version)",
installedVersion: fullVersion,
upgradeVersion: upgradeVersion,
prerelease: Constants.ExperimentalPhpVersions.contains(version)
)
return formula
}.sorted { $0.displayName > $1.displayName }
}
}

8
phpmon/Modules/PHP Version Manager/UI/PhpVersionManagerView.swift
View File

@ -157,7 +157,11 @@ struct PhpVersionManagerView: View {
}
}
if formula.isInstalled && formula.hasUpgrade {
if formula.hasUpgradedFormulaAlias {
Text("phpman.version.automatic_upgrade".localized(formula.shortVersion!))
.font(.system(size: 11))
.foregroundColor(.gray)
} else if formula.isInstalled && formula.hasUpgrade {
Text("phpman.version.has_update".localized(
formula.installedVersion!,
formula.upgradeVersion!
@ -195,7 +199,7 @@ struct PhpVersionManagerView: View {
} else {
Button("phpman.buttons.install".localizedForSwiftUI) {
Task { await self.install(formula) }
}
}.disabled(formula.hasUpgradedFormulaAlias)
}
}
.listRowBackground(index % 2 == 0 ? Color.gray.opacity(0): Color.gray.opacity(0.08))

1
phpmon/de.lproj/Localizable.strings
View File

@ -90,6 +90,7 @@
"phpman.version.has_update" = "Version %@ installiert, %@ verfügbar.";
"phpman.version.installed" = "Version %@ ist derzeit installiert.";
"phpman.version.available_for_installation" = "Diese Version kann installiert werden.";
"phpman.version.automatic_upgrade" = "Diese Version wird automatisch installiert, indem eine ältere Version aktualisiert wird.";
"phpman.buttons.uninstall" = "Deinstallieren";
"phpman.buttons.install" = "Installieren";
"phpman.buttons.update" = "Aktualisieren";

1
phpmon/en.lproj/Localizable.strings
View File

@ -107,6 +107,7 @@
"phpman.version.has_update" = "Version %@ installed, %@ available.";
"phpman.version.installed" = "Version %@ is currently installed.";
"phpman.version.available_for_installation" = "This version can be installed.";
"phpman.version.automatic_upgrade" = "This version will be automatically installed by upgrading an older version.";
"phpman.buttons.uninstall" = "Uninstall";
"phpman.buttons.install" = "Install";
"phpman.buttons.update" = "Update";

1
phpmon/fr.lproj/Localizable.strings
View File

@ -107,6 +107,7 @@
"phpman.version.has_update" = "Version %@ installée, %@ disponible.";
"phpman.version.installed" = "La version %@ est actuellement installée.";
"phpman.version.available_for_installation" = "Cette version peut être installée.";
"phpman.version.automatic_upgrade" = "Cette version sera installée automatiquement en mettant à jour une version plus ancienne.";
"phpman.buttons.uninstall" = "Désinstaller";
"phpman.buttons.install" = "Installer";
"phpman.buttons.update" = "Mettre à jour";

1
phpmon/nl.lproj/Localizable.strings
View File

@ -91,6 +91,7 @@
"phpman.version.has_update" = "Versie %@ geïnstalleerd, %@ beschikbaar.";
"phpman.version.installed" = "Versie %@ is momenteel geïnstalleerd.";
"phpman.version.available_for_installation" = "Deze versie kan worden geïnstalleerd.";
"phpman.version.automatic_upgrade" = "Deze versie zal automatisch geïnstalleerd worden door een upgrade.";
"phpman.buttons.uninstall" = "Verwijderen";
"phpman.buttons.install" = "Installeren";
"phpman.buttons.update" = "Bijwerken";

1
phpmon/pt-PT.lproj/Localizable.strings
View File

@ -90,6 +90,7 @@
"phpman.version.has_update" = "Versão %@ instalada, %@ disponível.";
"phpman.version.installed" = "Versão %@ atualmente instalada.";
"phpman.version.available_for_installation" = "Esta versão pode ser instalada.";
"phpman.version.automatic_upgrade" = "Esta versão será instalada automaticamente ao atualizar uma versão mais antiga.";
"phpman.buttons.uninstall" = "Desinstalar";
"phpman.buttons.install" = "Instalar";
"phpman.buttons.update" = "Atualizar";

1
phpmon/vi.lproj/Localizable.strings
View File

@ -90,6 +90,7 @@
"phpman.version.has_update" = "Phiên bản %@ được cài đặt, Phiên bản %@ có sẵn.";
"phpman.version.installed" = "Phiên bản %@ hiện đã được cài đặt.";
"phpman.version.available_for_installation" = "Phiên bản này có thể được cài đặt.";
"phpman.version.automatic_upgrade" = "Phiên bản này sẽ được cài đặt tự động bằng cách nâng cấp từ một phiên bản cũ hơn.";
"phpman.buttons.uninstall" = "Gỡ cài đặt";
"phpman.buttons.install" = "Cài đặt";
"phpman.buttons.update" = "Cập nhật";