🔀 Merge branch 'main' into dev/5.x

phpmon-common/Core/Constants.swift

@@ -50,7 +50,5 @@ class Constants {
         // dev release. In this case, that means that the version below is detected.
         "8.2"
     ]
-    
 
-    
 }

phpmon-common/Core/Shell.swift

@@ -109,7 +109,8 @@ public class Shell {
      Uses `/bin/echo` instead of the `builtin` (which does not support `-n`).
      */
     public static func fileExists(_ path: String) -> Bool {
-        return Shell.pipe("if [ -f \(path) ]; then /bin/echo -n \"0\"; fi") == "0"
+        let escapedPath = path.replacingOccurrences(of: " ", with: "\\ ")
+        return Shell.pipe("if [ -f \(escapedPath) ]; then /bin/echo -n \"0\"; fi") == "0"
     }
     
     /**

phpmon-common/PHP/ActivePhpInstallation+Checks.swift

@@ -0,0 +1,33 @@
+//
+//  ActivePhpInstallation.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 21/12/2021.
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+extension ActivePhpInstallation {
+    
+    /**
+     It is always possible that the system configuration for PHP-FPM has not been set up for Valet.
+     This can occur when a user manually installs a new PHP version, but does not run `valet install`.
+     In that case, we should alert the user!
+     
+     - Important: The underlying check is `checkPhpFpmStatus`, which can be run multiple times.
+     This method actively presents a modal if said checks fails, so don't call this method too many times.
+     */
+    public func notifyAboutBrokenPhpFpm() {
+        if !self.checkPhpFpmStatus() {
+            DispatchQueue.main.async {
+                Alert.notify(
+                    message: "alert.php_fpm_broken.title".localized,
+                    info: "alert.php_fpm_broken.info".localized,
+                    style: .critical
+                )
+            }
+        }
+    }
+    
+}