🚀 Version 5.1.1

Merge branch 'dev/5.x'
nicoverbruggen · Mar 9, 2022 · 139e416 · 139e416
2 parents 768bf06 + ba4ed3b
commit 139e416
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj
@@ -1207,7 +1207,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 715;
+				CURRENT_PROJECT_VERSION = 717;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -1217,7 +1217,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 5.1;
+				MARKETING_VERSION = 5.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1233,7 +1233,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 715;
+				CURRENT_PROJECT_VERSION = 717;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -1243,7 +1243,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 5.1;
+				MARKETING_VERSION = 5.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/phpmon/Domain/App/Startup.swift b/phpmon/Domain/App/Startup.swift
@@ -85,6 +85,9 @@ class Startup {
     // MARK: - Check (List)
 
     public var checks: [EnvironmentCheck] = [
+        // =================================================================================
+        // The Homebrew binary must exist.
+        // =================================================================================
         EnvironmentCheck(
             command: { return !FileManager.default.fileExists(atPath: Paths.brew) },
             name: "`\(Paths.brew)` exists",
@@ -99,13 +102,19 @@ class Startup {
             buttonText: "alert.homebrew_missing.quit".localized,
             requiresAppRestart: true
         ),
+        // =================================================================================
+        // The PHP binary must exist.
+        // =================================================================================
         EnvironmentCheck(
             command: { return !Filesystem.fileExists(Paths.php) },
             name: "`\(Paths.php)` exists",
             titleText: "startup.errors.php_binary.title".localized,
             subtitleText: "startup.errors.php_binary.subtitle".localized,
             descriptionText: "startup.errors.php_binary.desc".localized(Paths.php)
         ),
+        // =================================================================================
+        // Make sure we can detect one or more PHP installations.
+        // =================================================================================
         EnvironmentCheck(
             command: { return !Shell.pipe("ls \(Paths.optPath) | grep php").contains("php") },
             name: "`ls \(Paths.optPath) | grep php` returned php result",
@@ -115,10 +124,12 @@ class Startup {
             ),
             descriptionText: "startup.errors.php_opt.desc".localized
         ),
+        // =================================================================================
+        // The Valet binary must exist.
+        // =================================================================================
         EnvironmentCheck(
             command: {
-                return !(Filesystem.fileExists(Paths.valet)
-                         || Filesystem.fileExists("~/.composer/vendor/bin/valet"))
+                return !(Filesystem.fileExists(Paths.valet) || Filesystem.fileExists("~/.composer/vendor/bin/valet"))
             },
             name: "`valet` binary exists",
             titleText: "startup.errors.valet_executable.title".localized,
@@ -127,13 +138,11 @@ class Startup {
                 Paths.valet
             )
         ),
-        EnvironmentCheck(
-            command: { return HomebrewDiagnostics.cannotLoadService() },
-            name: "`sudo \(Paths.brew) services info` JSON loaded",
-            titleText: "startup.errors.services_json_error.title".localized,
-            subtitleText: "startup.errors.services_json_error.subtitle".localized,
-            descriptionText: "startup.errors.services_json_error.desc".localized
-        ),
+        // =================================================================================
+        // Check if Valet and Homebrew need manual password intervention. If they do, then
+        // PHP Monitor will be unable to run these commands, which prevents PHP Monitor from
+        // functioning correctly. Let the user know that they need to run `valet trust`.
+        // =================================================================================
         EnvironmentCheck(
             command: { return !Shell.pipe("cat /private/etc/sudoers.d/brew").contains(Paths.brew) },
             name: "`/private/etc/sudoers.d/brew` contains brew",
@@ -146,10 +155,21 @@ class Startup {
             titleText: "startup.errors.sudoers_valet.title".localized,
             subtitleText: "startup.errors.sudoers_valet.subtitle".localized
         ),
+        // =================================================================================
+        // Verify if the Homebrew services are running (as root).
+        // =================================================================================
+        EnvironmentCheck(
+            command: { return HomebrewDiagnostics.cannotLoadService() },
+            name: "`sudo \(Paths.brew) services info` JSON loaded",
+            titleText: "startup.errors.services_json_error.title".localized,
+            subtitleText: "startup.errors.services_json_error.subtitle".localized,
+            descriptionText: "startup.errors.services_json_error.desc".localized
+        ),
+        // =================================================================================
+        // Determine the Valet version and ensure it isn't unknown.
+        // =================================================================================
         EnvironmentCheck(
             command: {
-                // Determine the Valet version only AFTER confirming the correct permission is in place
-                // or otherwise this command will never return a valid version number
                 Valet.shared.version = VersionExtractor.from(valet("--version", sudo: false))
                 return Valet.shared.version == nil
             },

diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings
@@ -240,7 +240,7 @@ problem manually, using your own Terminal app (this just shows you the output)."
 
 "alert.fix_homebrew_permissions_done.title" = "All file and folder permissions for Valet's dependencies have been restored.";
 "alert.fix_homebrew_permissions_done.subtitle" = "Because of this, all of Valet's services are currently no longer running. You can now interact with Homebrew, but your Valet sites will be unavailable as all services are disabled.";
-"alert.fix_homebrew_permissions_done.desc" = "When you are done with Homebrew (after running `brew upgrade`, for example, you should restart PHP Monitor and select \"Restart All Services\" if you want Valet to work again. It is always recommended to restart PHP Monitor whenever you upgrade PHP versions with `brew upgrade`, or things might break.";
+"alert.fix_homebrew_permissions_done.desc" = "When you are done with Homebrew (after running `brew upgrade`, for example) you should restart PHP Monitor and select \"Restart All Services\" if you want Valet to work again. It is always recommended to restart PHP Monitor whenever you upgrade PHP versions with `brew upgrade`, or things might break.";
 
 // PHP FPM Broken
 "alert.php_fpm_broken.title" = "PHP-FPM configuration is incorrect";