phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-11-07 05:10:06 +01:00
Code Releases Activity

✅ Fix tests related to version number parsing

Browse Source
This commit is contained in:
Nico Verbruggen
2023-01-05 17:58:55 +01:00
parent 67e8589834
commit d854dee2a1
3 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpmon/Common/PHP/PHP Version/PhpEnv.swift
View File

@@ -90,7 +90,10 @@ class PhpEnv {
public func detectPhpVersions() async -> [String] {
let files = await Shell.pipe("ls \(Paths.optPath) | grep php@").out
var versionsOnly = await extractPhpVersions(from: files.components(separatedBy: "\n"))
var versionsOnly = await extractPhpVersions(
from: files.components(separatedBy: "\n"),
supported: Constants.ValetSupportedPhpVersionMatrix[Valet.shared.version.major]!
)
// Make sure the aliased version is detected
// The user may have `php` installed, but not e.g. `php@8.0`
@@ -126,16 +129,11 @@ class PhpEnv {
*/
public func extractPhpVersions(
from versions: [String],
supported: [String],
checkBinaries: Bool = true,
generateHelpers: Bool = true
) async -> [String] {
var output: [String] = []
let valetMajor = Valet.shared.version.major
let supported = Constants.ValetSupportedPhpVersionMatrix[valetMajor] ?? []
print(supported)
versions.filter { (version) -> Bool in
// Omit everything that doesn't start with php@
// (e.g. something-php@8.0 won't be detected)