From ec4371e6da9509bb53783d3b5c6d23bda022f823 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Wed, 10 Feb 2021 15:58:24 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20All=20methods=20are=20internal?= =?UTF-8?q?=20by=20default?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Domain/Commands/Startup.swift | 2 +- phpmon/Domain/Core/HomebrewPackage.swift | 2 +- phpmon/Domain/Core/PhpExtension.swift | 2 +- phpmon/Domain/Menu/StatusMenu.swift | 6 ++--- phpmon/Domain/Singletons/App.swift | 2 +- phpmon/Domain/Singletons/MainMenu.swift | 28 ++++++++++++------------ phpmon/Domain/Singletons/Shell.swift | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/phpmon/Domain/Commands/Startup.swift b/phpmon/Domain/Commands/Startup.swift index 44dae07..81e52ed 100644 --- a/phpmon/Domain/Commands/Startup.swift +++ b/phpmon/Domain/Commands/Startup.swift @@ -19,7 +19,7 @@ class Startup { - Parameter success: Callback that is fired if the application can proceed with launch - Parameter failure: Callback that is fired if the application must retry launch */ - public func checkEnvironment(success: () -> Void, failure: @escaping () -> Void) + func checkEnvironment(success: () -> Void, failure: @escaping () -> Void) { self.failureCallback = failure diff --git a/phpmon/Domain/Core/HomebrewPackage.swift b/phpmon/Domain/Core/HomebrewPackage.swift index 8eb6210..9bdb1aa 100644 --- a/phpmon/Domain/Core/HomebrewPackage.swift +++ b/phpmon/Domain/Core/HomebrewPackage.swift @@ -12,7 +12,7 @@ struct HomebrewPackage : Decodable { let full_name: String let aliases: [String] - public func getVersion() -> String { + public var version: String { return aliases.first!.replacingOccurrences(of: "php@", with: "") } } diff --git a/phpmon/Domain/Core/PhpExtension.swift b/phpmon/Domain/Core/PhpExtension.swift index dbdac51..076ffe9 100644 --- a/phpmon/Domain/Core/PhpExtension.swift +++ b/phpmon/Domain/Core/PhpExtension.swift @@ -60,7 +60,7 @@ class PhpExtension { /** This simply toggles the extension in the .ini file. You may need to restart the other services in order for this change to apply. */ - public func toggle() { + func toggle() { Actions.sed( file: self.file, original: self.line, diff --git a/phpmon/Domain/Menu/StatusMenu.swift b/phpmon/Domain/Menu/StatusMenu.swift index ce05480..2192647 100644 --- a/phpmon/Domain/Menu/StatusMenu.swift +++ b/phpmon/Domain/Menu/StatusMenu.swift @@ -8,7 +8,7 @@ import Cocoa class StatusMenu : NSMenu { - public func addPhpVersionMenuItems() { + func addPhpVersionMenuItems() { if App.shared.currentInstall == nil { return } @@ -24,7 +24,7 @@ class StatusMenu : NSMenu { self.addItem(HeaderView.asMenuItem(text: phpVersionText)) } - public func addPhpActionMenuItems() { + func addPhpActionMenuItems() { if App.busy { self.addItem(NSMenuItem(title: "mi_busy".localized, action: nil, keyEquivalent: "")) return @@ -73,7 +73,7 @@ class StatusMenu : NSMenu { self.addItem(NSMenuItem(title: "mi_restart_all_services".localized, action: #selector(MainMenu.restartAllServices), keyEquivalent: "s")) } - public func addPhpConfigurationMenuItems() { + func addPhpConfigurationMenuItems() { if App.shared.currentInstall == nil { return } diff --git a/phpmon/Domain/Singletons/App.swift b/phpmon/Domain/Singletons/App.swift index d89a43d..169ed7f 100644 --- a/phpmon/Domain/Singletons/App.swift +++ b/phpmon/Domain/Singletons/App.swift @@ -43,7 +43,7 @@ class App { */ var brewPhpPackage: HomebrewPackage? = nil { didSet { - self.brewPhpVersion = self.brewPhpPackage!.getVersion() + self.brewPhpVersion = self.brewPhpPackage!.version } } diff --git a/phpmon/Domain/Singletons/MainMenu.swift b/phpmon/Domain/Singletons/MainMenu.swift index 40d57cd..7c64d78 100644 --- a/phpmon/Domain/Singletons/MainMenu.swift +++ b/phpmon/Domain/Singletons/MainMenu.swift @@ -23,7 +23,7 @@ class MainMenu: NSObject, NSWindowDelegate { /** Kick off the startup of the rendering of the main menu. */ - public func startup() { + func startup() { // Start with the icon self.setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!) // Perform environment boot checks @@ -75,7 +75,7 @@ class MainMenu: NSObject, NSWindowDelegate { /** Update the menu's contents, based on what's going on. */ - public func update() { + func update() { // Update the menu item on the main thread DispatchQueue.main.async { // Create a new menu @@ -176,13 +176,13 @@ class MainMenu: NSObject, NSWindowDelegate { // MARK: - Actions - @objc public func restartPhpFpm() { + @objc func restartPhpFpm() { self.waitAndExecute({ Actions.restartPhpFpm() }) } - @objc public func restartAllServices() { + @objc func restartAllServices() { self.waitAndExecute({ Actions.restartDnsMasq() Actions.restartPhpFpm() @@ -190,19 +190,19 @@ class MainMenu: NSObject, NSWindowDelegate { }) } - @objc public func restartNginx() { + @objc func restartNginx() { self.waitAndExecute({ Actions.restartNginx() }) } - @objc public func restartDnsMasq() { + @objc func restartDnsMasq() { self.waitAndExecute({ Actions.restartDnsMasq() }) } - @objc public func toggleExtension(sender: ExtensionMenuItem) { + @objc func toggleExtension(sender: ExtensionMenuItem) { self.waitAndExecute({ // Toggle that extension print("Toggling extension '\(sender.phpExtension!.name)'") @@ -210,7 +210,7 @@ class MainMenu: NSObject, NSWindowDelegate { }) } - @objc public func openPhpInfo() { + @objc func openPhpInfo() { self.waitAndExecute({ try! " /tmp/phpmon_phpinfo.html") @@ -219,7 +219,7 @@ class MainMenu: NSObject, NSWindowDelegate { }) } - @objc public func forceRestartLatestPhp() { + @objc func forceRestartLatestPhp() { // Tell the user the switch is about to occur Alert.notify(message: "alert.force_reload.title".localized, info: "alert.force_reload.info".localized) // Start switching @@ -232,7 +232,7 @@ class MainMenu: NSObject, NSWindowDelegate { ) } - @objc public func openActiveConfigFolder() { + @objc func openActiveConfigFolder() { if (App.phpInstall!.version.error) { // php version was not identified Actions.openGenericPhpConfigFolder() @@ -243,11 +243,11 @@ class MainMenu: NSObject, NSWindowDelegate { Actions.openPhpConfigFolder(version: App.phpInstall!.version.short) } - @objc public func openValetConfigFolder() { + @objc func openValetConfigFolder() { Actions.openValetConfigFolder() } - @objc public func switchToPhpVersion(sender: PhpMenuItem) { + @objc func switchToPhpVersion(sender: PhpMenuItem) { print("Switching to: PHP \(sender.version)") self.setBusyImage() @@ -282,12 +282,12 @@ class MainMenu: NSObject, NSWindowDelegate { } } - @objc public func openAbout() { + @objc func openAbout() { NSApplication.shared.activate(ignoringOtherApps: true) NSApplication.shared.orderFrontStandardAboutPanel() } - @objc public func terminateApp() { + @objc func terminateApp() { NSApplication.shared.terminate(nil) } } diff --git a/phpmon/Domain/Singletons/Shell.swift b/phpmon/Domain/Singletons/Shell.swift index a71ce70..c6ed5c1 100644 --- a/phpmon/Domain/Singletons/Shell.swift +++ b/phpmon/Domain/Singletons/Shell.swift @@ -32,7 +32,7 @@ class Shell { - Parameter command: The command to run */ - public func run(_ command: String) { + func run(_ command: String) { // Equivalent of piping to /dev/null; don't do anything with the string _ = self.pipe(command) } @@ -43,7 +43,7 @@ class Shell { - Parameter command: The command to run - Parameter shell: Path to the shell to invoke */ - public func pipe(_ command: String, shell: String = "/bin/sh") -> String { + func pipe(_ command: String, shell: String = "/bin/sh") -> String { let task = Process() let pipe = Pipe()