From e7f3c7e59cd48c9a6bff2f90cc6b5df8c442ab5e Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Wed, 28 Sep 2022 18:24:01 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=9B=20Fix=20an=20issue=20with=20mi?= =?UTF-8?q?ssing=20separator=20item?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Domain/Menu/StatusMenu+Items.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/phpmon/Domain/Menu/StatusMenu+Items.swift b/phpmon/Domain/Menu/StatusMenu+Items.swift index 1bc2971..7fe95d3 100644 --- a/phpmon/Domain/Menu/StatusMenu+Items.swift +++ b/phpmon/Domain/Menu/StatusMenu+Items.swift @@ -212,6 +212,7 @@ extension StatusMenu { func addXdebugMenuItem() { if !Xdebug.enabled { + addItem(NSMenuItem.separator()) return } From 5b3054326ea53f5ae4b782f43ebbeaf2f1a68f96 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Wed, 28 Sep 2022 18:24:26 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=94=A7=20Bump=20version=20number?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 762151a..a233a0c 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -1741,7 +1741,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 973; + CURRENT_PROJECT_VERSION = 975; DEAD_CODE_STRIPPING = YES; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; @@ -1752,7 +1752,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 5.6.1; + MARKETING_VERSION = 5.6.2; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1769,7 +1769,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 973; + CURRENT_PROJECT_VERSION = 975; DEAD_CODE_STRIPPING = YES; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787; @@ -1780,7 +1780,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 5.6.1; + MARKETING_VERSION = 5.6.2; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; From 8055a32bdee49fa0c27b14247899eb527eeabbd4 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Thu, 29 Sep 2022 18:50:40 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9B=20Fix=20ComposerWindow=20deini?= =?UTF-8?q?t=20not=20firing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Common/Helpers/PMWindowController.swift | 2 +- phpmon/Domain/App/AppDelegate.swift | 2 +- phpmon/Domain/DomainList/DomainListVC.swift | 2 +- .../Integrations/Composer/ComposerWindow.swift | 14 ++++++++++---- phpmon/Domain/Notice/BetterAlertVC.swift | 2 +- phpmon/Domain/Preferences/PrefsVC.swift | 2 +- phpmon/Domain/Progress/ProgressVC.swift | 2 +- .../TerminalProgressWindowController.swift | 2 +- phpmon/Domain/Watcher/PhpConfigWatcher.swift | 2 +- 9 files changed, 18 insertions(+), 12 deletions(-) diff --git a/phpmon/Common/Helpers/PMWindowController.swift b/phpmon/Common/Helpers/PMWindowController.swift index f9e75b4..24684dc 100644 --- a/phpmon/Common/Helpers/PMWindowController.swift +++ b/phpmon/Common/Helpers/PMWindowController.swift @@ -30,7 +30,7 @@ class PMWindowController: NSWindowController, NSWindowDelegate { } deinit { - Log.perf("Window controller '\(windowName)' was deinitialized") + Log.perf("deinit: \(String(describing: self)).\(#function)") } } diff --git a/phpmon/Domain/App/AppDelegate.swift b/phpmon/Domain/App/AppDelegate.swift index 96f5628..c455fff 100644 --- a/phpmon/Domain/App/AppDelegate.swift +++ b/phpmon/Domain/App/AppDelegate.swift @@ -65,7 +65,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele override init() { logger.verbosity = .info #if DEBUG - // logger.verbosity = .performance + logger.verbosity = .performance #endif if CommandLine.arguments.contains("--v") { logger.verbosity = .performance diff --git a/phpmon/Domain/DomainList/DomainListVC.swift b/phpmon/Domain/DomainList/DomainListVC.swift index 7c0f531..d3a26cd 100644 --- a/phpmon/Domain/DomainList/DomainListVC.swift +++ b/phpmon/Domain/DomainList/DomainListVC.swift @@ -292,6 +292,6 @@ class DomainListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource // MARK: - Deinitialization deinit { - Log.perf("DomainListVC deallocated") + Log.perf("deinit: \(String(describing: self)).\(#function)") } } diff --git a/phpmon/Domain/Integrations/Composer/ComposerWindow.swift b/phpmon/Domain/Integrations/Composer/ComposerWindow.swift index 2868636..4daa006 100644 --- a/phpmon/Domain/Integrations/Composer/ComposerWindow.swift +++ b/phpmon/Domain/Integrations/Composer/ComposerWindow.swift @@ -52,15 +52,15 @@ class ComposerWindow { } task.listen( - didReceiveStandardOutputData: { string in + didReceiveStandardOutputData: { [weak self] string in DispatchQueue.main.async { - self.window?.addToConsole(string) + self?.window?.addToConsole(string) } // Log.perf("\(string.trimmingCharacters(in: .newlines))") }, - didReceiveStandardErrorData: { string in + didReceiveStandardErrorData: { [weak self] string in DispatchQueue.main.async { - self.window?.addToConsole(string) + self?.window?.addToConsole(string) } // Log.perf("\(string.trimmingCharacters(in: .newlines))") } @@ -91,6 +91,7 @@ class ComposerWindow { } window = nil removeBusyStatus() + menu = nil completion(true) } } @@ -103,6 +104,7 @@ class ComposerWindow { window?.progressView?.labelDescription.stringValue = "alert.composer_failure.info".localized window = nil removeBusyStatus() + menu = nil completion(false) } } @@ -128,4 +130,8 @@ class ComposerWindow { .withPrimary(text: "OK") .show() } + + deinit { + Log.perf("deinit: \(String(describing: self)).\(#function)") + } } diff --git a/phpmon/Domain/Notice/BetterAlertVC.swift b/phpmon/Domain/Notice/BetterAlertVC.swift index 9f4797f..c6c3bdc 100644 --- a/phpmon/Domain/Notice/BetterAlertVC.swift +++ b/phpmon/Domain/Notice/BetterAlertVC.swift @@ -47,7 +47,7 @@ class BetterAlertVC: NSViewController { } deinit { - Log.perf("A BetterAlert has been deinitialized.") + Log.perf("deinit: \(String(describing: self)).\(#function)") } // MARK: Outlet Actions diff --git a/phpmon/Domain/Preferences/PrefsVC.swift b/phpmon/Domain/Preferences/PrefsVC.swift index 47179b0..346f6ec 100644 --- a/phpmon/Domain/Preferences/PrefsVC.swift +++ b/phpmon/Domain/Preferences/PrefsVC.swift @@ -25,7 +25,7 @@ class GenericPreferenceVC: NSViewController { // MARK: - Deinitialization deinit { - Log.perf("PrefsVC deallocated") + Log.perf("deinit: \(String(describing: self)).\(#function)") } func getDynamicIconPV() -> NSView { diff --git a/phpmon/Domain/Progress/ProgressVC.swift b/phpmon/Domain/Progress/ProgressVC.swift index 2b77bb2..9fc8f2c 100644 --- a/phpmon/Domain/Progress/ProgressVC.swift +++ b/phpmon/Domain/Progress/ProgressVC.swift @@ -18,7 +18,7 @@ class ProgressViewController: NSViewController { @IBOutlet weak var imageViewType: NSImageView! deinit { - Log.perf("Deinitializing ProgressViewController") + Log.perf("deinit: \(String(describing: self)).\(#function)") } } diff --git a/phpmon/Domain/Progress/TerminalProgressWindowController.swift b/phpmon/Domain/Progress/TerminalProgressWindowController.swift index c7c05ea..d60f7bc 100644 --- a/phpmon/Domain/Progress/TerminalProgressWindowController.swift +++ b/phpmon/Domain/Progress/TerminalProgressWindowController.swift @@ -56,7 +56,7 @@ class TerminalProgressWindowController: NSWindowController, NSWindowDelegate { } deinit { - Log.perf("Deinitializing ProgressWindowController") + Log.perf("deinit: \(String(describing: self)).\(#function)") } } diff --git a/phpmon/Domain/Watcher/PhpConfigWatcher.swift b/phpmon/Domain/Watcher/PhpConfigWatcher.swift index b1b1e45..cc6d231 100644 --- a/phpmon/Domain/Watcher/PhpConfigWatcher.swift +++ b/phpmon/Domain/Watcher/PhpConfigWatcher.swift @@ -68,7 +68,7 @@ class PhpConfigWatcher { } deinit { - Log.perf("A PhpConfigWatcher has been deinitialized.") + Log.perf("deinit: \(String(describing: self)).\(#function)") } } From f28354e6344b598e85fe34a58fd1fa4477faa7b2 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Sun, 2 Oct 2022 13:28:01 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=90=9B=20Use=20`valet=20secure=20site?= =?UTF-8?q?name`=20(#197)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 4 ++-- phpmon/Domain/DomainList/DomainListVC+Actions.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index a233a0c..40c7222 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -1741,7 +1741,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 975; + CURRENT_PROJECT_VERSION = 976; DEAD_CODE_STRIPPING = YES; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; @@ -1769,7 +1769,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 975; + CURRENT_PROJECT_VERSION = 976; DEAD_CODE_STRIPPING = YES; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787; diff --git a/phpmon/Domain/DomainList/DomainListVC+Actions.swift b/phpmon/Domain/DomainList/DomainListVC+Actions.swift index 48a7a97..e37c592 100644 --- a/phpmon/Domain/DomainList/DomainListVC+Actions.swift +++ b/phpmon/Domain/DomainList/DomainListVC+Actions.swift @@ -47,7 +47,7 @@ extension DomainListVC { let originalSecureStatus = selectedSite!.secured let action = selectedSite!.secured ? "unsecure" : "secure" let selectedSite = selectedSite! - let command = "cd '\(selectedSite.absolutePath)' && sudo \(Paths.valet) \(action) && exit;" + let command = "sudo \(Paths.valet) \(action) '\(selectedSite.name)' && exit;" waitAndExecute { Shell.run(command, requiresPath: true)