🔀 Merge branch 'develop'

* develop: ♻️ Change how the active PHP version is switched
nicoverbruggen · Feb 20, 2020 · b792f55 · b792f55
2 parents f62297e + cbf5526
commit b792f55
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj
@@ -365,14 +365,14 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				INFOPLIST_FILE = phpmon/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.6;
+				MARKETING_VERSION = 1.7;
 				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 = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				INFOPLIST_FILE = phpmon/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.6;
+				MARKETING_VERSION = 1.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/phpmon/Classes/Commands/Actions.swift b/phpmon/Classes/Commands/Actions.swift
@@ -28,14 +28,25 @@ class Actions {
 
     public static func switchToPhpVersion(version: String, availableVersions: [String]) {
         availableVersions.forEach { (version) in
+            // Unlink the current version
             Shell.user.run("brew unlink php@\(version)")
+            // Stop the services
+            if (version == Constants.LatestPhpVersion) {
+                Shell.user.run("sudo brew services stop php")
+            } else {
+                Shell.user.run("sudo brew services stop php@\(version)")
+            }
         }
-        if (availableVersions.contains("7.4")) {
-            Shell.user.run("brew link [email protected]")
+        if (availableVersions.contains(Constants.LatestPhpVersion)) {
+            // Use the latest version as a default
+            Shell.user.run("brew link php@\(Constants.LatestPhpVersion) --overwrite --force")
             if (version == Constants.LatestPhpVersion) {
-                Shell.user.run("valet use php")
+                // If said version was also requested, all we need to do is start the service
+                Shell.user.run("sudo brew services start php")
             } else {
-                Shell.user.run("valet use php@\(version)")
+                // Otherwise, link the correct php version + start the correct service
+                Shell.user.run("brew link php@\(version) --overwrite --force")
+                Shell.user.run("sudo brew services start php@\(version)")
             }
         }
     }