phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2026-03-30 08:20:09 +02:00
Code Issues Activity

♻️ Refactor PhpEnvironments and Preferences

Browse Source
This commit is contained in:
Nico Verbruggen
2026-01-21 13:02:32 +01:00
parent 231948085d
commit 88850e68d4
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,14 +143,27 @@ class PhpEnvironments {
/**
The version that the `php` formula via Brew is aliased to on the current system.
If you're up to date, `php` will be aliased to the latest version,
but that might not be the case since not everyone keeps their
software up-to-date.
As such, we take that information from Homebrew.
In order for our check to be correct, we query Homebrew locally.
*/
static var brewPhpAlias: String?
private static let _brewPhpAlias = Locked<String?>(nil)
static var brewPhpAlias: String? {
get { _brewPhpAlias.value }
set { _brewPhpAlias.value = newValue }
}
/**
Information we were able to discern from the Homebrew info command.
*/
private let _homebrewPackage = Locked<HomebrewPackage?>(nil)
var homebrewPackage: HomebrewPackage! {
get { _homebrewPackage.value }
set { _homebrewPackage.value = newValue }
}
/**
It's possible for the alias to be newer than the actual installed version of PHP.
@@ -193,11 +206,6 @@ class PhpEnvironments {
}
}
/**
Information we were able to discern from the Homebrew info command.
*/
var homebrewPackage: HomebrewPackage! = nil
// MARK: - Methods
/**

7
phpmon/Domain/Preferences/Preferences.swift
View File

@@ -11,18 +11,23 @@ import Foundation
class Preferences {
var container: Container
// MARK - Preferences
var customPreferences: CustomPrefs {
get { _customPreferences.value }
set { _customPreferences.value = newValue }
}
private let _customPreferences: Locked<CustomPrefs>
var cachedPreferences: [PreferenceName: Any?] {
get { _cachedPreferences.value }
set { _cachedPreferences.value = newValue }
}
private let _customPreferences: Locked<CustomPrefs>
private let _cachedPreferences: Locked<[PreferenceName: Any?]>
// MARK - Initialization
public init(container: Container) {
self.container = container
Preferences.handleFirstTimeLaunch()