From bf0a923eb24648df39215a85aad7b3cf6690d15d Mon Sep 17 00:00:00 2001 From: Tadhg Boyle Date: Tue, 4 Jan 2022 11:40:17 -0700 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=91=8C=20Add=20more=20detail=20to=20f?= =?UTF-8?q?ull=20PHP=20version=20setting=20name=20(#78)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings index dc11bb0..8c6cbf8 100644 --- a/phpmon/Localizable.strings +++ b/phpmon/Localizable.strings @@ -100,7 +100,7 @@ "prefs.dynamic_icon_title" = "Display dynamic icon in menu bar"; "prefs.dynamic_icon_desc" = "If you uncheck this box, the truck icon will always be visible.\nIf checked, it will display the major version number of the\ncurrently linked PHP version."; -"prefs.display_full_php_version" = "Display full PHP version in menu bar"; +"prefs.display_full_php_version" = "Display full PHP version in menu bar and dropdown"; "prefs.display_full_php_version_desc" = "Display the full version instead of the major version only.\n(This may be undesirable on smaller displays,\nso this is disabled by default.)"; "prefs.use_internal_switcher" = "Use PHP Monitor’s own version switcher"; From 38c2d9131b2f4b437f310432c93a91fd5f86503b Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Tue, 4 Jan 2022 20:49:44 +0100 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=93=9D=20PR=20template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/pull_request_template.md | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..85293b0 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,35 @@ +Hello there! Thank you for considering a pull request for PHP Monitor. + +Please read the text below first before you submit your PR. + +## Do not PR unless... + +In order to make development and maintenance of PHP Monitor easier, I ask that you _avoid_ making a pull request in the following situations: + +* No issue has been associated with the changes you‘d like to merge +* You have not announced you will be addressing a particular issue +* The PR is a low effort change: e.g. commits that only fix typos or phrasing may not be accepted + +(If you believe the phrasing of particular text in the app is unclear or incorrect, please open an issue first.) + +In short: It is usually best to *get in touch first* if you are making substantial changes. + +## About destination branches + +Please keep in mind that `main` is reserved for the current code state of the latest release and should *never* be the destination branch unless a new release is happening. **Merge requests that target `main` will be closed without mercy.** + +Usually, the best target is the stable `dev/x.x` branch that corresponds with the latest major version that is released. + +There may be a newer branch available, which is an appropriate place for bigger changes, but please keep in mind that it is usually best to announce you‘ll be working on such a change before you spend the time, since as the lead contributor I might not even want said change in the app. Thank you. + +## Your changes + +(feel free to remove the disclaimer above) + +* Affected parts of the app: shared code / UI code / CLI (remove what does not apply) +* Estimated impact on performance: none / low / high (remove what does not apply) +* Made a new build with Xcode and tested this: yes / no (remove what does not apply) +* Tested on macOS version + architecture: (e.g. "Monterey on M1" or "Big Sur on Intel") +* References issue(s): (please reference the issue here, using # and the number of the issue) + +(please describe what you have changed here) \ No newline at end of file From 1e15042be25b6b487f5b33e886cb35bf64c3b552 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Thu, 27 Jan 2022 00:34:54 +0100 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=90=9B=20Start=20a=20"clean"=20termin?= =?UTF-8?q?al=20every=20time=20(#99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Backported for the stable build.) --- PHP Monitor.xcodeproj/project.pbxproj | 8 ++++---- phpmon/Domain/Terminal/Shell.swift | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 1fbac95..a696129 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -831,7 +831,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 137; + CURRENT_PROJECT_VERSION = 140; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; @@ -840,7 +840,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1.2; + MARKETING_VERSION = 4.1.3; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -856,7 +856,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 137; + CURRENT_PROJECT_VERSION = 140; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = phpmon/Info.plist; @@ -865,7 +865,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1.2; + MARKETING_VERSION = 4.1.3; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/phpmon/Domain/Terminal/Shell.swift b/phpmon/Domain/Terminal/Shell.swift index 1c22259..9cc958a 100644 --- a/phpmon/Domain/Terminal/Shell.swift +++ b/phpmon/Domain/Terminal/Shell.swift @@ -91,7 +91,7 @@ class Shell { : command task.launchPath = self.shell - task.arguments = ["--login", "-c", tailoredCommand] + task.arguments = ["--noprofile", "-norc", "--login", "-c", tailoredCommand] task.standardOutput = outputPipe task.standardError = errorPipe task.launch() From c9ba8725296594afd4cd29f31e64608c7eadf556 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Thu, 27 Jan 2022 00:43:08 +0100 Subject: [PATCH 4/5] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Fix=20laggy=20scrollin?= =?UTF-8?q?g=20and=20search?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Partial backport for the stable build.) --- PHP Monitor.xcodeproj/project.pbxproj | 4 ++-- phpmon/Domain/Terminal/Paths.swift | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index a696129..0e779d5 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -840,7 +840,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1.3; + MARKETING_VERSION = 4.2.0; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -865,7 +865,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 4.1.3; + MARKETING_VERSION = 4.2.0; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/phpmon/Domain/Terminal/Paths.swift b/phpmon/Domain/Terminal/Paths.swift index 9dd66b9..efdeb6e 100644 --- a/phpmon/Domain/Terminal/Paths.swift +++ b/phpmon/Domain/Terminal/Paths.swift @@ -16,6 +16,7 @@ class Paths { static let shared = Paths() var baseDir : HomebrewDir + var userName = String(Shell.pipe("whoami").split(separator: "\n")[0]) init() { let optBrewFound = Shell.fileExists("\(HomebrewDir.opt.rawValue)/bin/brew") @@ -56,7 +57,7 @@ class Paths { // - MARK: Paths public static var whoami: String { - return String(Shell.pipe("whoami").split(separator: "\n")[0]) + return shared.userName } public static var binPath: String { From ef469868d8f7bd7110ac8dda4a639fbdfbc38ea9 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Thu, 27 Jan 2022 00:44:36 +0100 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=93=9D=20Update=20README=20(no=20more?= =?UTF-8?q?=20Valet=20switcher=20in=205.0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 0eb15be..5126846 100644 --- a/README.md +++ b/README.md @@ -251,9 +251,7 @@ To see which files are checked to determine availability, see [this file](./phpm
After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade` or `brew cleanup`! -This is a security feature of Homebrew. When you start a service as an administrator, the root user becomes the owner of relevant binaries. You will need to manually clean up those folders yourself using `rm -rf` (or by manually removing those folders via Finder). - -**Update**: If you are using the Valet switcher (currently not available in the latest stable build) you will not encounter this issue. For more information on this, see [this issue](https://github.com/nicoverbruggen/phpmon/issues/17) and also [this issue about switching to Valet's switcher](https://github.com/nicoverbruggen/phpmon/issues/34). +This is a security feature of Homebrew. When you start a service as an administrator, the root user becomes the owner of relevant binaries. You will need to manually clean up those folders yourself using `rm -rf` (or by manually removing those folders via Finder).