From 0ad6e5cb1cfd7b57bc1e0d607c8c63f2a863a0e3 Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Fri, 19 Mar 2021 15:44:26 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Multiple=20trailing=20closures?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 phpmon/Domain/Menu/MainMenu.swift | 36 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/phpmon/Domain/Menu/MainMenu.swift b/phpmon/Domain/Menu/MainMenu.swift
index 4df918d..5a4fbe4 100644
--- a/phpmon/Domain/Menu/MainMenu.swift
+++ b/phpmon/Domain/Menu/MainMenu.swift
@@ -136,7 +136,7 @@ class MainMenu: NSObject, NSWindowDelegate {
      - Parameter execute: Callback of the work that needs to happen.
      - Parameter completion: Callback that is fired when the work is done.
      */
-    private func waitAndExecute(_ execute: @escaping () -> Void, _ completion: @escaping () -> Void = {})
+    private func waitAndExecute(_ execute: @escaping () -> Void, completion: @escaping () -> Void = {})
     {
         App.shared.busy = true
         self.setBusyImage()
@@ -183,53 +183,51 @@ class MainMenu: NSObject, NSWindowDelegate {
     }
     
     @objc func restartAllServices() {
-        self.waitAndExecute({
+        self.waitAndExecute {
             Actions.restartDnsMasq()
             Actions.restartPhpFpm()
             Actions.restartNginx()
-        })
+        }
     }
     
     @objc func restartNginx() {
-        self.waitAndExecute({
+        self.waitAndExecute {
             Actions.restartNginx()
-        })
+        }
     }
     
     @objc func restartDnsMasq() {
-        self.waitAndExecute({
+        self.waitAndExecute {
             Actions.restartDnsMasq()
-        })
+        }
     }
     
     @objc func toggleExtension(sender: ExtensionMenuItem) {
-        self.waitAndExecute({
+        self.waitAndExecute {
             // Toggle that extension
             print("Toggling extension '\(sender.phpExtension!.name)'")
             sender.phpExtension?.toggle()
-        })
+        }
     }
     
     @objc func openPhpInfo() {
-        self.waitAndExecute({
+        self.waitAndExecute {
             try! "<?php phpinfo();".write(toFile: "/tmp/phpmon_phpinfo.php", atomically: true, encoding: .utf8)
             Shell.run("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
-        }, {
+        } completion: {
             NSWorkspace.shared.open(URL(string: "file:///private/tmp/phpmon_phpinfo.html")!)
-        })
+        }
     }
     
     @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
-        self.waitAndExecute(
-            { Actions.fixMyPhp() },
-            { Alert.notify(
-                message: "alert.force_reload_done.title".localized,
-                info: "alert.force_reload_done.info".localized
-            ) }
-        )
+        self.waitAndExecute {
+            Actions.fixMyPhp()
+        } completion: {
+            Alert.notify(message: "alert.force_reload_done.title".localized, info: "alert.force_reload_done.info".localized)
+        }
     }
     
     @objc func openActiveConfigFolder() {