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

♻️ Preliminary refactor for Valet 3.0 (#148)

Browse Source
This commit is contained in:
Nico Verbruggen
2022-03-15 22:39:46 +01:00
parent a8bad8447a
commit 1a1a53b472
6 changed files with 77 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ import Foundation
class PhpInstallation {
var longVersion: PhpVersionNumber
var versionNumber: PhpVersionNumber
/**
In order to determine details about a PHP installation, we’ll simply run `php-config --version`
@@ -19,7 +19,7 @@ class PhpInstallation {
init(_ version: String) {
let phpConfigExecutablePath = "\(Paths.optPath)/php@\(version)/bin/php-config"
self.longVersion = PhpVersionNumber.make(from: version)!
self.versionNumber = PhpVersionNumber.make(from: version)!
if Filesystem.fileExists(phpConfigExecutablePath) {
let longVersionString = Command.execute(
@@ -29,7 +29,7 @@ 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.longVersion = try! PhpVersionNumber.parse(longVersionString)
self.versionNumber = try! PhpVersionNumber.parse(longVersionString)
}
}

54
phpmon/Common/PHP/Switcher/InternalSwitcher.swift
View File

@@ -24,22 +24,23 @@ class InternalSwitcher: PhpSwitcher {
{
Log.info("Switching to \(version), unlinking all versions...")
let isolated = Valet.shared.sites.filter { site in
site.isolatedPhpVersion != nil
}.map { site in
return site.isolatedPhpVersion!.versionNumber.homebrewVersion
}
var versions: Set<String> = []
versions = versions.union(isolated)
versions = versions.union([version])
let group = DispatchGroup()
PhpEnv.shared.availablePhpVersions.forEach { (available) in
group.enter()
DispatchQueue.global(qos: .userInitiated).async {
let formula = (available == PhpEnv.brewPhpVersion)
? "php" : "php@\(available)"
brew("unlink \(formula)")
// TODO: (ISOLATION) Only stop formulae that are not used for isolation
brew("services stop \(formula)", sudo: true)
Log.perf("Unlinked and stopped services for \(formula)")
self.stopPhpVersion(available)
group.leave()
}
}
@@ -48,16 +49,39 @@ class InternalSwitcher: PhpSwitcher {
Log.info("All versions have been unlinked!")
Log.info("Linking the new version!")
let formula = (version == PhpEnv.brewPhpVersion) ? "php" : "php@\(version)"
brew("link \(formula) --overwrite --force")
brew("services start \(formula)", sudo: true)
for formula in versions {
self.startPhpVersion(formula, primary: (version == formula))
}
Log.info("Restarting nginx, just to be sure!")
brew("services restart nginx", sudo: true)
Log.info("The new version has been linked!")
Log.info("The new version(s) has been linked!")
completion()
}
}
private func stopPhpVersion(_ version: String) {
let formula = (version == PhpEnv.brewPhpVersion) ? "php" : "php@\(version)"
brew("unlink \(formula)")
brew("services stop \(formula)", sudo: true)
Log.perf("Unlinked and stopped services for \(formula)")
}
private func startPhpVersion(_ version: String, primary: Bool) {
let formula = (version == PhpEnv.brewPhpVersion) ? "php" : "php@\(version)"
if (primary) {
Log.perf("PHP \(formula) is the primary formula, linking and starting services...")
brew("link \(formula) --overwrite --force")
} else {
Log.perf("PHP \(formula) is an isolated PHP version, starting services only...")
}
brew("services start \(formula)", sudo: true)
let socketVersion = version.replacingOccurrences(of: ".", with: "")
Shell.run("ln -sF ~/.config/valet/valet\(socketVersion).sock ~/.config/valet/valet.sock")
Log.perf("Symlinked new socket version.")
}
}