🔀 Merge branch 'main' into dev/5.4

2025-11-09 13:10:24 +01:00 · 2022-05-13 17:04:07 +02:00
parent f679231ade c645bb7610
commit 12163bc87b
84 changed files with 792 additions and 130 deletions
--- a/phpmon/Common/Core/Actions.swift
+++ b/phpmon/Common/Core/Actions.swift
@@ -2,7 +2,7 @@
 //  Services.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/Core/Command.swift
+++ b/phpmon/Common/Core/Command.swift
@@ -2,7 +2,7 @@
 //  Command.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Cocoa
--- a/phpmon/Common/Core/Constants.swift
+++ b/phpmon/Common/Core/Constants.swift
@@ -2,7 +2,7 @@
 //  Constants.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Cocoa
@@ -56,13 +56,27 @@ struct Constants {
        static let DonationPayment = URL(
            string: "https://nicoverbruggen.be/sponsor#pay-now"
        )!
+
        static let DonationPage = URL(
            string: "https://nicoverbruggen.be/sponsor"
        )!
+
        static let FrequentlyAskedQuestions = URL(
            string: "https://github.com/nicoverbruggen/phpmon#%EF%B8%8F-faq--troubleshooting"
        )!

+        static let GitHubReleases = URL(
+            string: "https://github.com/nicoverbruggen/phpmon/releases"
+        )!
+
+        static let StableBuildCaskFile = URL(
+            string: "https://raw.githubusercontent.com/nicoverbruggen/homebrew-cask/master/Casks/phpmon.rb"
+        )!
+
+        static let DevBuildCaskFile = URL(
+            string: "https://raw.githubusercontent.com/nicoverbruggen/homebrew-cask/master/Casks/phpmon-dev.rb"
+        )!
+
    }

 }
--- a/phpmon/Common/Core/Helpers.swift
+++ b/phpmon/Common/Core/Helpers.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 24/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 // MARK: Common Shell Commands
--- a/phpmon/Common/Core/Logger.swift
+++ b/phpmon/Common/Core/Logger.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 21/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/Core/Paths.swift
+++ b/phpmon/Common/Core/Paths.swift
@@ -2,7 +2,7 @@
 //  Paths.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/Core/Shell.swift
+++ b/phpmon/Common/Core/Shell.swift
@@ -2,7 +2,7 @@
 //  Shell.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Cocoa
@@ -91,7 +91,7 @@ public class Shell {
        task.launch()
        task.waitUntilExit()

-        return Shell.Output(
+        let output = Shell.Output(
            standardOutput: String(
                data: outputPipe.fileHandleForReading.readDataToEndOfFile(),
                encoding: .utf8
@@ -102,6 +102,12 @@ public class Shell {
            )!,
            task: task
        )
+
+        if CommandLine.arguments.contains("--v") {
+            log(task: task, output: output)
+        }
+
+        return output
    }

    /**
@@ -119,6 +125,23 @@ public class Shell {
        return task
    }

+    /**
+     Verbose logging for PHP Monitor's synchronous shell output.
+     */
+    private func log(task: Process, output: Output) {
+        Log.info("")
+        Log.info("==== COMMAND ====")
+        Log.info("")
+        Log.info("\(self.shell) \(task.arguments?.joined(separator: " ") ?? "")")
+        Log.info("")
+        Log.info("==== OUTPUT ====")
+        Log.info("")
+        dump(output)
+        Log.info("")
+        Log.info("==== END OUTPUT ====")
+        Log.info("")
+    }
+
    public class Output {
        public let standardOutput: String
        public let errorOutput: String
--- a/phpmon/Common/Extensions/DateExtension.swift
+++ b/phpmon/Common/Extensions/DateExtension.swift
@@ -2,7 +2,7 @@
 //  Date.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Cocoa
--- a/phpmon/Common/Extensions/NSMenuExtension.swift
+++ b/phpmon/Common/Extensions/NSMenuExtension.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 14/04/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Cocoa
--- a/phpmon/Common/Extensions/StringExtension.swift
+++ b/phpmon/Common/Extensions/StringExtension.swift
@@ -2,7 +2,7 @@
 //  StringExtension.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 import Foundation

--- a/phpmon/Common/Extensions/XibLoadable.swift
+++ b/phpmon/Common/Extensions/XibLoadable.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 04/02/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/Helpers/Alert.swift
+++ b/phpmon/Common/Helpers/Alert.swift
@@ -2,7 +2,7 @@
 //  Alert.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Cocoa
--- a/phpmon/Common/Helpers/Application.swift
+++ b/phpmon/Common/Helpers/Application.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 07/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/Helpers/Filesystem.swift
+++ b/phpmon/Common/Helpers/Filesystem.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 07/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Cocoa
--- a/phpmon/Common/Helpers/LocalNotification.swift
+++ b/phpmon/Common/Helpers/LocalNotification.swift
@@ -2,7 +2,7 @@
 //  LocalNotification.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/Helpers/MenuBarImageGenerator.swift
+++ b/phpmon/Common/Helpers/MenuBarImageGenerator.swift
@@ -2,7 +2,7 @@
 //  ImageGenerator.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Cocoa
--- a/phpmon/Common/Helpers/PMWindowController.swift
+++ b/phpmon/Common/Helpers/PMWindowController.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 05/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Cocoa
--- a/phpmon/Common/Helpers/VersionExtractor.swift
+++ b/phpmon/Common/Helpers/VersionExtractor.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 16/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/PHP/ActivePhpInstallation.swift
+++ b/phpmon/Common/PHP/ActivePhpInstallation.swift
@@ -2,7 +2,7 @@
 //  ActivePhpInstallation.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/PHP/Homebrew/HomebrewPackage.swift
+++ b/phpmon/Common/PHP/Homebrew/HomebrewPackage.swift
@@ -2,7 +2,7 @@
 //  HomebrewPackage.swift
 //  PHP Monitor
 //
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/PHP/PHP
+++ b/phpmon/Common/PHP/PHP
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 21/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/PHP/PhpExtension.swift
+++ b/phpmon/Common/PHP/PhpExtension.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 31/01/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/PHP/PhpInstallation.swift
+++ b/phpmon/Common/PHP/PhpInstallation.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 28/11/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/PHP/Switcher/InternalSwitcher.swift
+++ b/phpmon/Common/PHP/Switcher/InternalSwitcher.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 24/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation
--- a/phpmon/Common/PHP/Switcher/PhpSwitcher.swift
+++ b/phpmon/Common/PHP/Switcher/PhpSwitcher.swift
@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 24/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //

 import Foundation