🔀 Merge branch 'dev/4.x'

(Partial backport for the stable build.)

.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)

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 = 136;
+				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.1;
+				MARKETING_VERSION = 4.2.0;
 				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 = 136;
+				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.1;
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

README.md

@@ -111,9 +111,15 @@ If you're on an Apple Silicon-based Mac, you'll need to add:
     # on an M1 Mac
     export PATH=$HOME/bin:/opt/homebrew/bin:$PATH
 
-and add the following to your .zshrc:
+and add the following to your .zshrc, but add this BEFORE the homebrew PATH additions:
 
     export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH
+    
+If you're adding composer and Homebrew binaries, ensure that Homebrew binaries are preferred by adding these to the path last. On my system, that looks like this:
+
+    export PATH=$HOME/bin:/usr/local/bin:$PATH
+    export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH
+    export PATH=$HOME/bin:/opt/homebrew/bin:$PATH
 
 Make sure PHP is linked correctly:
 
@@ -245,9 +251,7 @@ To see which files are checked to determine availability, see [this file](./phpm
 <details>
 <summary><strong>After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade` or `brew cleanup`!</strong></summary>
 
-<strike>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).</strike>
-
-**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).
 
 </details>
 

phpmon/Domain/Core/Startup.swift

@@ -59,7 +59,6 @@ class Startup {
             // Check for Valet; it can be symlinked or in .composer/vendor/bin
             !(Shell.pipe("cat /private/etc/sudoers.d/valet").contains("/usr/local/bin/valet")
                 || Shell.pipe("cat /private/etc/sudoers.d/valet").contains("/opt/homebrew/bin/valet")
-                || Shell.pipe("cat /private/etc/sudoers.d/valet").contains(".composer/vendor/bin/valet")
             ),
             messageText:        "startup.errors.sudoers_valet.title".localized,
             informativeText:    "startup.errors.sudoers_valet.desc".localized,

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")
@@ -38,7 +39,7 @@ class Paths {
     // - MARK: Binaries
     
     public static var valet: String {
-        return "/Users/\(whoami)/.composer/vendor/bin/valet"
+        return "\(binPath)/valet"
     }
     
     public static var brew: String {
@@ -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 {

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()

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";
@@ -182,7 +182,7 @@ You can do this by running `composer global update` in your terminal. After that
 
 /// 5. Valet & sudoers
 "startup.errors.sudoers_valet.title" = "Valet has not been added to sudoers.d";
-"startup.errors.sudoers_valet.desc" = "You must run `sudo valet trust` to ensure Valet can start and stop services without having to use sudo every time. The app will not work correctly until you resolve this issue.";
+"startup.errors.sudoers_valet.desc" = "You must run `sudo valet trust` to ensure Valet can start and stop services without having to use sudo every time. The app will not work correctly until you resolve this issue. If you did this before, please run `sudo valet trust` again.";
 
 /// 6. Multiple services active
 "startup.errors.services.title" = "Multiple PHP services are active";