🔀 Merge branch 'develop'

* develop:
  ✨ Add option to restart nginx, open valet config
  ✨ Allow restarting of PHP-FPM
  📝 Update copyright message

Author: nicoverbruggen

PHP Monitor.xcodeproj/project.pbxproj

@@ -365,14 +365,14 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				INFOPLIST_FILE = phpmon/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -387,14 +387,14 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				INFOPLIST_FILE = phpmon/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

README.md

@@ -1,26 +1,20 @@
 # PHP Monitor
 
-PHP Monitor (or phpmon) is a macOS utility that runs on your Mac and displays the active PHP version in your status bar. 
+PHP Monitor (or phpmon) is a macOS utility that runs on your Mac and displays the active PHP version in your status bar. It also gives you quick access to various useful functionality (like switching PHP versions, restarting services, accessing configuration files, and more).
 
 <img src="./docs/screenshot.png" width="278px" alt="phpmon screenshot"/>
 
 For me, it comes in handy when running multiple versions of PHP with Homebrew and you wish to be able to see at a glance which version is currently linked & active with Laravel Valet, and switch between versions.
 
 ## System requirements
 
-**Minimal system requirements**
-
-* macOS 10.14 or higher
-* PHP 7.4 installed via Homebrew
-* Laravel Valet 2.3 or higher installed
-
-**Recommended system**
-
 * macOS 10.15 Catalina
-* PHP 7.4 installed with Homebrew 2.2
+* PHP 7.4 installed with Homebrew 2.x
     - other versions of PHP are optional
     - includes support for PHP 5.6 and PHP 7.0 [as well](https://github.com/eXolnet/homebrew-deprecated)
-* Laravel Valet 2.5.x installed
+* Laravel Valet 2.8
+
+If you're looking to run PHP Monitor in combination with an older version of macOS or Laravel Valet, please check out the older releases of the software.
 
 ## Why I built this
 
@@ -48,8 +42,9 @@ The utility runs the following commands:
 
 - Unlink all detected PHP versions
 - Switch to PHP 7.4 (this is done in order to ensure that Valet works, even when attempting to use PHP 5.6)
-- Tell Valet to switch to a specific PHP version
+- Stop all php-fpm service instances
 - Link the desired version of PHP
+- Start the correct php-fpm service for the desired PHP version
 
 ### Want to know more?
 
@@ -59,6 +54,8 @@ This app isn't very complicated after all. In the end, this just (conveniently)
 
 ## Troubleshooting
 
+---
+
 ### Reasons for alerts at startup
 
 PHP Monitor performs some integrity checks to ensure a good experience when using the app. You'll get a message telling you that PHP Monitor won't work correctly in the following scenarios:
@@ -71,12 +68,48 @@ PHP Monitor performs some integrity checks to ensure a good experience when usin
 
 Follow instructions as specified in the alert in order to resolve any issues.
 
-### Still seeing another PHP version (from before switching versions)?
+---
+
+### Laravel Valet is using a different version of PHP than what is active in PHP Monitor and in my terminal!
+
+If you're still seeing another version of PHP in your scripts — e.g. when running `phpinfo()` — I recommend you shut down all PHP services that are currently active. You can find out what services are active by running:
+
+    sudo brew services list | grep php
+
+This will present to you a list of services, like so (depending on the installed versions of PHP):
 
-If you're still seeing an old version of PHP in your scripts — e.g. when running `phpinfo()` — I recommend you shut down the PHP service by running: 
+```
+php           started root /Library/LaunchDaemons/homebrew.mxcl.php.plist
+[email protected]       stopped
+[email protected]       stopped
+[email protected]       stopped
+[email protected]       stopped
+[email protected]       stopped
+```
+
+You'll want to make sure that **only one service is running** and that it is running **as `root`**. You can terminate a service by running:
+
+    sudo brew services stop {service_name}
+
+So in order to disable PHP 7.3, you'd need to run:
+
+    sudo brew services stop [email protected]
+
+If you notice that PHP FPM is running as your own user account, you can turn off the service by running:
+
+    brew services stop [email protected]
+
+The easiest way to make sure that PHP Monitor works again is to run the following commands:
 
     sudo brew services stop php
+    sudo brew services stop [email protected]
+    sudo brew services stop [email protected]
+    sudo brew services stop [email protected]
+    sudo brew services stop [email protected]
+    sudo brew services stop [email protected]
+
+Then, in PHP Monitor, select "Restart php-fpm service", which should start the service. Alternatively, you can run `sudo brew services start php@{x}` where `{x}` is your preferred version of PHP (for the latest version of PHP, you can omit `@{x}`).
 
-Please note that PHP Monitor will not be able to stop this service (it doesn't run as an administrator), so you'll need to handle this yourself.
+---
 
-You should only have to do this **once**, and then PHP Monitor should work as usual. 
+If this software has been useful to you, star the repository so I know that the software is being used. I did not include any tracking or analytics software, so if you encounter issues, let me know via an issue.

docs/screenshot.png

@@ -26,6 +26,20 @@ class Actions {
         return versionsOnly
     }
 
+    public static func restartPhpFpm() {
+        let version = App.shared.currentVersion!.short
+        if (version == Constants.LatestPhpVersion) {
+            Shell.user.run("sudo brew services restart php")
+        } else {
+            Shell.user.run("sudo brew services restart php@\(version)")
+        }
+    }
+    
+    public static func restartNginx()
+    {
+        Shell.user.run("sudo brew services restart nginx")
+    }
+    
     public static func switchToPhpVersion(version: String, availableVersions: [String]) {
         availableVersions.forEach { (version) in
             // Unlink the current version
@@ -56,6 +70,11 @@ class Actions {
         NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
     }
 
+    public static func openValetConfigFolder() {
+        let files = [NSURL(fileURLWithPath: NSString(string: "~/.config/valet").expandingTildeInPath)];
+        NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
+    }
+    
     public static func XdebugFound(_ version: String) -> Bool {
         let command = """
         grep -q 'zend_extension="xdebug.so"' /usr/local/etc/php/\(version)/php.ini; [ $? -eq 0 ] && echo "YES" || echo "NO"

phpmon/Classes/Commands/Actions.swift

@@ -27,7 +27,7 @@
 	<key>LSUIElement</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2019 Nico Verbruggen. All rights reserved.</string>
+	<string>Copyright © 2020 Nico Verbruggen. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

phpmon/Info.plist

@@ -57,13 +57,21 @@ class MainMenu: NSObject, NSWindowDelegate {
                     menu.addItem(menuItem)
                 }
                 menu.addItem(NSMenuItem.separator())
+                menu.addItem(NSMenuItem(title: "Active Services", action: nil, keyEquivalent: ""))
+                menu.addItem(NSMenuItem(title: "Restart php-fpm service", action: #selector(self.restartPhpFpm), keyEquivalent: "f"))
+                menu.addItem(NSMenuItem(title: "Restart nginx service", action: #selector(self.restartNginx), keyEquivalent: "n"))
+                menu.addItem(NSMenuItem.separator())
             }
             if (App.shared.busy) {
-                menu.addItem(NSMenuItem(title: "Switching PHP versions...", action: nil, keyEquivalent: ""))
+                menu.addItem(NSMenuItem(title: "PHP Monitor is busy...", action: nil, keyEquivalent: ""))
                 menu.addItem(NSMenuItem.separator())
             }
             if (App.shared.currentVersion != nil) {
+                menu.addItem(NSMenuItem(title: "Configuration", action: nil, keyEquivalent: ""))
+                menu.addItem(NSMenuItem(title: "Valet configuration (.config/valet)", action: #selector(self.openValetConfigFolder), keyEquivalent: "v"))
                 menu.addItem(NSMenuItem(title: "PHP configuration file (php.ini)", action: #selector(self.openActiveConfigFolder), keyEquivalent: "c"))
+                menu.addItem(NSMenuItem.separator())
+                menu.addItem(NSMenuItem(title: "Enabled Extensions", action: nil, keyEquivalent: ""))
                 let xdebugFound = App.shared.currentVersion!.xdebugFound
                 if (xdebugFound) {
                     let xdebugOn = App.shared.currentVersion!.xdebugEnabled
@@ -127,6 +135,39 @@ class MainMenu: NSObject, NSWindowDelegate {
         self.update()
     }
 
+    @objc func setBusyImage() {
+        DispatchQueue.main.async {
+            self.setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+        }
+    }
+    
+    private func waitAndExecute(_ execute: @escaping () -> Void)
+    {
+        App.shared.busy = true
+        self.setBusyImage()
+        DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
+            self.update()
+            execute()
+            App.shared.busy = false
+            DispatchQueue.main.async {
+                self.updatePhpVersionInStatusBar()
+                self.update()
+            }
+        }
+    }
+    
+    @objc public func restartPhpFpm() {
+        self.waitAndExecute({
+            Actions.restartPhpFpm()
+        })
+    }
+    
+    @objc public func restartNginx() {
+        self.waitAndExecute({
+            Actions.restartNginx()
+        })
+    }
+    
     @objc public func openAbout() {
         NSApplication.shared.activate(ignoringOtherApps: true)
         NSApplication.shared.orderFrontStandardAboutPanel()
@@ -136,8 +177,12 @@ class MainMenu: NSObject, NSWindowDelegate {
         Actions.openPhpConfigFolder(version: App.shared.currentVersion!.short)
     }
 
+    @objc public func openValetConfigFolder() {
+        Actions.openValetConfigFolder()
+    }
+    
     @objc public func switchToPhpVersion(sender: AnyObject) {
-        self.setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+        self.setBusyImage()
         let index = sender.tag!
         let version = App.shared.availablePhpVersions[index]
         App.shared.busy = true