From 0e3c9a5a68cb7c4f5b406744d4103de38933416c Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Fri, 24 Mar 2023 00:21:45 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20new=20target,=20did=20some?= =?UTF-8?q?=20testing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 12 +++++++++--- ... Monitor EA.xcscheme => PHP Monitor EAP.xcscheme} | 0 phpmon/Credits.html | 4 ++-- phpmon/Domain/Menu/MainMenu+Switcher.swift | 11 +++++++++-- 4 files changed, 20 insertions(+), 7 deletions(-) rename PHP Monitor.xcodeproj/xcshareddata/xcschemes/{PHP Monitor EA.xcscheme => PHP Monitor EAP.xcscheme} (100%) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 70d49d6..2bc7b87 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -3304,6 +3304,7 @@ DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "PHP Monitor"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -3333,6 +3334,7 @@ DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "PHP Monitor"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -3560,6 +3562,7 @@ DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "PHP Monitor DEV"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -3670,6 +3673,7 @@ DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "PHP Monitor DEV"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -3678,7 +3682,7 @@ MACOSX_DEPLOYMENT_TARGET = 12.4; MARKETING_VERSION = 6.0; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "$(TARGET_NAME) DEV"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -3780,6 +3784,7 @@ DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "PHP Monitor EAP"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -3788,7 +3793,7 @@ MACOSX_DEPLOYMENT_TARGET = 12.4; MARKETING_VERSION = 6.0; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "$(TARGET_NAME) EAP"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -3952,6 +3957,7 @@ DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "PHP Monitor EAP"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -3960,7 +3966,7 @@ MACOSX_DEPLOYMENT_TARGET = 12.4; MARKETING_VERSION = 6.0; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap; - PRODUCT_NAME = "$(TARGET_NAME) DEV"; + PRODUCT_NAME = "$(TARGET_NAME) EAP"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; diff --git a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor EA.xcscheme b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor EAP.xcscheme similarity index 100% rename from PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor EA.xcscheme rename to PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor EAP.xcscheme diff --git a/phpmon/Credits.html b/phpmon/Credits.html index 078adb3..4eba565 100644 --- a/phpmon/Credits.html +++ b/phpmon/Credits.html @@ -13,10 +13,10 @@
-

Do you enjoy using the app? Leave a star on GitHub!

+

Do you enjoy using the app? Is it helping you save time? Leave a star on GitHub!

Having issues? Consult the FAQ section, I did my best to ensure everything is documented.

Want to support further development of PHP Monitor? You can financially support the continued development of this app.

-

Get the latest on Mastodon. Give me a follow on Mastodon to learn about what's brewing and when new updates drop.

+

Get the latest on Twitter or Mastodon. Give me a follow on Twitter or Mastodon to learn about what's brewing and when new updates drop.


diff --git a/phpmon/Domain/Menu/MainMenu+Switcher.swift b/phpmon/Domain/Menu/MainMenu+Switcher.swift index 087e0cc..c4485b5 100644 --- a/phpmon/Domain/Menu/MainMenu+Switcher.swift +++ b/phpmon/Domain/Menu/MainMenu+Switcher.swift @@ -120,11 +120,18 @@ extension MainMenu { preference: .notifyAboutVersionChange ) - guard let install = PhpEnv.phpInstall else { + guard PhpEnv.phpInstall != nil else { Log.err("Cannot notify about version change if PHP is unlinked") return } - Task { await Valet.shared.notifyAboutBrokenPhpFpm() } + guard Valet.installed == true else { + Log.info("Skipping check for broken PHP-FPM version, Valet is not installed") + return + } + + Task { + await Valet.shared.notifyAboutBrokenPhpFpm() + } } }