From fbe791902ced6bd311c00efc643cd00e2d39878e Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Fri, 29 Jan 2021 20:08:27 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Update=20copyright,=20minor=20br?= =?UTF-8?q?acket=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 4 ---- phpmon/AppDelegate.swift | 3 +-- phpmon/Classes/Commands/Actions.swift | 3 +-- phpmon/Classes/Commands/Startup.swift | 3 +-- phpmon/Classes/Core/HomebrewPackage.swift | 3 +-- phpmon/Classes/Core/PhpInstall.swift | 5 ++--- phpmon/Classes/Helpers/Alert.swift | 5 +++-- phpmon/Classes/Helpers/LocalNotification.swift | 8 ++++---- .../Classes/Helpers/MenuBarImageGenerator.swift | 3 +-- phpmon/Classes/Menu/PhpMenuItem.swift | 15 --------------- phpmon/Classes/Menu/StatusMenu.swift | 9 +++++---- phpmon/Constants.swift | 3 +-- phpmon/Extensions/DateExtension.swift | 3 +-- phpmon/Extensions/StringExtension.swift | 4 +--- phpmon/Singletons/App.swift | 4 +--- phpmon/Singletons/Command.swift | 3 +-- phpmon/Singletons/MainMenu.swift | 3 +-- phpmon/Singletons/Paths.swift | 1 - phpmon/Singletons/Shell.swift | 3 +-- 19 files changed, 26 insertions(+), 59 deletions(-) delete mode 100644 phpmon/Classes/Menu/PhpMenuItem.swift diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 88f8f8b..b0a4c01 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ C476FF9822B0DD830098105B /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = C476FF9722B0DD830098105B /* Alert.swift */; }; C4811D2422D70A4700B5F6B3 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4811D2322D70A4700B5F6B3 /* App.swift */; }; C4811D2A22D70F9A00B5F6B3 /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */; }; - C486EFFC2586931100A02B2C /* PhpMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C486EFFB2586931100A02B2C /* PhpMenuItem.swift */; }; C49EAB46259FC305007F6C3B /* Paths.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EAB45259FC305007F6C3B /* Paths.swift */; }; C4D8016622B1584700C6DA1B /* Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D8016522B1584700C6DA1B /* Startup.swift */; }; C4EE188422D3386B00E126E5 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE188322D3386B00E126E5 /* Constants.swift */; }; @@ -54,7 +53,6 @@ C476FF9722B0DD830098105B /* Alert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alert.swift; sourceTree = ""; }; C4811D2322D70A4700B5F6B3 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = ""; }; C4811D2922D70F9A00B5F6B3 /* MainMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenu.swift; sourceTree = ""; }; - C486EFFB2586931100A02B2C /* PhpMenuItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpMenuItem.swift; sourceTree = ""; }; C49EAB45259FC305007F6C3B /* Paths.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Paths.swift; sourceTree = ""; }; C4D8016522B1584700C6DA1B /* Startup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Startup.swift; sourceTree = ""; }; C4E713562570150F00007428 /* SECURITY.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = SECURITY.md; sourceTree = ""; }; @@ -144,7 +142,6 @@ isa = PBXGroup; children = ( C47331A1247093B7009A0597 /* StatusMenu.swift */, - C486EFFB2586931100A02B2C /* PhpMenuItem.swift */, ); path = Menu; sourceTree = ""; @@ -282,7 +279,6 @@ C412E5FC25700D5300A1FB67 /* HomebrewPackage.swift in Sources */, C41C1B3722B0097F00E7CF16 /* AppDelegate.swift in Sources */, C41C1B4B22B019FF00E7CF16 /* PhpInstall.swift in Sources */, - C486EFFC2586931100A02B2C /* PhpMenuItem.swift in Sources */, C49EAB46259FC305007F6C3B /* Paths.swift in Sources */, C476FF9822B0DD830098105B /* Alert.swift in Sources */, C474B00624C0E98C00066A22 /* LocalNotification.swift in Sources */, diff --git a/phpmon/AppDelegate.swift b/phpmon/AppDelegate.swift index 107ce8a..34d6651 100644 --- a/phpmon/AppDelegate.swift +++ b/phpmon/AppDelegate.swift @@ -2,8 +2,7 @@ // AppDelegate.swift // PHP Monitor // -// Created by Nico Verbruggen on 11/06/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Cocoa diff --git a/phpmon/Classes/Commands/Actions.swift b/phpmon/Classes/Commands/Actions.swift index 821b574..7be5218 100644 --- a/phpmon/Classes/Commands/Actions.swift +++ b/phpmon/Classes/Commands/Actions.swift @@ -2,8 +2,7 @@ // Services.swift // PHP Monitor // -// Created by Nico Verbruggen on 11/06/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Foundation diff --git a/phpmon/Classes/Commands/Startup.swift b/phpmon/Classes/Commands/Startup.swift index 96fa922..c556c6a 100644 --- a/phpmon/Classes/Commands/Startup.swift +++ b/phpmon/Classes/Commands/Startup.swift @@ -2,8 +2,7 @@ // Environment.swift // PHP Monitor // -// Created by Nico Verbruggen on 12/06/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Foundation diff --git a/phpmon/Classes/Core/HomebrewPackage.swift b/phpmon/Classes/Core/HomebrewPackage.swift index 4f662fd..8eb6210 100644 --- a/phpmon/Classes/Core/HomebrewPackage.swift +++ b/phpmon/Classes/Core/HomebrewPackage.swift @@ -2,8 +2,7 @@ // HomebrewPackage.swift // PHP Monitor // -// Created by Nico Verbruggen on 26/11/2020. -// Copyright © 2020 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Foundation diff --git a/phpmon/Classes/Core/PhpInstall.swift b/phpmon/Classes/Core/PhpInstall.swift index 87ee525..2e0b060 100644 --- a/phpmon/Classes/Core/PhpInstall.swift +++ b/phpmon/Classes/Core/PhpInstall.swift @@ -1,9 +1,8 @@ // -// PhpVersionExtractor.swift +// PhpInstall.swift // PHP Monitor // -// Created by Nico Verbruggen on 11/06/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Foundation diff --git a/phpmon/Classes/Helpers/Alert.swift b/phpmon/Classes/Helpers/Alert.swift index 5725961..78433cf 100644 --- a/phpmon/Classes/Helpers/Alert.swift +++ b/phpmon/Classes/Helpers/Alert.swift @@ -2,13 +2,13 @@ // Alert.swift // PHP Monitor // -// Created by Nico Verbruggen on 12/06/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Cocoa class Alert { + public static func present( messageText: String, informativeText: String, @@ -28,4 +28,5 @@ class Alert { public static func notify(message: String, info: String) { _ = self.present(messageText: message, informativeText: info, buttonTitle: "OK", secondButtonTitle: "") } + } diff --git a/phpmon/Classes/Helpers/LocalNotification.swift b/phpmon/Classes/Helpers/LocalNotification.swift index c4dfbf2..c279840 100644 --- a/phpmon/Classes/Helpers/LocalNotification.swift +++ b/phpmon/Classes/Helpers/LocalNotification.swift @@ -2,18 +2,18 @@ // LocalNotification.swift // PHP Monitor // -// Created by Nico Verbruggen on 16/07/2020. -// Copyright © 2020 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Foundation class LocalNotification { - public static func send(title: String, subtitle: String) - { + + public static func send(title: String, subtitle: String) { let notification = NSUserNotification() notification.title = title notification.subtitle = subtitle NSUserNotificationCenter.default.deliver(notification) } + } diff --git a/phpmon/Classes/Helpers/MenuBarImageGenerator.swift b/phpmon/Classes/Helpers/MenuBarImageGenerator.swift index 795f2d9..814d6d8 100644 --- a/phpmon/Classes/Helpers/MenuBarImageGenerator.swift +++ b/phpmon/Classes/Helpers/MenuBarImageGenerator.swift @@ -2,8 +2,7 @@ // ImageGenerator.swift // PHP Monitor // -// Created by Nico Verbruggen on 11/06/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Cocoa diff --git a/phpmon/Classes/Menu/PhpMenuItem.swift b/phpmon/Classes/Menu/PhpMenuItem.swift deleted file mode 100644 index 6c21d0e..0000000 --- a/phpmon/Classes/Menu/PhpMenuItem.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// PhpMenuItem.swift -// PHP Monitor -// -// Created by Nico Verbruggen on 13/12/2020. -// Copyright © 2020 Nico Verbruggen. All rights reserved. -// - -import Cocoa - -class PhpMenuItem: NSMenuItem { - - var version: String = "" - -} diff --git a/phpmon/Classes/Menu/StatusMenu.swift b/phpmon/Classes/Menu/StatusMenu.swift index 329fc63..32d6fb6 100644 --- a/phpmon/Classes/Menu/StatusMenu.swift +++ b/phpmon/Classes/Menu/StatusMenu.swift @@ -2,14 +2,16 @@ // MainMenuBuilder.swift // PHP Monitor // -// Created by Nico Verbruggen on 16/05/2020. -// Copyright © 2020 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Cocoa +class PhpMenuItem: NSMenuItem { + var version: String = "" +} + class StatusMenu : NSMenu { - public func addPhpVersionMenuItems() { if (App.shared.currentInstall == nil) { @@ -99,5 +101,4 @@ class StatusMenu : NSMenu { self.addItem(menuItem) } - } diff --git a/phpmon/Constants.swift b/phpmon/Constants.swift index 4fd7845..af6a6c5 100644 --- a/phpmon/Constants.swift +++ b/phpmon/Constants.swift @@ -2,8 +2,7 @@ // Constants.swift // PHP Monitor // -// Created by Nico Verbruggen on 08/07/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Cocoa diff --git a/phpmon/Extensions/DateExtension.swift b/phpmon/Extensions/DateExtension.swift index 10279b5..72c3b61 100644 --- a/phpmon/Extensions/DateExtension.swift +++ b/phpmon/Extensions/DateExtension.swift @@ -2,8 +2,7 @@ // Date.swift // PHP Monitor // -// Created by Nico Verbruggen on 09/07/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Cocoa diff --git a/phpmon/Extensions/StringExtension.swift b/phpmon/Extensions/StringExtension.swift index 35c049e..8ca2b54 100644 --- a/phpmon/Extensions/StringExtension.swift +++ b/phpmon/Extensions/StringExtension.swift @@ -2,10 +2,8 @@ // StringExtension.swift // PHP Monitor // -// Created by Nico Verbruggen on 13/05/2020. -// Copyright © 2020 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // - import Foundation extension String { diff --git a/phpmon/Singletons/App.swift b/phpmon/Singletons/App.swift index 94c8b67..d89a43d 100644 --- a/phpmon/Singletons/App.swift +++ b/phpmon/Singletons/App.swift @@ -2,10 +2,8 @@ // StateManager.swift // PHP Monitor // -// Created by Nico Verbruggen on 11/07/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // - import Cocoa class App { diff --git a/phpmon/Singletons/Command.swift b/phpmon/Singletons/Command.swift index f9df908..a09cb09 100644 --- a/phpmon/Singletons/Command.swift +++ b/phpmon/Singletons/Command.swift @@ -2,8 +2,7 @@ // Command.swift // PHP Monitor // -// Created by Nico Verbruggen on 17/10/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Cocoa diff --git a/phpmon/Singletons/MainMenu.swift b/phpmon/Singletons/MainMenu.swift index 9dd684e..4823673 100644 --- a/phpmon/Singletons/MainMenu.swift +++ b/phpmon/Singletons/MainMenu.swift @@ -2,8 +2,7 @@ // MainMenu.swift // PHP Monitor // -// Created by Nico Verbruggen on 11/07/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Cocoa diff --git a/phpmon/Singletons/Paths.swift b/phpmon/Singletons/Paths.swift index ee3295b..9adde20 100644 --- a/phpmon/Singletons/Paths.swift +++ b/phpmon/Singletons/Paths.swift @@ -2,7 +2,6 @@ // Paths.swift // PHP Monitor // -// Created by Nico Verbruggen on 01/01/2021. // Copyright © 2021 Nico Verbruggen. All rights reserved. // diff --git a/phpmon/Singletons/Shell.swift b/phpmon/Singletons/Shell.swift index 81506ca..bca6bf2 100644 --- a/phpmon/Singletons/Shell.swift +++ b/phpmon/Singletons/Shell.swift @@ -2,8 +2,7 @@ // Shell.swift // PHP Monitor // -// Created by Nico Verbruggen on 11/06/2019. -// Copyright © 2019 Nico Verbruggen. All rights reserved. +// Copyright © 2021 Nico Verbruggen. All rights reserved. // import Cocoa