phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 12:00:09 +02:00
Code Releases Activity

✨ Switch Xdebug mode

Browse Source
This commit is contained in:
Nico Verbruggen
2022-05-19 01:05:06 +02:00
parent 990152d77d
commit e7f80ebce8
5 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpmon/Common/PHP/Extensions/Xdebug.swift
View File

@ -15,7 +15,11 @@ class Xdebug {
}
public static var mode: String {
return Command.execute(path: Paths.php, arguments: ["-r", "echo ini_get('xdebug.mode');"])
guard let file = PhpEnv.shared.getConfigFile(forKey: "xdebug.mode") else {
return ""
}
return file.get(for: "xdebug.mode") ?? ""
}
public static var modes: [String] {

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

@ -174,4 +174,14 @@ class PhpEnv {
return false
}
/**
Returns the configuration file instance that is used for a specific config value.
You can then use the configuration file instance to change values.
*/
public func getConfigFile(forKey key: String) -> PhpConfigurationFile? {
return PhpEnv.phpInstall.iniFiles
.reversed()
.first(where: { $0.has(key: key) })
}
}

17
phpmon/Domain/Menu/MainMenu.swift
View File

@ -244,6 +244,23 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate, PhpSwitcherDelegate
@objc func toggleXdebugMode(sender: XdebugMenuItem) {
Log.info("Switching Xdebug to mode: \(sender.mode)")
guard let file = PhpEnv.shared.getConfigFile(forKey: "xdebug.mode") else {
Log.info("xdebug.mode could not be found in any .ini file, aborting.")
return
}
do {
// Replace the xdebug mode
try file.replace(key: "xdebug.mode", value: sender.mode)
// Refresh the menu
Log.perf("Refreshing menu...")
MainMenu.shared.rebuild()
// Restart PHP-FPM
restartPhpFpm()
} catch {
Log.err("There was an issue replacing `xdebug.mode` in \(file.filePath)")
}
}
@objc func toggleExtension(sender: ExtensionMenuItem) {

2
phpmon/Domain/Menu/StatusMenu.swift
View File

@ -68,7 +68,7 @@ class StatusMenu: NSMenu {
self.addItem(NSMenuItem.separator())
// self.addXdebugMenuItem()
self.addXdebugMenuItem()
self.addFirstAidAndServicesMenuItems()
}

8
phpmon/Domain/Watcher/App+ConfigWatch.swift
View File

@ -11,16 +11,16 @@ import Foundation
extension App {
func startWatcher(_ url: URL) {
Log.info("No watcher currently active...")
Log.perf("No watcher currently active...")
self.watcher = PhpConfigWatcher(for: url)
self.watcher.didChange = { url in
Log.info("Something has changed in: \(url)")
Log.perf("Something has changed in: \(url)")
// Check if the watcher has last updated the menu less than 0.75s ago
let distance = self.watcher.lastUpdate?.distance(to: Date().timeIntervalSince1970)
if distance == nil || distance != nil && distance! > 0.75 {
Log.info("Refreshing menu...")
Log.perf("Refreshing menu...")
MainMenu.shared.reloadPhpMonitorMenuInBackground()
self.watcher.lastUpdate = Date().timeIntervalSince1970
}
@ -43,7 +43,7 @@ extension App {
if self.watcher.url != url || forceReload {
self.watcher.disable()
self.watcher = nil
Log.info("Watcher has stopped watching files. Starting new one...")
Log.perf("Watcher has stopped watching files. Starting new one...")
self.startWatcher(url)
}
}