🚀 Version 5.6.5

This now recommends the appropriate solution for #208.

DEVELOPER.md

@@ -14,16 +14,6 @@ It also automatically runs when you try to build the project. You'll get a warni
 swiftlint --fix
 ```
 
-## ⚙️ Preferences
-
-You can find the persisted configuration file in `~/Library/Preferences/com.nicoverbruggen.phpmon.plist`
-
-These values are cached by the OS. You can clear this cache by running:
-
-```
-defaults delete com.nicoverbruggen.phpmon && killall cfprefsd
-```
-
 ## 🔧 Build instructions
 
 <img src="./docs/build.png" width="404px" alt="build button in Xcode"/>

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2023 Nico Verbruggen
+Copyright (c) 2019-2022 Nico Verbruggen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1320"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C41C1B3222B0097F00E7CF16"
-               BuildableName = "PHP Monitor.app"
-               BlueprintName = "PHP Monitor"
-               ReferencedContainer = "container:PHP Monitor.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug.Dev"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C4F7807825D7F84B000DBC97"
-               BuildableName = "Unit Tests.xctest"
-               BlueprintName = "Unit Tests"
-               ReferencedContainer = "container:PHP Monitor.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C471E7BB28F9B90F0021E251"
-               BuildableName = "UI Tests.xctest"
-               BlueprintName = "UI Tests"
-               ReferencedContainer = "container:PHP Monitor.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C471E7AC28F9B4940021E251"
-               BuildableName = "Feature Tests.xctest"
-               BlueprintName = "Feature Tests"
-               ReferencedContainer = "container:PHP Monitor.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug.Dev"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      enableGPUValidationMode = "1"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C41C1B3222B0097F00E7CF16"
-            BuildableName = "PHP Monitor.app"
-            BlueprintName = "PHP Monitor"
-            ReferencedContainer = "container:PHP Monitor.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <CommandLineArguments>
-         <CommandLineArgument
-            argument = "--v"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "--configuration:~/.phpmon_fconf_working.json"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "--configuration:~/.phpmon_fconf_broken.json"
-            isEnabled = "NO">
-         </CommandLineArgument>
-      </CommandLineArguments>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "EXTREME_DOCTOR_MODE"
-            value = ""
-            isEnabled = "NO">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "PAINT_PHPMON_SWIFTUI_VIEWS"
-            value = ""
-            isEnabled = "NO">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release.Dev"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C41C1B3222B0097F00E7CF16"
-            BuildableName = "PHP Monitor.app"
-            BlueprintName = "PHP Monitor"
-            ReferencedContainer = "container:PHP Monitor.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug.Dev">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release.Dev"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1400"
-   version = "1.7">
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,42 +27,14 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <TestPlans>
-         <TestPlanReference
-            reference = "container:PHP Monitor.xcodeproj/PHP Monitor.xctestplan"
-            default = "YES">
-         </TestPlanReference>
-      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "C4F7807825D7F84B000DBC97"
-               BuildableName = "Unit Tests.xctest"
-               BlueprintName = "Unit Tests"
-               ReferencedContainer = "container:PHP Monitor.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C471E7AC28F9B4940021E251"
-               BuildableName = "Feature Tests.xctest"
-               BlueprintName = "Feature Tests"
-               ReferencedContainer = "container:PHP Monitor.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C471E7BB28F9B90F0021E251"
-               BuildableName = "UI Tests.xctest"
-               BlueprintName = "UI Tests"
+               BuildableName = "phpmon-tests.xctest"
+               BlueprintName = "phpmon-tests"
                ReferencedContainer = "container:PHP Monitor.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -101,11 +73,6 @@
             value = ""
             isEnabled = "NO">
          </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "SLOW_SHELL_MODE"
-            value = ""
-            isEnabled = "NO">
-         </EnvironmentVariable>
          <EnvironmentVariable
             key = "PAINT_PHPMON_SWIFTUI_VIEWS"
             value = ""

PHP Monitor.xcodeproj/xcshareddata/xcschemes/Unit Tests.xcscheme

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1400"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C4F7807825D7F84B000DBC97"
-               BuildableName = "Unit Tests.xctest"
-               BlueprintName = "Unit Tests"
-               ReferencedContainer = "container:PHP Monitor.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

README.md

@@ -27,36 +27,22 @@ PHP Monitor is a universal application that runs natively on Apple Silicon **and
 * macOS 11 Big Sur or later
 * Homebrew is installed in `/usr/local/homebrew` or `/opt/homebrew`
 * Homebrew `php` formula is installed
-* Laravel Valet (works with Valet v2, v3 and v4)
+* Laravel Valet 3 recommended (but compatible with Valet 2)
 
 _You may need to update your Valet installation to keep everything working if a major version update of PHP has been released. You can do this by running `composer global update && valet install`. Some features are not supported when running Valet 2._
 
-For more information, please see [SECURITY.md](./SECURITY.md) to find out which version of the app is currently supported.
-
 ## 🚀 How to install
 
-Again, make sure you have **[Laravel Valet](https://laravel.com/docs/master/valet)** installed first:
-
-```sh
-composer global require laravel/valet
-valet install
-valet trust
-```
-
-Once that's done, you can install PHP Monitor via Homebrew (recommended), or (alternatively) you may download the latest release on GitHub.
+Again, make sure you have **Laravel Valet** installed first. Once that's done, you can install via Homebrew (recommended), or may download the latest release on GitHub.
 
 To install via Homebrew, run:
 
-```sh
-brew tap nicoverbruggen/homebrew-cask
-brew install --cask phpmon
-```
+	brew tap nicoverbruggen/homebrew-cask
+	brew install --cask phpmon
 
 To upgrade your existing installation, run:
 
-```sh
-brew upgrade phpmon
-```
+	brew upgrade phpmon
 
 (You may need to run `brew update` or `brew update-reset` first in order to update the cask file if you ran a Homebrew operation recently.)
 
@@ -93,49 +79,29 @@ If you're still having issues, here's a few common questions & answers, as well
 <details>
 <summary><strong>Which versions of PHP are supported?</strong></summary>
 
-All stable and supported PHP versions are also supported by PHP Monitor. However, depending on which version of Valet you have installed, which versions of PHP that are made available for switching purposes may differ.
+<ul>
+<li>PHP 5.6 (only if you are running Valet 2)</li>
+<li>PHP 7.0</li>
+<li>PHP 7.1</li>
+<li>PHP 7.2</li>
+<li>PHP 7.3</li>
+<li>PHP 7.4</li>
+<li>PHP 8.0</li>
+<li>PHP 8.1</li>
+<li>PHP 8.2</li>
+<li>PHP 8.3 (experimental)</li>
+</ul>
 
-> **Note**
-> If you have versions of PHP installed that can be detected by PHP Monitor but is *not* supported by the currently active version of Valet, you will be alerted by an item in the menu with an exclamation mark emoji. (⚠️)
+For more details, consult the [constants file](https://github.com/nicoverbruggen/phpmon/blob/main/phpmon/Common/Core/Constants.swift#L16) file to see which versions are supported.
 
-Backports are available via [this tap](https://github.com/shivammathur/homebrew-php). For more information about those backports, please see the next FAQ entry.
-
-For maximum compatibility with older PHP versions, you may wish to keep using Valet 2 or 3. For more information, please see [SECURITY.md](./SECURITY.md) to find out which versions of PHP are supported with different versions of Valet.
-
-</details>
-
-<details>
-<summary><strong>How do I install additional versions of PHP, including legacy versions?</strong></summary>
-
-Assuming you have installed the `php` formula, the latest stable version of PHP is installed. At the time of writing, this is PHP 8.2.
-
-You can install other supported versions of PHP out of the box, so `php@8.0` and `php@8.1` at the time of writing.
-
-If you wish to install older (officially unsupported) versions of PHP for local use, you can do so by using [Shivam Mathur's tap](https://github.com/shivammathur/homebrew-php):
-
-```sh
-brew tap shivammathur/php
-```
-
-You may find that this tap is already in use: if you've used Valet before, it automatically uses this tap for legacy versions of PHP.
-
-```sh
-brew install shivammathur/php/php@7.4
-brew install shivammathur/php/php@7.3
-brew install shivammathur/php/php@7.2
-brew install shivammathur/php/php@7.1
-brew install shivammathur/php/php@7.0
-```
-
-**Always make sure to restart PHP Monitor after installing or upgrading PHP versions!**
-
-> *Note*: Using this tap may cause [temporary alias conflicts](https://github.com/nicoverbruggen/phpmon/issues/54#issuecomment-979789724) while the core tap alias and the tap's alias refer to a different version of PHP, but this is generally speaking a minor inconvenience, since this normally only applies when a new PHP version releases.
 </details>
 
 <details>
 <summary><strong>I want PHP Monitor to start up when I boot my Mac!</strong></summary>
 
-You can do this by dragging *PHP Monitor.app* into the **Login Items** section in **System Preferences > Users & Groups** for your account.
+On macOS Ventura, you can accomplish this by going to **System Settings > General > Login Items** and adding PHP Monitor.app to the list **Open at Login**. You can do this with any application, by the way.
+
+On older versions of macOS, you can do this by dragging *PHP Monitor.app* into the **Login Items** section in **System Preferences > Users & Groups** for your account.
 
 Super convenient!
 </details>

SECURITY.md

@@ -6,9 +6,7 @@ Generally speaking, only the latest version of **PHP Monitor** is supported, exc
 
 | Version | Apple Silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Recommended Valet Version |
 | ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
-| 5.7       | ✅ Universal binary | ✅ Yes | Big Sur (11.0)<br/>Monterey (12.0)<br/>Ventura (13.0) | macOS 11+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x*) | 3.0 or higher recommended<br/> 2.16.2 minimum |
-
-(*) Preliminary listing. Valet 4 hasn't been released yet and the versions of PHP Valet can work with might still change.
+| 5.x       | ✅ Universal binary | ✅ Yes | Big Sur (11.0)<br/>Monterey (12.0)<br/>Ventura (13.0) | macOS 11+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x) | 3.0 recommended<br/> 2.16.2 minimum |
 
 ## Legacy versions
 
@@ -16,7 +14,6 @@ These versions of PHP Monitor are no longer supported, but if you’re using an
 
 | Version | Apple Silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Minimum Required Valet Version |
 | ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
-| 5.6       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0)<br/>Ventura (13.0)* | macOS 11+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x) | 3.0 recommended<br/> 2.16.2 minimum |
 | 4.1       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0) | macOS 11+ | PHP 5.6—PHP 8.2 | 2.16.2 |
 | 4.0       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 | 2.13 |
 | 3.5       | ✅ Universal binary | ❌ | Big Sur (11.0)<br/>Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 | 2.13 |

phpmon-tests/Commands/CommandTest.swift

@@ -1,20 +1,19 @@
 //
 //  CommandTest.swift
-//  PHP Monitor
+//  phpmon-tests
 //
 //  Created by Nico Verbruggen on 13/02/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
 
 class CommandTest: XCTestCase {
 
-    func test_determine_php_version() {
+    func testDeterminePhpVersion() {
         let version = Command.execute(
             path: Paths.php,
-            arguments: ["-v"],
-            trimNewlines: false
+            arguments: ["-v"]
         )
 
         XCTAssert(version.contains("(cli)"))

phpmon-tests/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

phpmon-tests/Parsers/HomebrewPackageTest.swift

@@ -1,9 +1,9 @@
 //
 //  BrewJsonParserTest.swift
-//  PHP Monitor
+//  phpmon-tests
 //
 //  Created by Nico Verbruggen on 14/02/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
@@ -17,7 +17,7 @@ class HomebrewPackageTest: XCTestCase {
             .url(forResource: "brew-formula", withExtension: "json")!
     }
 
-    func test_can_load_extension_json() throws {
+    func testCanLoadExtensionJson() throws {
         let json = try! String(contentsOf: Self.jsonBrewFile, encoding: .utf8)
         let package = try! JSONDecoder().decode(
             [HomebrewPackage].self, from: json.data(using: .utf8)!
@@ -25,9 +25,9 @@ class HomebrewPackageTest: XCTestCase {
 
         XCTAssertEqual(package.name, "php")
         XCTAssertEqual(package.full_name, "php")
-        XCTAssertEqual(package.aliases.first!, "php@8.1")
+        XCTAssertEqual(package.aliases.first!, "php@8.0")
         XCTAssertEqual(package.installed.contains(where: { installed in
-            installed.version.starts(with: "8.1")
+            installed.version.starts(with: "8.0")
         }), true)
     }
 
@@ -36,7 +36,7 @@ class HomebrewPackageTest: XCTestCase {
             .url(forResource: "brew-services", withExtension: "json")!
     }
 
-    func test_can_parse_services_json() throws {
+    func testCanParseServicesJson() throws {
         let json = try! String(contentsOf: Self.jsonBrewServicesFile, encoding: .utf8)
         let services = try! JSONDecoder().decode(
             [HomebrewService].self, from: json.data(using: .utf8)!
@@ -47,21 +47,19 @@ class HomebrewPackageTest: XCTestCase {
         XCTAssertEqual(services.first?.service_name, "homebrew.mxcl.dnsmasq")
     }
 
-    /*
     // - MARK: LIVE TESTS
 
     /// This test requires that you have a valid Homebrew installation set up,
     /// and requires the Valet services to be installed: php, nginx and dnsmasq.
     /// If this test fails, there is an issue with your Homebrew installation
     /// or the JSON API of the Homebrew output may have changed.
-    func test_can_parse_services_json_from_cli_output() async throws {
-        ActiveShell.useSystem()
-
+    func testCanParseServicesJsonFromCliOutput() throws {
         let services = try! JSONDecoder().decode(
             [HomebrewService].self,
-            from: await Shell.pipe(
-                "sudo \(Paths.brew) services info --all --json"
-            ).out.data(using: .utf8)!
+            from: Shell.pipe(
+                "sudo \(Paths.brew) services info --all --json",
+                requiresPath: true
+            ).data(using: .utf8)!
         ).filter({ service in
             return ["php", "nginx", "dnsmasq"].contains(service.name)
         })
@@ -76,15 +74,12 @@ class HomebrewPackageTest: XCTestCase {
     /// and requires the `php` formula to be installed.
     /// If this test fails, there is an issue with your Homebrew installation
     /// or the JSON API of the Homebrew output may have changed.
-    func test_can_load_extension_json_from_cli_output() async throws {
-        ActiveShell.useSystem()
-
+    func testCanLoadExtensionJsonFromCliOutput() throws {
         let package = try! JSONDecoder().decode(
             [HomebrewPackage].self,
-            from: await Shell.pipe("\(Paths.brew) info php --json").out.data(using: .utf8)!
+            from: Shell.pipe("\(Paths.brew) info php --json", requiresPath: true).data(using: .utf8)!
         ).first!
 
         XCTAssertTrue(package.name == "php")
     }
-     */
 }

phpmon-tests/Parsers/NginxConfigurationTest.swift

@@ -1,9 +1,9 @@
 //
 //  NginxConfigurationTest.swift
-//  PHP Monitor
+//  phpmon-tests
 //
 //  Created by Nico Verbruggen on 29/11/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
@@ -34,7 +34,7 @@ class NginxConfigurationTest: XCTestCase {
 
     // MARK: - Tests
 
-    func test_can_determine_site_name_and_tld() throws {
+    func testCanDetermineSiteNameAndTld() throws {
         XCTAssertEqual(
             "nginx-site",
             NginxConfigurationFile.from(filePath: NginxConfigurationTest.regularUrl.path)?.domain
@@ -45,7 +45,7 @@ class NginxConfigurationTest: XCTestCase {
         )
     }
 
-    func test_can_determine_isolation() throws {
+    func testCanDetermineIsolation() throws {
         XCTAssertNil(
             NginxConfigurationFile.from(filePath: NginxConfigurationTest.regularUrl.path)?.isolatedVersion
         )
@@ -56,7 +56,7 @@ class NginxConfigurationTest: XCTestCase {
         )
     }
 
-    func test_can_determine_proxy() throws {
+    func testCanDetermineProxy() throws {
         let proxied = NginxConfigurationFile.from(filePath: NginxConfigurationTest.proxyUrl.path)!
         XCTAssertTrue(proxied.contents.contains("# valet stub: proxy.valet.conf"))
         XCTAssertEqual("http://127.0.0.1:90", proxied.proxy)
@@ -66,13 +66,13 @@ class NginxConfigurationTest: XCTestCase {
         XCTAssertEqual(nil, normal.proxy)
     }
 
-    func test_can_determine_secured_proxy() throws {
+    func testCanDetermineSecuredProxy() throws {
         let proxied = NginxConfigurationFile.from(filePath: NginxConfigurationTest.secureProxyUrl.path)!
         XCTAssertTrue(proxied.contents.contains("# valet stub: secure.proxy.valet.conf"))
         XCTAssertEqual("http://127.0.0.1:90", proxied.proxy)
     }
 
-    func test_can_determine_proxy_with_custom_tld() throws {
+    func testCanDetermineProxyWithCustomTld() throws {
         let proxied = NginxConfigurationFile.from(filePath: NginxConfigurationTest.customTldProxyUrl.path)!
         XCTAssertTrue(proxied.contents.contains("# valet stub: secure.proxy.valet.conf"))
         XCTAssertEqual("http://localhost:8080", proxied.proxy)

phpmon-tests/Parsers/PhpConfigurationTest.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 04/05/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
@@ -14,7 +14,7 @@ class PhpConfigurationTest: XCTestCase {
         return Bundle(for: Self.self).url(forResource: "php", withExtension: "ini")!
     }
 
-    func test_can_load_extension() throws {
+    func testCanLoadExtension() throws {
         let iniFile = PhpConfigurationFile.from(filePath: Self.phpIniFileUrl.path)!
 
         XCTAssertNotNil(iniFile)
@@ -22,7 +22,7 @@ class PhpConfigurationTest: XCTestCase {
         XCTAssertGreaterThan(iniFile.extensions.count, 0)
     }
 
-    func test_can_check_key_existence() throws {
+    func testCanCheckKeyExistence() throws {
         let iniFile = PhpConfigurationFile.from(filePath: Self.phpIniFileUrl.path)!
 
         XCTAssertTrue(iniFile.has(key: "error_reporting"))
@@ -30,7 +30,7 @@ class PhpConfigurationTest: XCTestCase {
         XCTAssertFalse(iniFile.has(key: "my_unknown_key"))
     }
 
-    func test_can_check_key_value() throws {
+    func testCanCheckKeyValue() throws {
         let iniFile = PhpConfigurationFile.from(filePath: Self.phpIniFileUrl.path)!
 
         XCTAssertNotNil(iniFile.get(for: "error_reporting"))
@@ -40,7 +40,7 @@ class PhpConfigurationTest: XCTestCase {
         XCTAssert(iniFile.get(for: "display_errors") == "On")
     }
 
-    func test_can_customize_configuration_value() throws {
+    func testCanCustomizeConfigurationValue() throws {
         let destination = Utility
             .copyToTemporaryFile(resourceName: "php", fileExtension: "ini")!
 

phpmon-tests/Parsers/PhpExtensionTest.swift

@@ -1,9 +1,9 @@
 //
 //  ExtensionParserTest.swift
-//  PHP Monitor
+//  phpmon-tests
 //
 //  Created by Nico Verbruggen on 13/02/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
@@ -14,13 +14,13 @@ class PhpExtensionTest: XCTestCase {
         return Bundle(for: Self.self).url(forResource: "php", withExtension: "ini")!
     }
 
-    func test_can_load_extension() throws {
+    func testCanLoadExtension() throws {
         let extensions = PhpExtension.from(filePath: Self.phpIniFileUrl.path)
 
         XCTAssertGreaterThan(extensions.count, 0)
     }
 
-    func test_extension_name_is_correct() throws {
+    func testExtensionNameIsCorrect() throws {
         let extensions = PhpExtension.from(filePath: Self.phpIniFileUrl.path)
 
         let extensionNames = extensions.map { (ext) -> String in
@@ -39,7 +39,7 @@ class PhpExtensionTest: XCTestCase {
         XCTAssertFalse(extensionNames.contains("nice"))
     }
 
-    func test_extension_status_is_correct() throws {
+    func testExtensionStatusIsCorrect() throws {
         let extensions = PhpExtension.from(filePath: Self.phpIniFileUrl.path)
 
         // xdebug should be enabled
@@ -49,7 +49,7 @@ class PhpExtensionTest: XCTestCase {
         XCTAssertEqual(extensions[1].enabled, false)
     }
 
-    func test_toggle_works_as_expected() async throws {
+    func testToggleWorksAsExpected() throws {
         let destination = Utility.copyToTemporaryFile(resourceName: "php", fileExtension: "ini")!
         let extensions = PhpExtension.from(filePath: destination.path)
         XCTAssertEqual(extensions.count, 6)
@@ -58,7 +58,7 @@ class PhpExtensionTest: XCTestCase {
         let xdebug = extensions.first!
         XCTAssertTrue(xdebug.name == "xdebug")
         XCTAssertEqual(xdebug.enabled, true)
-        await xdebug.toggle()
+        xdebug.toggle()
         XCTAssertEqual(xdebug.enabled, false)
 
         // Check if the file contains the appropriate data

phpmon-tests/Parsers/ValetConfigurationTest.swift

@@ -1,9 +1,9 @@
 //
 //  ValetConfigParserTest.swift
-//  PHP Monitor
+//  phpmon-tests
 //
 //  Created by Nico Verbruggen on 29/11/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
@@ -17,7 +17,7 @@ class ValetConfigurationTest: XCTestCase {
         )!
     }
 
-    func test_can_load_config_file() throws {
+    func testCanLoadConfigFile() throws {
         let json = try? String(
             contentsOf: Self.jsonConfigFileUrl,
             encoding: .utf8

phpmon-tests/Test Files/brew/brew-formula.json

@@ -0,0 +1,332 @@
+[
+    {
+        "name":"php",
+        "full_name":"php",
+        "tap":"homebrew/core",
+        "oldname":null,
+        "aliases":[
+            "php@8.0"
+        ],
+        "versioned_formulae":[
+            "php@7.4",
+            "php@7.3",
+            "php@7.2"
+        ],
+        "desc":"General-purpose scripting language",
+        "license":"PHP-3.01",
+        "homepage":"https://www.php.net/",
+        "versions":{
+            "stable":"8.0.2",
+            "head":"HEAD",
+            "bottle":true
+        },
+        "urls":{
+            "stable":{
+                "url":"https://www.php.net/distributions/php-8.0.2.tar.xz",
+                "tag":null,
+                "revision":null
+            }
+        },
+        "revision":0,
+        "version_scheme":0,
+        "bottle":{
+            "stable":{
+                "rebuild":0,
+                "cellar":"/opt/homebrew/Cellar",
+                "prefix":"/opt/homebrew",
+                "root_url":"https://homebrew.bintray.com/bottles",
+                "files":{
+                    "arm64_big_sur":{
+                        "url":"https://homebrew.bintray.com/bottles/php-8.0.2.arm64_big_sur.bottle.tar.gz",
+                        "sha256":"cbefa1db73d08b9af4593a44512b8d727e43033ee8517736bae5f16315501b12"
+                    },
+                    "big_sur":{
+                        "url":"https://homebrew.bintray.com/bottles/php-8.0.2.big_sur.bottle.tar.gz",
+                        "sha256":"6857142e12254b15da4e74c2986dd24faca57dac8d467b04621db349e277dd63"
+                    },
+                    "catalina":{
+                        "url":"https://homebrew.bintray.com/bottles/php-8.0.2.catalina.bottle.tar.gz",
+                        "sha256":"b651611134c18f93fdf121a4277b51b197a896a19ccb8020289b4e19e0638349"
+                    },
+                    "mojave":{
+                        "url":"https://homebrew.bintray.com/bottles/php-8.0.2.mojave.bottle.tar.gz",
+                        "sha256":"9583a51fcc6f804aadbb14e18f770d4fb4973deaed6ddc4770342e62974ffbca"
+                    }
+                }
+            }
+        },
+        "keg_only":false,
+        "bottle_disabled":false,
+        "options":[
+            
+        ],
+        "build_dependencies":[
+            "httpd",
+            "pkg-config"
+        ],
+        "dependencies":[
+            "apr",
+            "apr-util",
+            "argon2",
+            "aspell",
+            "autoconf",
+            "curl",
+            "freetds",
+            "gd",
+            "gettext",
+            "glib",
+            "gmp",
+            "icu4c",
+            "krb5",
+            "libffi",
+            "libpq",
+            "libsodium",
+            "libzip",
+            "oniguruma",
+            "openldap",
+            "openssl@1.1",
+            "pcre2",
+            "sqlite",
+            "tidy-html5",
+            "unixodbc"
+        ],
+        "recommended_dependencies":[
+            
+        ],
+        "optional_dependencies":[
+            
+        ],
+        "uses_from_macos":[
+            {
+                "xz":"build"
+            },
+            "bzip2",
+            "libedit",
+            "libxml2",
+            "libxslt",
+            "zlib"
+        ],
+        "requirements":[
+            
+        ],
+        "conflicts_with":[
+            
+        ],
+        "caveats":"To enable PHP in Apache add the following to httpd.conf and restart Apache:\n    LoadModule php_module $(brew --prefix)/opt/php/lib/httpd/modules/libphp.so\n\n    <FilesMatch \\.php$>\n        SetHandler application/x-httpd-php\n    </FilesMatch>\n\nFinally, check DirectoryIndex includes index.php\n    DirectoryIndex index.php index.html\n\nThe php.ini and php-fpm.ini file can be found in:\n    $(brew --prefix)/etc/php/8.0/\n",
+        "installed":[
+            {
+                "version":"8.0.2",
+                "used_options":[
+                    
+                ],
+                "built_as_bottle":true,
+                "poured_from_bottle":true,
+                "runtime_dependencies":[
+                    {
+                        "full_name":"apr",
+                        "version":"1.7.0"
+                    },
+                    {
+                        "full_name":"openssl@1.1",
+                        "version":"1.1.1i"
+                    },
+                    {
+                        "full_name":"apr-util",
+                        "version":"1.6.1"
+                    },
+                    {
+                        "full_name":"argon2",
+                        "version":"20190702"
+                    },
+                    {
+                        "full_name":"aspell",
+                        "version":"0.60.8"
+                    },
+                    {
+                        "full_name":"autoconf",
+                        "version":"2.69"
+                    },
+                    {
+                        "full_name":"brotli",
+                        "version":"1.0.9"
+                    },
+                    {
+                        "full_name":"gettext",
+                        "version":"0.21"
+                    },
+                    {
+                        "full_name":"libunistring",
+                        "version":"0.9.10"
+                    },
+                    {
+                        "full_name":"libidn2",
+                        "version":"2.3.0"
+                    },
+                    {
+                        "full_name":"libmetalink",
+                        "version":"0.1.3"
+                    },
+                    {
+                        "full_name":"libssh2",
+                        "version":"1.9.0"
+                    },
+                    {
+                        "full_name":"c-ares",
+                        "version":"1.17.1"
+                    },
+                    {
+                        "full_name":"jemalloc",
+                        "version":"5.2.1"
+                    },
+                    {
+                        "full_name":"libev",
+                        "version":"4.33"
+                    },
+                    {
+                        "full_name":"nghttp2",
+                        "version":"1.43.0"
+                    },
+                    {
+                        "full_name":"openldap",
+                        "version":"2.4.57"
+                    },
+                    {
+                        "full_name":"rtmpdump",
+                        "version":"2.4+20151223"
+                    },
+                    {
+                        "full_name":"zstd",
+                        "version":"1.4.8"
+                    },
+                    {
+                        "full_name":"curl",
+                        "version":"7.75.0"
+                    },
+                    {
+                        "full_name":"libtool",
+                        "version":"2.4.6"
+                    },
+                    {
+                        "full_name":"unixodbc",
+                        "version":"2.3.9"
+                    },
+                    {
+                        "full_name":"freetds",
+                        "version":"1.2.18"
+                    },
+                    {
+                        "full_name":"libpng",
+                        "version":"1.6.37"
+                    },
+                    {
+                        "full_name":"freetype",
+                        "version":"2.10.4"
+                    },
+                    {
+                        "full_name":"fontconfig",
+                        "version":"2.13.1"
+                    },
+                    {
+                        "full_name":"jpeg",
+                        "version":"9d"
+                    },
+                    {
+                        "full_name":"libtiff",
+                        "version":"4.2.0"
+                    },
+                    {
+                        "full_name":"webp",
+                        "version":"1.2.0"
+                    },
+                    {
+                        "full_name":"gd",
+                        "version":"2.3.1"
+                    },
+                    {
+                        "full_name":"libffi",
+                        "version":"3.3"
+                    },
+                    {
+                        "full_name":"pcre",
+                        "version":"8.44"
+                    },
+                    {
+                        "full_name":"gdbm",
+                        "version":"1.18.1"
+                    },
+                    {
+                        "full_name":"readline",
+                        "version":"8.1"
+                    },
+                    {
+                        "full_name":"sqlite",
+                        "version":"3.34.0"
+                    },
+                    {
+                        "full_name":"tcl-tk",
+                        "version":"8.6.11"
+                    },
+                    {
+                        "full_name":"xz",
+                        "version":"5.2.5"
+                    },
+                    {
+                        "full_name":"python@3.9",
+                        "version":"3.9.1"
+                    },
+                    {
+                        "full_name":"glib",
+                        "version":"2.66.6"
+                    },
+                    {
+                        "full_name":"gmp",
+                        "version":"6.2.1"
+                    },
+                    {
+                        "full_name":"icu4c",
+                        "version":"67.1"
+                    },
+                    {
+                        "full_name":"krb5",
+                        "version":"1.19"
+                    },
+                    {
+                        "full_name":"libpq",
+                        "version":"13.1"
+                    },
+                    {
+                        "full_name":"libsodium",
+                        "version":"1.0.18"
+                    },
+                    {
+                        "full_name":"libzip",
+                        "version":"1.7.3"
+                    },
+                    {
+                        "full_name":"oniguruma",
+                        "version":"6.9.6"
+                    },
+                    {
+                        "full_name":"pcre2",
+                        "version":"10.36"
+                    },
+                    {
+                        "full_name":"tidy-html5",
+                        "version":"5.6.0"
+                    }
+                ],
+                "installed_as_dependency":false,
+                "installed_on_request":true
+            }
+        ],
+        "linked_keg":"8.0.2",
+        "pinned":false,
+        "outdated":false,
+        "deprecated":false,
+        "deprecation_date":null,
+        "deprecation_reason":null,
+        "disabled":false,
+        "disable_date":null,
+        "disable_reason":null
+    }
+]

phpmon-tests/Utility.swift

@@ -1,9 +1,9 @@
 //
 //  Utility.swift
-//  PHP Monitor
+//  phpmon-tests
 //
 //  Created by Nico Verbruggen on 14/02/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon-tests/Versions/AppUpdaterCheckTest.swift

@@ -1,38 +1,38 @@
 //
 //  AppUpdaterCheckTest.swift
-//  PHP Monitor
+//  phpmon-tests
 //
 //  Created by Nico Verbruggen on 10/05/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
 
 class AppUpdaterCheckTest: XCTestCase {
 
-    func test_can_retrieve_version_from_cask() async {
-        let caskVersion = await AppUpdateChecker.retrieveVersionFromCask()
+    func testCanRetrieveVersionFromCask() {
+        let caskVersion = AppUpdateChecker.retrieveVersionFromCask()
 
         let version = VersionExtractor.from(caskVersion)
 
         XCTAssertNotNil(version)
     }
 
-    func test_tagged_release_omits_zero_patch() {
+    func testTaggedReleaseOmitsZeroPatch() {
         let version = AppVersion.from("3.5.0_333")!
 
         XCTAssertEqual(version.tagged, "3.5")
         XCTAssertEqual(version.version, "3.5.0")
     }
 
-    func test_tagged_release_doesnt_omit_non_zero_patch() {
+    func testTaggedReleaseDoesntOmitNonZeroPatch() {
         let version = AppVersion.from("3.5.1_333")!
 
         XCTAssertEqual(version.tagged, "3.5.1")
         XCTAssertEqual(version.version, "3.5.1")
     }
 
-    func test_tag_truncation_does_not_affect_major_versions() {
+    func testTagTruncationDoesntAffectMajorVersions() {
         var version = AppVersion.from("5.0_333")!
 
         XCTAssertEqual(version.tagged, "5.0")

phpmon-tests/Versions/AppVersionTest.swift

@@ -3,18 +3,18 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 10/05/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
 
 class AppVersionTest: XCTestCase {
 
-    func test_can_retrieve_internal_app_version() {
+    func testCanRetrieveInternalAppVersion() {
         XCTAssertNotNil(AppVersion.fromCurrentVersion())
     }
 
-    func test_can_parse_normal_version_string() {
+    func testCanParseNormalVersionString() {
         let version = AppVersion.from("1.0.0")
 
         XCTAssertNotNil(version)
@@ -23,7 +23,7 @@ class AppVersionTest: XCTestCase {
         XCTAssertEqual(nil, version?.suffix)
     }
 
-    func test_can_parse_cask_version_string() {
+    func testCanParseCaskVersionString() {
         let version = AppVersion.from("1.0.0_600")
 
         XCTAssertNotNil(version)
@@ -32,7 +32,7 @@ class AppVersionTest: XCTestCase {
         XCTAssertEqual(nil, version?.suffix)
     }
 
-    func test_can_parse_dev_version_string_without_build_number() {
+    func testCanParseDevVersionStringWithoutBuildNumber() {
         let version = AppVersion.from("1.0.0-dev")
 
         XCTAssertNotNil(version)
@@ -41,7 +41,7 @@ class AppVersionTest: XCTestCase {
         XCTAssertEqual("dev", version?.suffix)
     }
 
-    func test_can_parse_dev_version_string_with_build_number() {
+    func testCanParseDevVersionStringWithBuildNumber() {
         let version = AppVersion.from("1.0.0-dev,870")
 
         XCTAssertNotNil(version)
@@ -50,7 +50,7 @@ class AppVersionTest: XCTestCase {
         XCTAssertEqual("dev", version?.suffix)
     }
 
-    func test_can_parse_underscores_as_build_separator() {
+    func testCanParseUnderscoresAsBuildSeparatorToo() {
         let version = AppVersion.from("1.0.0-dev_870")
 
         XCTAssertNotNil(version)

phpmon-tests/Versions/PhpVersionDetectionTest.swift

@@ -0,0 +1,29 @@
+//
+//  PhpVersionDetectionTest.swift
+//  phpmon-tests
+//
+//  Created by Nico Verbruggen on 01/04/2021.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import XCTest
+
+class PhpVersionDetectionTest: XCTestCase {
+
+    func testCanDetectValidPhpVersions() throws {
+        let outcome = PhpEnv.shared.extractPhpVersions(from: [
+            "", // empty lines should be omitted
+            "php@8.0",
+            "php@8.0", // should only be detected once
+            "meta-php@8.0", // should be omitted, invalid
+            "php@8.0-coolio", // should be omitted, invalid
+            "php@7.0",
+            "",
+            "unrelatedphp@1.0", // should be omitted, invalid
+            "php@5.6",
+            "php@5.4" // should be omitted, not supported
+        ], checkBinaries: false, generateHelpers: false)
+
+        XCTAssertEqual(outcome, ["8.0", "7.0"])
+    }
+}

phpmon-tests/Versions/PhpVersionNumberTest.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 23/01/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
@@ -11,40 +11,40 @@ import XCTest
 // swiftlint:disable type_body_length
 class PhpVersionNumberTest: XCTestCase {
 
-    func test_can_deconstruct_php_version() throws {
+    func testCanDeconstructPhpVersion() throws {
         XCTAssertEqual(
-            try! VersionNumber.parse("PHP 8.2.0-dev"),
-            VersionNumber(major: 8, minor: 2, patch: 0)
+            try! PhpVersionNumber.parse("PHP 8.2.0-dev"),
+            PhpVersionNumber(major: 8, minor: 2, patch: 0)
         )
         XCTAssertEqual(
-            try! VersionNumber.parse("PHP 8.1.0RC5-dev"),
-            VersionNumber(major: 8, minor: 1, patch: 0)
+            try! PhpVersionNumber.parse("PHP 8.1.0RC5-dev"),
+            PhpVersionNumber(major: 8, minor: 1, patch: 0)
         )
         XCTAssertEqual(
-            try! VersionNumber.parse("8.0.11"),
-            VersionNumber(major: 8, minor: 0, patch: 11)
+            try! PhpVersionNumber.parse("8.0.11"),
+            PhpVersionNumber(major: 8, minor: 0, patch: 11)
         )
         XCTAssertEqual(
-            try! VersionNumber.parse("7.4.2"),
-            VersionNumber(major: 7, minor: 4, patch: 2)
+            try! PhpVersionNumber.parse("7.4.2"),
+            PhpVersionNumber(major: 7, minor: 4, patch: 2)
         )
         XCTAssertEqual(
-            try! VersionNumber.parse("7.4"),
-            VersionNumber(major: 7, minor: 4, patch: nil)
+            try! PhpVersionNumber.parse("7.4"),
+            PhpVersionNumber(major: 7, minor: 4, patch: nil)
         )
         XCTAssertEqual(
-            VersionNumber.make(from: "7"),
+            PhpVersionNumber.make(from: "7"),
             nil
         )
     }
 
-    func test_php_version_number_parse() throws {
-        XCTAssertThrowsError(try VersionNumber.parse("OOF")) { error in
+    func testPhpVersionNumberParse() throws {
+        XCTAssertThrowsError(try PhpVersionNumber.parse("OOF")) { error in
             XCTAssertTrue(error is VersionParseError)
         }
     }
 
-    func test_can_check_fixed_constraints() throws {
+    func testCanCheckFixedConstraints() throws {
         XCTAssertEqual(
             PhpVersionNumberCollection
                 .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
@@ -78,7 +78,7 @@ class PhpVersionNumberTest: XCTestCase {
         )
     }
 
-    func test_can_check_caret_constraints() throws {
+    func testCanCheckCaretConstraints() throws {
         // 1. Imprecise checks
         XCTAssertEqual(
             PhpVersionNumberCollection
@@ -138,7 +138,7 @@ class PhpVersionNumberTest: XCTestCase {
         )
     }
 
-    func test_can_check_tilde_constraints() throws {
+    func testCanCheckTildeConstraints() throws {
         // 1. Imprecise checks
         XCTAssertEqual(
             PhpVersionNumberCollection
@@ -207,7 +207,7 @@ class PhpVersionNumberTest: XCTestCase {
         )
     }
 
-    func test_can_check_greater_than_or_equal_constraints() throws {
+    func testCanCheckGreaterThanOrEqualConstraints() throws {
         XCTAssertEqual(
             PhpVersionNumberCollection
                 .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
@@ -243,7 +243,7 @@ class PhpVersionNumberTest: XCTestCase {
         )
     }
 
-    func test_can_check_greater_than_constraints() throws {
+    func testCanCheckGreaterThanConstraints() throws {
         XCTAssertEqual(
             PhpVersionNumberCollection
                 .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
@@ -289,7 +289,7 @@ class PhpVersionNumberTest: XCTestCase {
         )
     }
 
-    func test_can_check_less_than_or_equal_constraints() throws {
+    func testCanCheckLessThanOrEqualConstraints() throws {
         XCTAssertEqual(
             PhpVersionNumberCollection
                 .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
@@ -325,7 +325,7 @@ class PhpVersionNumberTest: XCTestCase {
         )
     }
 
-    func test_can_check_less_than_constraints() throws {
+    func testCanCheckLessThanConstraints() throws {
         XCTAssertEqual(
             PhpVersionNumberCollection
                 .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])

phpmon-tests/Versions/ValetVersionExtractorTest.swift

@@ -1,17 +1,17 @@
 //
 //  ValetTest.swift
-//  PHP Monitor
+//  phpmon-tests
 //
 //  Created by Nico Verbruggen on 29/11/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
 
 class ValetVersionExtractorTest: XCTestCase {
 
-    func test_can_determine_valet_version() async {
-        let version = await valet("--version", sudo: false)
+    func testDetermineValetVersion() {
+        let version = valet("--version", sudo: false)
         XCTAssert(version.contains("Laravel Valet 2") || version.contains("Laravel Valet 3"))
     }
 

phpmon-tests/Versions/VersionExtractorTest.swift

@@ -1,21 +1,21 @@
 //
 //  VersionExtractorTest.swift
-//  PHP Monitor
+//  phpmon-tests
 //
 //  Created by Nico Verbruggen on 16/12/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
 
 class VersionExtractorTest: XCTestCase {
 
-    func test_extract_version() {
+    func testExtractVersion() {
         XCTAssertEqual(VersionExtractor.from("Laravel Valet 2.17.1"), "2.17.1")
         XCTAssertEqual(VersionExtractor.from("Laravel Valet 2.0"), "2.0")
     }
 
-    func test_version_comparison() {
+    func testVersionComparison() {
         XCTAssertEqual("2.0".versionCompare("2.1"), .orderedAscending)
         XCTAssertEqual("2.1".versionCompare("2.0"), .orderedDescending)
         XCTAssertEqual("2.0".versionCompare("2.0"), .orderedSame)

phpmon/Assets.xcassets/AppColor.colorset/Contents.json

@@ -7,7 +7,7 @@
           "alpha" : "1.000",
           "blue" : "0.988",
           "green" : "0.580",
-          "red" : "0.278"
+          "red" : "0.277"
         }
       },
       "idiom" : "universal"

phpmon/Assets.xcassets/AppIconEA.appiconset/Contents.json

@@ -1,68 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icon_16x16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "icon_16x16@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "icon_32x32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "icon_32x32@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "icon_128x128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "icon_128x128@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "icon_256x256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "icon_256x256@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "icon_512x512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "icon_512x512@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

phpmon/Assets.xcassets/StatusColorGreen.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.501",
-          "green" : "0.697",
-          "red" : "0.247"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.501",
-          "green" : "0.765",
-          "red" : "0.247"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

phpmon/Assets.xcassets/StatusColorRed.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.180",
-          "green" : "0.000",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.426",
-          "green" : "0.363",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

phpmon/Assets.xcassets/StatusColorYellow.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.180",
-          "green" : "0.841",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.426",
-          "green" : "0.809",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

phpmon/Common/Command/ActiveCommand.swift

@@ -1,25 +0,0 @@
-//
-//  ActiveCommand.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 12/10/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-var Command: CommandProtocol {
-    return ActiveCommand.shared
-}
-
-class ActiveCommand {
-    static var shared: CommandProtocol = RealCommand()
-
-    public static func useTestable(_ output: [String: String]) {
-        Self.shared = TestableCommand(commands: output)
-    }
-
-    public static func useSystem() {
-        Self.shared = RealCommand()
-    }
-}

phpmon/Common/Command/CommandProtocol.swift

@@ -1,22 +0,0 @@
-//
-//  CommandProtocol.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 12/10/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-protocol CommandProtocol {
-
-    /**
-     Immediately executes a command.
-
-     - Parameter path: The path of the command or program to invoke.
-     - Parameter arguments: A list of arguments that are passed on.
-     - Parameter trimNewlines: Removes empty new line output.
-     */
-    func execute(path: String, arguments: [String], trimNewlines: Bool) -> String
-
-}

phpmon/Common/Core/Actions.swift

@@ -2,7 +2,7 @@
 //  Services.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -12,22 +12,22 @@ class Actions {
 
     // MARK: - Services
 
-    public static func restartPhpFpm() async {
-        await brew("services restart \(Homebrew.Formulae.php.name)", sudo: Homebrew.Formulae.php.elevated)
+    public static func restartPhpFpm() {
+        brew("services restart \(Homebrew.Formulae.php)", sudo: true)
     }
 
-    public static func restartNginx() async {
-        await brew("services restart \(Homebrew.Formulae.nginx.name)", sudo: Homebrew.Formulae.nginx.elevated)
+    public static func restartNginx() {
+        brew("services restart \(Homebrew.Formulae.nginx)", sudo: true)
     }
 
-    public static func restartDnsMasq() async {
-        await brew("services restart \(Homebrew.Formulae.dnsmasq.name)", sudo: Homebrew.Formulae.dnsmasq.elevated)
+    public static func restartDnsMasq() {
+        brew("services restart \(Homebrew.Formulae.dnsmasq)", sudo: true)
     }
 
-    public static func stopValetServices() async {
-        await brew("services stop \(Homebrew.Formulae.php)", sudo: Homebrew.Formulae.php.elevated)
-        await brew("services stop \(Homebrew.Formulae.nginx)", sudo: Homebrew.Formulae.nginx.elevated)
-        await brew("services stop \(Homebrew.Formulae.dnsmasq)", sudo: Homebrew.Formulae.dnsmasq.elevated)
+    public static func stopValetServices() {
+        brew("services stop \(Homebrew.Formulae.php)", sudo: true)
+        brew("services stop \(Homebrew.Formulae.nginx)", sudo: true)
+        brew("services stop \(Homebrew.Formulae.dnsmasq)", sudo: true)
     }
 
     public static func fixHomebrewPermissions() throws {
@@ -35,16 +35,13 @@ class Actions {
             "\(Paths.brew) services stop \(Homebrew.Formulae.nginx)",
             "\(Paths.brew) services stop \(Homebrew.Formulae.dnsmasq)"
         ]
-
         var cellarCommands = [
             "chown -R \(Paths.whoami):admin \(Paths.cellarPath)/\(Homebrew.Formulae.nginx)",
             "chown -R \(Paths.whoami):admin \(Paths.cellarPath)/\(Homebrew.Formulae.dnsmasq)"
         ]
 
         PhpEnv.shared.availablePhpVersions.forEach { version in
-            let formula = version == PhpEnv.brewPhpAlias
-                ? "php"
-                : "php@\(version)"
+            let formula = version == PhpEnv.brewPhpVersion ? "php" : "php@\(version)"
             servicesCommands.append("\(Paths.brew) services stop \(formula)")
             cellarCommands.append("chown -R \(Paths.whoami):admin \(Paths.cellarPath)/\(formula)")
         }
@@ -65,6 +62,29 @@ class Actions {
         }
     }
 
+    // MARK: - Third Party Services
+    public static func stopService(name: String, completion: @escaping () -> Void) {
+        DispatchQueue.global(qos: .userInitiated).async {
+            brew("services stop \(name)", sudo: ServicesManager.shared.rootServices.contains { $0.value.name == name })
+            ServicesManager.loadHomebrewServices(completed: {
+                DispatchQueue.main.async {
+                    completion()
+                }
+            })
+        }
+    }
+
+    public static func startService(name: String, completion: @escaping () -> Void) {
+        DispatchQueue.global(qos: .userInitiated).async {
+            brew("services start \(name)", sudo: ServicesManager.shared.rootServices.contains { $0.value.name == name })
+            ServicesManager.loadHomebrewServices(completed: {
+                DispatchQueue.main.async {
+                    completion()
+                }
+            })
+        }
+    }
+
     // MARK: - Finding Config Files
 
     public static func openGenericPhpConfigFolder() {
@@ -72,33 +92,37 @@ class Actions {
         NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
     }
 
+    public static func openGlobalComposerFolder() {
+        let file = FileManager.default.homeDirectoryForCurrentUser
+            .appendingPathComponent(".composer/composer.json")
+        NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
+    }
+
     public static func openPhpConfigFolder(version: String) {
         let files = [NSURL(fileURLWithPath: "\(Paths.etcPath)/php/\(version)/php.ini")]
         NSWorkspace.shared.activateFileViewerSelecting(files as [URL])
     }
 
-    public static func openGlobalComposerFolder() {
-        let file = URL(string: "file://~/.composer/composer.json".replacingTildeWithHomeDirectory)!
-        NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
-    }
-
     public static func openValetConfigFolder() {
-        let file = URL(string: "file://~/.config/valet".replacingTildeWithHomeDirectory)!
+        let file = FileManager.default.homeDirectoryForCurrentUser
+            .appendingPathComponent(".config/valet")
         NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
     }
 
     public static func openPhpMonitorConfigFile() {
-        let file = URL(string: "file://~/.config/phpmon".replacingTildeWithHomeDirectory)!
+        let file = FileManager.default.homeDirectoryForCurrentUser
+            .appendingPathComponent(".config/phpmon")
         NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
     }
 
     // MARK: - Other Actions
 
-    public static func createTempPhpInfoFile() async -> URL {
-        try! FileSystem.writeAtomicallyToFile("/tmp/phpmon_phpinfo.php", content: "<?php phpinfo();")
+    public static func createTempPhpInfoFile() -> URL {
+        // Write a file called `phpmon_phpinfo.php` to /tmp
+        try! "<?php phpinfo();".write(toFile: "/tmp/phpmon_phpinfo.php", atomically: true, encoding: .utf8)
 
         // Tell php-cgi to run the PHP and output as an .html file
-        await Shell.quiet("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
+        Shell.run("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
 
         return URL(string: "file:///private/tmp/phpmon_phpinfo.html")!
     }
@@ -117,10 +141,12 @@ class Actions {
      If this does not solve the issue, the user may need to install additional
      extensions and/or run `composer global update`.
      */
-    public static func fixMyValet() async {
-        await InternalSwitcher().performSwitch(to: PhpEnv.brewPhpAlias)
-        await brew("services restart \(Homebrew.Formulae.dnsmasq)", sudo: Homebrew.Formulae.dnsmasq.elevated)
-        await brew("services restart \(Homebrew.Formulae.php)", sudo: Homebrew.Formulae.php.elevated)
-        await brew("services restart \(Homebrew.Formulae.nginx)", sudo: Homebrew.Formulae.nginx.elevated)
+    public static func fixMyValet(completed: @escaping () -> Void) {
+        InternalSwitcher().performSwitch(to: PhpEnv.brewPhpVersion, completion: {
+            brew("services restart \(Homebrew.Formulae.dnsmasq)", sudo: true)
+            brew("services restart \(Homebrew.Formulae.php)", sudo: true)
+            brew("services restart \(Homebrew.Formulae.nginx)", sudo: true)
+            completed()
+        })
     }
 }

phpmon/Common/Core/Command.swift

@@ -2,14 +2,21 @@
 //  Command.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
 
-public class RealCommand: CommandProtocol {
+public class Command {
 
-    public func execute(path: String, arguments: [String], trimNewlines: Bool = false) -> String {
+    /**
+     Immediately executes a command.
+     
+     - Parameter path: The path of the command or program to invoke.
+     - Parameter arguments: A list of arguments that are passed on.
+     - Parameter trimNewlines: Removes empty new line output.
+     */
+    public static func execute(path: String, arguments: [String], trimNewlines: Bool = false) -> String {
         let task = Process()
         task.launchPath = path
         task.arguments = arguments

phpmon/Common/Core/Constants.swift

@@ -2,7 +2,7 @@
 //  Constants.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
@@ -13,43 +13,37 @@ struct Constants {
      The minimum version of Valet that is recommended.
      If the installed version is older, a notification will be shown
      every time the app launches (with a recommendation to upgrade).
-
+     
+     The minimum requirement is currently synced to PHP 8.1 compatibility.
      See also: https://github.com/laravel/valet/releases/tag/v2.16.2
      */
     static let MinimumRecommendedValetVersion = "2.16.2"
 
     /**
      * The PHP versions supported by this application.
-     * Any other PHP versions are considered invalid.
+     * Versions that do not appear in this array are omitted from the list.
      */
-    static let DetectedPhpVersions: Set = [
-        "5.6",
-        "7.0", "7.1", "7.2", "7.3", "7.4",
-        "8.0", "8.1", "8.2", "8.3"
-    ]
+    static let SupportedPhpVersions = [
+        // ====================
+        // STABLE RELEASES
+        // ====================
+        // Versions of PHP that are stable and are supported.
+        "5.6", // only supported when Valet 2.x is active
+        "7.0",
+        "7.1",
+        "7.2",
+        "7.3",
+        "7.4",
+        "8.0",
+        "8.1",
+        "8.2",
 
-    /**
-     The PHP versions supported by each version of Valet.
-     */
-    static let ValetSupportedPhpVersionMatrix: [Int: Set] = [
-        2: // Valet v2 has the broadest legacy support
-        [
-            "5.6",
-            "7.0", "7.1", "7.2", "7.3", "7.4",
-            "8.0", "8.1", "8.2"
-        ],
-        3: // Valet v3 dropped support for v5.6
-        [
-            "7.0", "7.1", "7.2", "7.3", "7.4",
-            "8.0", "8.1", "8.2",
-            "8.3" // dev
-        ],
-        4: // Valet v4 dropped support for v7.0
-        [
-            "7.1", "7.2", "7.3", "7.4",
-            "8.0", "8.1", "8.2",
-            "8.3" // dev
-        ]
+        // ====================
+        // EXPERIMENTAL SUPPORT
+        // ====================
+        // Every release that supports the next release will always support the next
+        // dev release. In this case, that means that the version below is detected.
+        "8.3"
     ]
 
     struct Urls {

phpmon/Common/Core/Events.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 23/01/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Core/Helpers.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 24/12/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 // MARK: Common Shell Commands
@@ -11,49 +11,41 @@
 /**
  Runs a `valet` command. Defaults to running as superuser.
  */
-func valet(_ command: String, sudo: Bool = true) async -> String {
-    return await Shell.pipe("\(sudo ? "sudo " : "")" + "\(Paths.valet) \(command)").out
+func valet(_ command: String, sudo: Bool = true) -> String {
+    return Shell.pipe("\(sudo ? "sudo " : "")" + "\(Paths.valet) \(command)", requiresPath: true)
 }
 
 /**
  Runs a `brew` command. Can run as superuser.
  */
-func brew(_ command: String, sudo: Bool = false) async {
-    await Shell.quiet("\(sudo ? "sudo " : "")" + "\(Paths.brew) \(command)")
+func brew(_ command: String, sudo: Bool = false) {
+    Shell.run("\(sudo ? "sudo " : "")" + "\(Paths.brew) \(command)")
 }
 
 /**
  Runs `sed` in order to replace all occurrences of a string in a specific file with another.
  */
-func sed(file: String, original: String, replacement: String) async {
+func sed(file: String, original: String, replacement: String) {
     // Escape slashes (or `sed` won't work)
     let e_original = original.replacingOccurrences(of: "/", with: "\\/")
     let e_replacement = replacement.replacingOccurrences(of: "/", with: "\\/")
 
     // Check if gsed exists; it is able to follow symlinks,
     // which we want to do to toggle the extension
-    if FileSystem.fileExists("\(Paths.binPath)/gsed") {
-        await Shell.quiet("\(Paths.binPath)/gsed -i --follow-symlinks 's/\(e_original)/\(e_replacement)/g' \(file)")
+    if Filesystem.fileExists("\(Paths.binPath)/gsed") {
+        Shell.run("\(Paths.binPath)/gsed -i --follow-symlinks 's/\(e_original)/\(e_replacement)/g' \(file)")
     } else {
-        await Shell.quiet("sed -i '' 's/\(e_original)/\(e_replacement)/g' \(file)")
+        Shell.run("sed -i '' 's/\(e_original)/\(e_replacement)/g' \(file)")
     }
 }
 
 /**
  Uses `grep` to determine whether a particular query string can be found in a particular file.
  */
-func grepContains(file: String, query: String) async -> Bool {
-    return await Shell.pipe("""
+func grepContains(file: String, query: String) -> Bool {
+    return Shell.pipe("""
             grep -q '\(query)' \(file); [ $? -eq 0 ] && echo "YES" || echo "NO"
-            """).out
+            """)
         .trimmingCharacters(in: .whitespacesAndNewlines)
         .contains("YES")
 }
-
-/**
- Attempts to introduce sleep for a particular duration. Use with caution.
- Only intended for testing purposes.
- */
-func delay(seconds: Double) async {
-    try! await Task.sleep(nanoseconds: UInt64(seconds * 1_000_000_000))
-}

phpmon/Common/Core/Homebrew.swift

@@ -3,54 +3,23 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 21/11/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
 
 class Homebrew {
-    static var fake: Bool = false
-
     struct Formulae {
-        static var php: HomebrewFormula {
-            if Homebrew.fake {
-                return HomebrewFormula("php", elevated: true)
-            }
-
-            if PhpEnv.shared.homebrewPackage == nil {
-                fatalError("You must either load the HomebrewPackage object or call `fake` on the Homebrew class.")
-            }
-
-            return HomebrewFormula(PhpEnv.phpInstall.formula, elevated: true)
+        static var php: String {
+            return PhpEnv.phpInstall.formula
         }
 
-        static var nginx: HomebrewFormula {
-            return HomebrewDiagnostics.usesNginxFullFormula
-                ? HomebrewFormula("nginx-full", elevated: true)
-                : HomebrewFormula("nginx", elevated: true)
+        static var nginx: String {
+            return HomebrewDiagnostics.usesNginxFullFormula ? "nginx-full" : "nginx"
         }
 
-        static var dnsmasq: HomebrewFormula {
-            return HomebrewFormula("dnsmasq", elevated: true)
+        static var dnsmasq: String {
+            return "dnsmasq"
         }
     }
 }
-
-class HomebrewFormula: Equatable, Hashable {
-    let name: String
-    let elevated: Bool
-
-    init(_ name: String, elevated: Bool = true) {
-        self.name = name
-        self.elevated = elevated
-    }
-
-    static func == (lhs: HomebrewFormula, rhs: HomebrewFormula) -> Bool {
-        return lhs.elevated == rhs.elevated && lhs.name == rhs.name
-    }
-
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(name)
-        hasher.combine(elevated)
-    }
-}

phpmon/Common/Core/Logger.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 21/12/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Core/Paths.swift

@@ -2,7 +2,7 @@
 //  Paths.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -17,15 +17,11 @@ public class Paths {
 
     internal var baseDir: Paths.HomebrewDir
 
-    private var userName: String! = nil
+    private var userName: String
 
     init() {
         baseDir = App.architecture != "x86_64" ? .opt : .usr
-    }
-
-    public func loadUser() async {
-        let output = await Shell.pipe("id -un").out
-        userName = String(output.split(separator: "\n")[0])
+        userName = String(Shell.pipe("id -un").split(separator: "\n")[0])
     }
 
     public func detectBinaryPaths() {
@@ -62,16 +58,7 @@ public class Paths {
     }
 
     public static var homePath: String {
-        if FileSystem is RealFileSystem {
-            return NSHomeDirectory()
-        }
-
-        if FileSystem is TestableFileSystem {
-            let fs = FileSystem as! TestableFileSystem
-            return fs.homeDirectory
-        }
-
-        fatalError("A valid FileSystem must be allowed to return the home path")
+        return NSHomeDirectory()
     }
 
     public static var cellarPath: String {
@@ -95,9 +82,9 @@ public class Paths {
     // (PHP Monitor will not use the user's own PATH)
 
     private func detectComposerBinary() {
-        if FileSystem.fileExists("/usr/local/bin/composer") {
+        if Filesystem.fileExists("/usr/local/bin/composer") {
             Paths.composer = "/usr/local/bin/composer"
-        } else if FileSystem.fileExists("/opt/homebrew/bin/composer") {
+        } else if Filesystem.fileExists("/opt/homebrew/bin/composer") {
             Paths.composer = "/opt/homebrew/bin/composer"
         } else {
             Paths.composer = nil

phpmon/Common/Core/Process.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 23/02/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Core/Shell+PATH.swift

@@ -0,0 +1,33 @@
+//
+//  Shell+PATH.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 15/08/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+extension Shell {
+
+    var PATH: String {
+        let task = Process()
+        task.launchPath = "/bin/zsh"
+
+        let command = Filesystem.fileExists("~/.zshrc")
+            // source the user's .zshrc file if it exists to complete $PATH
+            ? ". ~/.zshrc && echo $PATH"
+            // otherwise, non-interactive mode is sufficient
+            : "echo $PATH"
+
+        task.arguments = ["--login", "-lc", command]
+
+        let pipe = Pipe()
+        task.standardOutput = pipe
+        task.launch()
+
+        let data = pipe.fileHandleForReading.readDataToEndOfFile()
+
+        return String(data: data, encoding: String.Encoding.utf8) ?? ""
+    }
+}

phpmon/Common/Core/Shell.swift

@@ -0,0 +1,171 @@
+//
+//  Shell.swift
+//  PHP Monitor
+//
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+public class Shell {
+
+    // MARK: - Invoke static functions
+
+    public static func run(
+        _ command: String,
+        requiresPath: Bool = false
+    ) {
+        Shell.user.run(command, requiresPath: requiresPath)
+    }
+
+    public static func pipe(
+        _ command: String,
+        requiresPath: Bool = false
+    ) -> String {
+        return Shell.user.pipe(command, requiresPath: requiresPath)
+    }
+
+    // MARK: - Singleton
+
+    /**
+     We now require macOS 11, so no need to detect which terminal to use.
+     */
+    public var shell: String = "/bin/sh"
+
+    /** Additional exports that are sent if `requiresPath` is set to true. */
+    public var exports: String = ""
+
+    /**
+     Singleton to access a user shell (with --login)
+     */
+    public static let user = Shell()
+
+    /**
+     Runs a shell command without using the output.
+     Uses the default shell.
+     
+     - Parameter command: The command to run
+     - Parameter requiresPath: By default, the PATH is not resolved but some binaries might require this
+     */
+    private func run(
+        _ command: String,
+        requiresPath: Bool = false
+    ) {
+        // Equivalent of piping to /dev/null; don't do anything with the string
+        _ = Shell.pipe(command, requiresPath: requiresPath)
+    }
+
+    /**
+     Runs a shell command and returns the output.
+     
+     - Parameter command: The command to run
+     - Parameter requiresPath: By default, the PATH is not resolved but some binaries might require this
+     */
+    private func pipe(
+        _ command: String,
+        requiresPath: Bool = false
+    ) -> String {
+        let shellOutput = self.executeSynchronously(command, requiresPath: requiresPath)
+        let hasError = (
+            shellOutput.standardOutput == ""
+            && shellOutput.errorOutput.lengthOfBytes(using: .utf8) > 0
+        )
+        return !hasError ? shellOutput.standardOutput : shellOutput.errorOutput
+    }
+
+    /**
+     Runs the command and returns a `ShellOutput` object, which contains info about the process.
+     
+     - Parameter command: The command to run
+     - Parameter requiresPath: By default, the PATH is not resolved but some binaries might require this
+     - Parameter waitUntilExit: Waits for the command to complete before returning the `ShellOutput`
+     */
+    public func executeSynchronously(
+        _ command: String,
+        requiresPath: Bool = false
+    ) -> Shell.Output {
+
+        let outputPipe = Pipe()
+        let errorPipe = Pipe()
+
+        let task = self.createTask(for: command, requiresPath: requiresPath)
+        task.standardOutput = outputPipe
+        task.standardError = errorPipe
+        task.launch()
+        task.waitUntilExit()
+
+        let output = Shell.Output(
+            standardOutput: String(
+                data: outputPipe.fileHandleForReading.readDataToEndOfFile(),
+                encoding: .utf8
+            )!,
+            errorOutput: String(
+                data: errorPipe.fileHandleForReading.readDataToEndOfFile(),
+                encoding: .utf8
+            )!,
+            task: task
+        )
+
+        if CommandLine.arguments.contains("--v") {
+            log(task: task, output: output)
+        }
+
+        return output
+    }
+
+    /**
+     Creates a new process with the correct PATH and shell.
+     */
+    public func createTask(for command: String, requiresPath: Bool) -> Process {
+        var completeCommand = ""
+
+        if requiresPath {
+            // Basic export (PATH)
+            completeCommand += "export PATH=\(Paths.binPath):$PATH && "
+
+            // Put additional exports in between
+            if !self.exports.isEmpty {
+                completeCommand += "\(self.exports) && "
+            }
+        }
+
+        completeCommand += command
+
+        let task = Process()
+        task.launchPath = self.shell
+        task.arguments = ["--noprofile", "-norc", "--login", "-c", completeCommand]
+
+        return task
+    }
+
+    /**
+     Verbose logging for PHP Monitor's synchronous shell output.
+     */
+    private func log(task: Process, output: Output) {
+        Log.info("")
+        Log.info("==== COMMAND ====")
+        Log.info("")
+        Log.info("\(self.shell) \(task.arguments?.joined(separator: " ") ?? "")")
+        Log.info("")
+        Log.info("==== OUTPUT ====")
+        Log.info("")
+        dump(output)
+        Log.info("")
+        Log.info("==== END OUTPUT ====")
+        Log.info("")
+    }
+
+    public class Output {
+        public let standardOutput: String
+        public let errorOutput: String
+        public let task: Process
+
+        init(standardOutput: String,
+             errorOutput: String,
+             task: Process) {
+            self.standardOutput = standardOutput
+            self.errorOutput = errorOutput
+            self.task = task
+        }
+    }
+}

phpmon/Common/Errors/AlertableError.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 06/02/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Errors/Errors.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 08/02/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Extensions/ArrayExtension.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 11/06/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Extensions/DataExtension.swift

@@ -1,21 +0,0 @@
-//
-//  DataExtension.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 16/10/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-extension Data {
-    var prettyPrintedJSONString: NSString? {
-        guard let object = try? JSONSerialization.jsonObject(with: self, options: []),
-              let data = try? JSONSerialization.data(withJSONObject: object, options: [.prettyPrinted]),
-              let prettyPrintedString = NSString(data: data, encoding: String.Encoding.utf8.rawValue) else {
-            return nil
-        }
-
-        return prettyPrintedString
-    }
-}

phpmon/Common/Extensions/DateExtension.swift

@@ -2,7 +2,7 @@
 //  Date.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa

phpmon/Common/Extensions/DictionaryExtension.swift

@@ -1,17 +0,0 @@
-//
-//  DictionaryExtension.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 01/11/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-extension Dictionary {
-    mutating func renameKey(fromKey: Key, toKey: Key) {
-        if let entry = removeValue(forKey: fromKey) {
-            self[toKey] = entry
-        }
-    }
-}

phpmon/Common/Extensions/NSMenuExtension.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 14/04/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa

phpmon/Common/Extensions/NSMenuItemExtension.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 18/08/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa

phpmon/Common/Extensions/NSWindowExtension.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 17/02/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Extensions/StringExtension.swift

@@ -2,43 +2,20 @@
 //  StringExtension.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 import Foundation
 import SwiftUI
 
-struct Localization {
-    static var bundle: Bundle = {
-        if !isRunningTests {
-            return Bundle.main
-        }
-
-        let foundBundle = Bundle(identifier: "com.nicoverbruggen.phpmon.dev")
-            ?? Bundle(identifier: "com.nicoverbruggen.phpmon")
-            ?? Bundle(identifier: "com.nicoverbruggen.phpmon.ui-tests")
-
-        if foundBundle == nil {
-            let bundles = Bundle.allBundles
-                .map { $0.bundleIdentifier }
-                .filter { $0 != nil }
-                .map { $0! }
-
-            fatalError("The following bundles were found: \(bundles)")
-        }
-
-        return foundBundle!
-    }()
-}
-
 extension String {
     var localized: String {
         if #available(macOS 13, *) {
             return NSLocalizedString(
-                self, tableName: nil, bundle: Localization.bundle, value: "", comment: ""
+                self, tableName: nil, bundle: Bundle.main, value: "", comment: ""
             ).replacingOccurrences(of: "Preferences", with: "Settings")
         }
 
-        return NSLocalizedString(self, tableName: nil, bundle: Localization.bundle, value: "", comment: "")
+        return NSLocalizedString(self, tableName: nil, bundle: Bundle.main, value: "", comment: "")
     }
 
     var localizedForSwiftUI: LocalizedStringKey {
@@ -65,16 +42,6 @@ extension String {
         return count
     }
 
-    func matches(pattern: String) -> Bool {
-        let pred = NSPredicate(format: "self LIKE %@", pattern)
-        return !NSArray(object: self).filtered(using: pred).isEmpty
-    }
-
-    static func random(_ length: Int) -> String {
-        let characters = "0123456789abcdefghijklmnopqrstuvwxyz"
-        return String((0..<length).map { _ in characters.randomElement()! })
-    }
-
     subscript(r: Range<String.Index>) -> String {
         let start = r.lowerBound
         let end = r.upperBound
@@ -131,4 +98,5 @@ extension String {
             return ""
         }
     }
+
 }

phpmon/Common/Extensions/TimeIntervalExtension.swift

@@ -1,15 +0,0 @@
-//
-//  TimeExtension.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 29/09/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-extension TimeInterval {
-    public static func minutes(_ amount: Int) -> TimeInterval {
-        return Double(amount * 60)
-    }
-}

phpmon/Common/Extensions/XibLoadable.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 04/02/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Filesystem/ActiveFileSystem.swift

@@ -1,26 +0,0 @@
-//
-//  FS.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 08/10/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-var FileSystem: FileSystemProtocol {
-    return ActiveFileSystem.shared
-}
-
-class ActiveFileSystem {
-    static var shared: FileSystemProtocol = RealFileSystem()
-
-    /** Note: Intermediate directories are not automatically inferred and have to be manually declared. */
-    public static func useTestable(_ files: [String: FakeFile]) {
-        Self.shared = TestableFileSystem(files: files)
-    }
-
-    public static func useSystem() {
-        Self.shared = RealFileSystem()
-    }
-}

phpmon/Common/Filesystem/FileSystemProtocol.swift

@@ -1,50 +0,0 @@
-//
-//  FileSystemProtocol.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 08/10/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-protocol FileSystemProtocol {
-
-    // MARK: - Basics
-
-    func createDirectory(_ path: String, withIntermediateDirectories: Bool) throws
-
-    func writeAtomicallyToFile(_ path: String, content: String) throws
-
-    func getStringFromFile(_ path: String) throws -> String
-
-    func getShallowContentsOfDirectory(_ path: String) throws -> [String]
-
-    func getDestinationOfSymlink(_ path: String) throws -> String
-
-    // MARK: - Move & Delete Files
-
-    func move(from path: String, to newPath: String) throws
-
-    func remove(_ path: String) throws
-
-    // MARK: — Attributes
-
-    func makeExecutable(_ path: String) throws
-
-    // MARK: - Checks
-
-    func isExecutableFile(_ path: String) -> Bool
-
-    func isWriteableFile(_ path: String) -> Bool
-
-    func anyExists(_ path: String) -> Bool
-
-    func fileExists(_ path: String) -> Bool
-
-    func directoryExists(_ path: String) -> Bool
-
-    func isSymlink(_ path: String) -> Bool
-
-    func isDirectory(_ path: String) -> Bool
-}

phpmon/Common/Filesystem/RealFileSystem.swift

@@ -1,126 +0,0 @@
-//
-//  RealFileSystem.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 08/10/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-extension String {
-    var replacingTildeWithHomeDirectory: String {
-        return self.replacingOccurrences(of: "~", with: Paths.homePath)
-    }
-}
-
-class RealFileSystem: FileSystemProtocol {
-
-    // MARK: - Basics
-
-    func createDirectory(_ path: String, withIntermediateDirectories: Bool) {
-        try! FileManager.default.createDirectory(
-            atPath: path.replacingTildeWithHomeDirectory,
-            withIntermediateDirectories: withIntermediateDirectories
-        )
-    }
-
-    func writeAtomicallyToFile(_ path: String, content: String) throws {
-        try content.write(
-            to: URL(fileURLWithPath: path.replacingTildeWithHomeDirectory),
-            atomically: true,
-            encoding: String.Encoding.utf8
-        )
-    }
-
-    func getStringFromFile(_ path: String) throws -> String {
-        return try String(
-            contentsOf: URL(fileURLWithPath: path.replacingTildeWithHomeDirectory),
-            encoding: .utf8
-        )
-    }
-
-    func getShallowContentsOfDirectory(_ path: String) throws -> [String] {
-        return try FileManager.default.contentsOfDirectory(atPath: path)
-    }
-
-    func getDestinationOfSymlink(_ path: String) throws -> String {
-        return try FileManager.default.destinationOfSymbolicLink(atPath: path)
-    }
-
-    // MARK: - Move & Delete Files
-
-    func move(from path: String, to newPath: String) throws {
-        try FileManager.default.moveItem(atPath: path, toPath: newPath)
-    }
-
-    func remove(_ path: String) throws {
-        try FileManager.default.removeItem(atPath: path)
-    }
-
-    // MARK: — FS Attributes
-
-    func makeExecutable(_ path: String) throws {
-        _ = system("chmod +x \(path.replacingTildeWithHomeDirectory)")
-    }
-
-    // MARK: - Checks
-
-    func isExecutableFile(_ path: String) -> Bool {
-        return FileManager.default.isExecutableFile(
-            atPath: path.replacingTildeWithHomeDirectory
-        ) && FileManager.default.isReadableFile(
-            atPath: path.replacingTildeWithHomeDirectory
-        )
-    }
-
-    func isWriteableFile(_ path: String) -> Bool {
-        return FileManager.default.isWritableFile(
-            atPath: path.replacingTildeWithHomeDirectory
-        )
-    }
-
-    func anyExists(_ path: String) -> Bool {
-        return FileManager.default.fileExists(
-            atPath: path.replacingTildeWithHomeDirectory
-        )
-    }
-
-    func fileExists(_ path: String) -> Bool {
-        var isDirectory: ObjCBool = true
-        let exists = FileManager.default.fileExists(
-            atPath: path.replacingTildeWithHomeDirectory,
-            isDirectory: &isDirectory
-        )
-
-        return exists && !isDirectory.boolValue
-    }
-
-    func directoryExists(_ path: String) -> Bool {
-        var isDirectory: ObjCBool = true
-        let exists = FileManager.default.fileExists(
-            atPath: path.replacingTildeWithHomeDirectory,
-            isDirectory: &isDirectory
-        )
-
-        return exists && isDirectory.boolValue
-    }
-
-    func isSymlink(_ path: String) -> Bool {
-        do {
-            let attribs = try FileManager.default.attributesOfItem(atPath: path)
-            return attribs[.type] as! FileAttributeType == FileAttributeType.typeSymbolicLink
-        } catch {
-            return false
-        }
-    }
-
-    func isDirectory(_ path: String) -> Bool {
-        do {
-            let attribs = try FileManager.default.attributesOfItem(atPath: path)
-            return attribs[.type] as! FileAttributeType == FileAttributeType.typeDirectory
-        } catch {
-            return false
-        }
-    }
-}

phpmon/Common/Helpers/Alert.swift

@@ -2,7 +2,7 @@
 //  Alert.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
@@ -13,8 +13,8 @@ class Alert {
         onWindow window: NSWindow,
         messageText: String,
         informativeText: String,
-        buttonTitle: String = "generic.ok".localized,
-        secondButtonTitle: String = "generic.cancel".localized,
+        buttonTitle: String = "OK",
+        secondButtonTitle: String = "Cancel",
         style: NSAlert.Style = .warning,
         onFirstButtonPressed: @escaping (() -> Void)
     ) {

phpmon/Common/Helpers/Application.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 07/12/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -34,45 +34,30 @@ class Application {
      (This will open the app if it isn't open yet.)
      */
     @objc public func openDirectory(file: String) {
-        Task { await Shell.quiet("/usr/bin/open -a \"\(name)\" \"\(file)\"") }
+        return Shell.run("/usr/bin/open -a \"\(name)\" \"\(file)\"")
     }
 
     /** Checks if the app is installed. */
-    func isInstalled() async -> Bool {
-
-        let (process, output) = try! await Shell.attach(
+    func isInstalled() -> Bool {
+        // If this script does not complain, the app exists!
+        return Shell.user.executeSynchronously(
             "/usr/bin/open -Ra \"\(name)\"",
-            didReceiveOutput: { _, _ in },
-            withTimeout: 2.0
-        )
-
-        if Shell is TestableShell {
-            // When testing, check the error output (must not be empty)
-            return !output.hasError
-        } else {
-            // If this script does not complain, the app exists!
-            return process.terminationStatus == 0
-        }
+            requiresPath: false
+        ).task.terminationStatus == 0
     }
 
     /**
      Detect which apps are available to open a specific directory.
      */
-    static public func detectPresetApplications() async -> [Application] {
-        var detected: [Application] = []
-
-        let detectable = [
+    static public func detectPresetApplications() -> [Application] {
+        return [
             Application("PhpStorm", .editor),
             Application("Visual Studio Code", .editor),
             Application("Sublime Text", .editor),
             Application("Sublime Merge", .git_gui),
             Application("iTerm", .terminal)
-        ]
-
-        for app in detectable where await app.isInstalled() {
-            detected.append(app)
+        ].filter {
+            return $0.isInstalled()
         }
-
-        return detected
     }
 }

phpmon/Common/Helpers/Filesystem.swift

@@ -0,0 +1,61 @@
+//
+//  Filesystem.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 07/12/2021.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+import Foundation
+
+class Filesystem {
+
+    /**
+     Checks if a file or directory exists at the provided path.
+     */
+    public static func exists(_ path: String) -> Bool {
+        return FileManager.default.fileExists(
+            atPath: path.replacingOccurrences(of: "~", with: Paths.homePath)
+        )
+    }
+
+    /**
+     Checks if a file exists at the provided path.
+     */
+    public static func fileExists(_ path: String) -> Bool {
+        var isDirectory: ObjCBool = true
+        let exists = FileManager.default.fileExists(
+            atPath: path.replacingOccurrences(of: "~", with: Paths.homePath),
+            isDirectory: &isDirectory
+        )
+
+        return exists && !isDirectory.boolValue
+    }
+
+    /**
+     Checks if a directory exists at the provided path.
+     */
+    public static func directoryExists(_ path: String) -> Bool {
+        var isDirectory: ObjCBool = true
+        let exists = FileManager.default.fileExists(
+            atPath: path.replacingOccurrences(of: "~", with: Paths.homePath),
+            isDirectory: &isDirectory
+        )
+
+        return exists && isDirectory.boolValue
+    }
+
+    /**
+     Checks if a given file is a symbolic link.
+     */
+    public static func fileIsSymlink(_ path: String) -> Bool {
+        do {
+            let attribs = try FileManager.default.attributesOfItem(atPath: path)
+            return attribs[.type] as! FileAttributeType == FileAttributeType.typeSymbolicLink
+        } catch {
+            return false
+        }
+    }
+
+}

phpmon/Common/Helpers/LocalNotification.swift

@@ -2,7 +2,7 @@
 //  LocalNotification.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Helpers/MenuBarImageGenerator.swift

@@ -2,7 +2,7 @@
 //  ImageGenerator.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa

phpmon/Common/Helpers/PMWindowController.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 05/12/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa

phpmon/Common/Helpers/System.swift

@@ -1,28 +0,0 @@
-//
-//  System.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 01/11/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-/**
- Run a simple blocking Shell command on the user's own system.
- Avoid using this method in favor of the fakeable Shell class unless needed for express system operations.
- */
-public func system(_ command: String) -> String {
-    let task = Process()
-    task.launchPath = "/bin/sh"
-    task.arguments = ["-c", command]
-
-    let pipe = Pipe()
-    task.standardOutput = pipe
-    task.launch()
-
-    let data = pipe.fileHandleForReading.readDataToEndOfFile()
-    let output: String = NSString(data: data, encoding: String.Encoding.utf8.rawValue)! as String
-
-    return output
-}

phpmon/Common/Helpers/VersionExtractor.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 16/12/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Helpers/WIP.swift

@@ -1,17 +0,0 @@
-//
-//  WIP.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 01/11/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-func todo(_ context: String = "") {
-    if !context.isEmpty {
-        fatalError("To be implemented: \(context)")
-    }
-
-    fatalError("To be implemented")
-}

phpmon/Common/PHP/ActivePhpInstallation.swift

@@ -2,7 +2,7 @@
 //  ActivePhpInstallation.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -17,12 +17,11 @@ import Foundation
  Using `version.short` is advisable if you want to interact with Homebrew.
  */
 class ActivePhpInstallation {
-    var version: VersionNumber!
+
+    var version: Version!
     var limits: Limits!
     var iniFiles: [PhpConfigurationFile] = []
 
-    var hasErrorState: Bool = false
-
     var extensions: [PhpExtension] {
         return iniFiles.flatMap { initFile in
             return initFile.extensions
@@ -32,25 +31,20 @@ class ActivePhpInstallation {
     // MARK: - Computed
 
     var formula: String {
-        return (version.short == PhpEnv.brewPhpAlias) ? "php" : "php@\(version.short)"
+        return (version.short == PhpEnv.brewPhpVersion) ? "php" : "php@\(version.short)"
     }
 
     // MARK: - Initializer
 
     init() {
         // Show information about the current version
-        do {
-            try determineVersion()
-        } catch {
-            // TODO: In future versions of PHP Monitor, this should not crash
-            fatalError("Could not determine or parse PHP version; aborting")
-        }
+        getVersion()
 
         // Initialize the list of ini files that are loaded
         iniFiles = []
 
         // If an error occurred, exit early
-        if self.hasErrorState {
+        if version.error {
             limits = Limits()
             return
         }
@@ -70,14 +64,10 @@ class ActivePhpInstallation {
         )
 
         // Return a list of .ini files parsed after php.ini
-        let paths = Command.execute(
-            path: Paths.php,
-            arguments: ["-r", "echo php_ini_scanned_files();"],
-            trimNewlines: false
-        )
-        .replacingOccurrences(of: "\n", with: "")
-        .split(separator: ",")
-        .map { String($0) }
+        let paths = Command.execute(path: Paths.php, arguments: ["-r", "echo php_ini_scanned_files();"])
+            .replacingOccurrences(of: "\n", with: "")
+            .split(separator: ",")
+            .map { String($0) }
 
         // See if any extensions are present in said .ini files
         paths.forEach { (iniFilePath) in
@@ -91,12 +81,26 @@ class ActivePhpInstallation {
      When the app tries to retrieve the version, the installation is considered broken if the output is nothing,
      _or_ if the output contains the word "Warning" or "Error". In normal situations this should not be the case.
      */
-    private func determineVersion() throws {
-        let output = Command.execute(path: Paths.phpConfig, arguments: ["--version"], trimNewlines: true)
+    private func getVersion() {
+        self.version = Version()
 
-        self.hasErrorState = (output == "" || output.contains("Warning") || output.contains("Error"))
+        let version = Command.execute(path: Paths.phpConfig, arguments: ["--version"], trimNewlines: true)
 
-        self.version = try? VersionNumber.parse(output)
+        if version == "" || version.contains("Warning") || version.contains("Error") {
+            self.version.short = "💩 BROKEN"
+            self.version.long = ""
+            self.version.error = true
+            return
+        }
+
+        // That's the long version
+        self.version.long = version
+
+        // Next up, let's strip away the minor version number
+        let segments = self.version.long.components(separatedBy: ".")
+
+        // Get the first two elements
+        self.version.short = segments[0...1].joined(separator: ".")
     }
 
     /**
@@ -115,7 +119,7 @@ class ActivePhpInstallation {
      - Parameter key: The key of the `ini` value that needs to be retrieved. For example, you can use `memory_limit`.
      */
     private func getByteCount(key: String) -> String {
-        let value = Command.execute(path: Paths.php, arguments: ["-r", "echo ini_get('\(key)');"], trimNewlines: false)
+        let value = Command.execute(path: Paths.php, arguments: ["-r", "echo ini_get('\(key)');"])
 
         // Check if the value is unlimited
         if value == "-1" {
@@ -135,20 +139,31 @@ class ActivePhpInstallation {
      versions of PHP, we can just check for the existence of the `valet-fpm.conf` file. If the check here fails,
      that means that Valet won't work properly.
      */
-    func checkPhpFpmStatus() async -> Bool {
+    func checkPhpFpmStatus() -> Bool {
         if self.version.short == "5.6" {
             // The main PHP config file should contain `valet.sock` and then we're probably fine?
             let fileName = "\(Paths.etcPath)/php/5.6/php-fpm.conf"
-            return await Shell.pipe("cat \(fileName)").out
-                .contains("valet.sock")
+            return Shell.pipe("cat \(fileName)").contains("valet.sock")
         }
 
         // Make sure to check if valet-fpm.conf exists. If it does, we should be fine :)
-        return FileSystem.fileExists("\(Paths.etcPath)/php/\(self.version.short)/php-fpm.d/valet-fpm.conf")
+        return Filesystem.fileExists("\(Paths.etcPath)/php/\(self.version.short)/php-fpm.d/valet-fpm.conf")
     }
 
     // MARK: - Structs
 
+    /**
+     Struct containing information about the version number of the current PHP installation.
+     Also includes information about whether the install is considered "broken" or not.
+     If an error was found in the terminal output, `error` is set to `true` and the installation
+     can be considered broken. (The app will display this as well.)
+     */
+    struct Version {
+        var short = "???"
+        var long = "???"
+        var error = false
+    }
+
     /**
      Struct containing information about the limits of the current PHP installation.
      Includes: memory limit, max upload size and max post size.

phpmon/Common/PHP/Extensions/Xdebug.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 01/05/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/PHP/Homebrew/HomebrewPackage.swift

@@ -2,7 +2,7 @@
 //  HomebrewPackage.swift
 //  PHP Monitor
 //
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/PHP/Homebrew/HomebrewService.swift

@@ -3,12 +3,12 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 11/01/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
 
-final class HomebrewService: Sendable, Decodable {
+struct HomebrewService: Decodable, Equatable {
     let name: String
     let service_name: String
     let running: Bool
@@ -19,32 +19,10 @@ final class HomebrewService: Sendable, Decodable {
     let log_path: String?
     let error_log_path: String?
 
-    init(
-        name: String,
-        service_name: String,
-        running: Bool,
-        loaded: Bool,
-        pid: Int? = nil,
-        user: String? = nil,
-        status: String? = nil,
-        log_path: String? = nil,
-        error_log_path: String? = nil
-    ) {
-        self.name = name
-        self.service_name = service_name
-        self.running = running
-        self.loaded = loaded
-        self.pid = pid
-        self.user = user
-        self.status = status
-        self.log_path = log_path
-        self.error_log_path = error_log_path
-    }
-
     /**
      Dummy data for preview purposes.
      */
-    public static func dummy(named service: String, enabled: Bool, status: String? = nil) -> HomebrewService {
+    public static func dummy(named service: String, enabled: Bool) -> Self {
         return HomebrewService(
             name: service,
             service_name: service,
@@ -52,7 +30,7 @@ final class HomebrewService: Sendable, Decodable {
             loaded: enabled,
             pid: nil,
             user: nil,
-            status: status,
+            status: nil,
             log_path: nil,
             error_log_path: nil
         )

phpmon/Common/PHP/PHP Version/PhpEnv.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 21/12/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -14,17 +14,15 @@ class PhpEnv {
 
     init() {
         self.currentInstall = ActivePhpInstallation()
-    }
 
-    func determinePhpAlias() async {
-        let brewPhpAlias = await Shell.pipe("\(Paths.brew) info php --json").out
+        let brewPhpAlias = Shell.pipe("\(Paths.brew) info php --json")
 
         self.homebrewPackage = try! JSONDecoder().decode(
             [HomebrewPackage].self,
             from: brewPhpAlias.data(using: .utf8)!
         ).first!
 
-        Log.info("[BREW] On your system, the `php` formula means version \(homebrewPackage.version)!")
+        Log.info("When on your system, the `php` formula means version \(homebrewPackage.version)!")
     }
 
     // MARK: - Properties
@@ -38,17 +36,14 @@ class PhpEnv {
     /** Whether the switcher is busy performing any actions. */
     var isBusy: Bool = false
 
-    /** All versions of PHP that are currently supported. */
+    /** All available versions of PHP. */
     var availablePhpVersions: [String] = []
 
-    /** All versions of PHP that are currently installed but not compatible. */
-    var incompatiblePhpVersions: [String] = []
-
     /** Cached information about the PHP installations. */
     var cachedPhpInstallations: [String: PhpInstallation] = [:]
 
     /** Information about the currently linked PHP installation. */
-    var currentInstall: ActivePhpInstallation!
+    var currentInstall: ActivePhpInstallation
 
     /**
      The version that the `php` formula via Brew is aliased to on the current system.
@@ -59,9 +54,7 @@ class PhpEnv {
      
      As such, we take that information from Homebrew.
      */
-    static var brewPhpAlias: String {
-        if Homebrew.fake { return "8.2" }
-
+    static var brewPhpVersion: String {
         return Self.shared.homebrewPackage.version
     }
 
@@ -83,21 +76,17 @@ class PhpEnv {
         return InternalSwitcher()
     }
 
-    public static func detectPhpVersions() async {
-        _ = await Self.shared.detectPhpVersions()
+    public static func detectPhpVersions() {
+        _ = Self.shared.detectPhpVersions()
     }
 
     /**
      Detects which versions of PHP are installed.
      */
-    public func detectPhpVersions() async -> Set<String> {
-        let files = await Shell.pipe("ls \(Paths.optPath) | grep php@").out
+    public func detectPhpVersions() -> [String] {
+        let files = Shell.pipe("ls \(Paths.optPath) | grep php@")
 
-        let versions = await extractPhpVersions(from: files.components(separatedBy: "\n"))
-
-        let supportedByValet = Constants.ValetSupportedPhpVersionMatrix[Valet.shared.version.major] ?? []
-
-        var supportedVersions = versions.intersection(supportedByValet)
+        var versionsOnly = extractPhpVersions(from: files.components(separatedBy: "\n"))
 
         // Make sure the aliased version is detected
         // The user may have `php` installed, but not e.g. `php@8.0`
@@ -105,18 +94,13 @@ class PhpEnv {
         let phpAlias = homebrewPackage.version
 
         // Avoid inserting a duplicate
-        if !supportedVersions.contains(phpAlias) && FileSystem.fileExists("\(Paths.optPath)/php/bin/php") {
-            supportedVersions.insert(phpAlias)
+        if !versionsOnly.contains(phpAlias) && Filesystem.fileExists("\(Paths.optPath)/php/bin/php") {
+            versionsOnly.append(phpAlias)
         }
 
-        availablePhpVersions = Array(supportedVersions)
-            .sorted(by: { $0.versionCompare($1) == .orderedDescending })
+        Log.info("The PHP versions that were detected are: \(versionsOnly)")
 
-        incompatiblePhpVersions = Array(versions.subtracting(supportedByValet))
-            .sorted(by: { $0.versionCompare($1) == .orderedDescending })
-
-        Log.info("The PHP versions that were detected are: \(availablePhpVersions)")
-        Log.info("The PHP versions that were unsupported are: \(incompatiblePhpVersions)")
+        availablePhpVersions = versionsOnly
 
         var mappedVersions: [String: PhpInstallation] = [:]
 
@@ -126,7 +110,7 @@ class PhpEnv {
 
         cachedPhpInstallations = mappedVersions
 
-        return supportedVersions
+        return versionsOnly
     }
 
     /**
@@ -140,9 +124,15 @@ class PhpEnv {
         from versions: [String],
         checkBinaries: Bool = true,
         generateHelpers: Bool = true
-    ) async -> Set<String> {
-        let supported = Constants.DetectedPhpVersions
-        var output: Set<String> = []
+    ) -> [String] {
+        var output: [String] = []
+
+        var supported = Constants.SupportedPhpVersions
+
+        if !Valet.enabled(feature: .supportForPhp56) {
+            supported.removeAll { $0 == "5.6" }
+        }
+
         versions.filter { (version) -> Bool in
             // Omit everything that doesn't start with php@
             // (e.g. something-php@8.0 won't be detected)
@@ -153,21 +143,19 @@ class PhpEnv {
             // is supported and where the binary exists (avoids broken installs)
             if !output.contains(version)
                 && supported.contains(version)
-                && (checkBinaries ? FileSystem.fileExists("\(Paths.optPath)/php@\(version)/bin/php") : true) {
-                output.insert(version)
+                && (checkBinaries ? Filesystem.fileExists("\(Paths.optPath)/php@\(version)/bin/php") : true) {
+                output.append(version)
             }
         }
 
         if generateHelpers {
-            for item in output {
-                await PhpHelper.generate(for: item)
-            }
+            output.forEach { PhpHelper.generate(for: $0) }
         }
 
         return output
     }
 
-    public func validVersions(for constraint: String) -> [VersionNumber] {
+    public func validVersions(for constraint: String) -> [PhpVersionNumber] {
         constraint.split(separator: "|").flatMap {
             return PhpVersionNumberCollection
                 .make(from: self.availablePhpVersions)
@@ -181,9 +169,6 @@ class PhpEnv {
     public func validate(_ version: String) -> Bool {
         if self.currentInstall.version.short == version {
             Log.info("Switching to version \(version) seems to have succeeded. Validation passed.")
-            Log.info("Keeping track that this is the new version!")
-            Stats.persistCurrentGlobalPhpVersion(version: version)
-
             return true
         }
 

phpmon/Common/PHP/PHP Version/PhpHelper.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 17/03/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -12,7 +12,7 @@ class PhpHelper {
 
     static let keyPhrase = "This file was automatically generated by PHP Monitor."
 
-    public static func generate(for version: String) async {
+    public static func generate(for version: String) {
         // Take the PHP version (e.g. "7.2") and generate a dotless version
         let dotless = version.replacingOccurrences(of: ".", with: "")
 
@@ -20,82 +20,79 @@ class PhpHelper {
         let destination = "\(Paths.homePath)/.config/phpmon/bin/pm\(dotless)"
 
         // Check if the ~/.config/phpmon/bin directory is in the PATH
-        let inPath = Shell.PATH.contains("\(Paths.homePath)/.config/phpmon/bin")
+        let inPath = Shell.user.PATH.contains("\(Paths.homePath)/.config/phpmon/bin")
 
         // Check if we can create symlinks (`/usr/local/bin` must be writable)
-        let canWriteSymlinks = FileSystem.isWriteableFile("/usr/local/bin/")
+        let canWriteSymlinks = FileManager.default.isWritableFile(atPath: "/usr/local/bin/")
 
-        Task { // Create the appropriate folders and check if the files exist
-            do {
-                if !FileSystem.directoryExists("~/.config/phpmon/bin") {
-                    try FileSystem.createDirectory(
-                        "~/.config/phpmon/bin",
-                        withIntermediateDirectories: true
-                    )
+        do {
+            Shell.run("mkdir -p ~/.config/phpmon/bin")
+
+            if FileManager.default.fileExists(atPath: destination) {
+                let contents = try String(contentsOfFile: destination)
+                if !contents.contains(keyPhrase) {
+                    Log.info("The file at '\(destination)' already exists and was not generated by PHP Monitor "
+                             + "(or is unreadable). Not updating this file.")
+                    return
                 }
-
-                if FileSystem.fileExists(destination) {
-                    let contents = try String(contentsOfFile: destination)
-                    if !contents.contains(keyPhrase) {
-                        Log.info("The file at '\(destination)' already exists and was not generated by PHP Monitor "
-                                 + "(or is unreadable). Not updating this file.")
-                        return
-                    }
-                }
-
-                // Let's follow the symlink to the PHP binary folder
-                let path = URL(fileURLWithPath: "\(Paths.optPath)/php@\(version)/bin")
-                    .resolvingSymlinksInPath().path
-
-                // The contents of the script!
-                let script = """
-                    #!/bin/zsh
-                    # \(keyPhrase)
-                    # It reflects the location of PHP \(version)'s binaries on your system.
-                    # Usage: . pm\(dotless)
-                    [[ $ZSH_EVAL_CONTEXT =~ :file$ ]] \\
-                        && echo "PHP Monitor has enabled this terminal to use PHP \(version)." \\
-                        || echo "You must run '. pm\(dotless)' (or 'source pm\(dotless)') instead!";
-                    export PATH=\(path):$PATH
-                    """
-
-                try FileSystem.writeAtomicallyToFile(destination, content: script)
-
-                if !FileSystem.isExecutableFile(destination) {
-                   try FileSystem.makeExecutable(destination)
-                }
-
-                // Create a symlink if the folder is not in the PATH
-                if !inPath {
-                    // First, check if we can create symlinks at all
-                    if !canWriteSymlinks {
-                        Log.err("PHP Monitor does not have permission to symlink `/usr/local/bin/\(dotless)`.")
-                        return
-                    }
-
-                    // Write the symlink
-                    await self.createSymlink(dotless)
-                }
-            } catch {
-                Log.err(error)
-                Log.err("Could not write PHP Monitor helper for PHP \(version) to \(destination))")
             }
+
+            // Let's follow the symlink to the PHP binary folder
+            let path = URL(fileURLWithPath: "\(Paths.optPath)/php@\(version)/bin")
+                .resolvingSymlinksInPath().path
+
+            // The contents of the script!
+            let script = """
+                #!/bin/zsh
+                # \(keyPhrase)
+                # It reflects the location of PHP \(version)'s binaries on your system.
+                # Usage: . pm\(dotless)
+                [[ $ZSH_EVAL_CONTEXT =~ :file$ ]] \\
+                    && echo "PHP Monitor has enabled this terminal to use PHP \(version)." \\
+                    || echo "You must run '. pm\(dotless)' (or 'source pm\(dotless)') instead!";
+                export PATH=\(path):$PATH
+                """
+
+            // Write to the destination
+            try script.write(
+                to: URL(fileURLWithPath: destination),
+                atomically: true,
+                encoding: String.Encoding.utf8
+            )
+
+            // Make sure the file is executable
+            Shell.run("chmod +x \(destination)")
+
+            // Create a symlink if the folder is not in the PATH
+            if !inPath {
+                // First, check if we can create symlinks at all
+                if !canWriteSymlinks {
+                    Log.err("PHP Monitor does not have permission to symlink `/usr/local/bin/\(dotless)`.")
+                    return
+                }
+
+                // Write the symlink
+                self.createSymlink(dotless)
+            }
+        } catch {
+            print(error)
+            Log.err("Could not write PHP Monitor helper for PHP \(version) to \(destination))")
         }
     }
 
-    private static func createSymlink(_ dotless: String) async {
+    private static func createSymlink(_ dotless: String) {
         let source = "\(Paths.homePath)/.config/phpmon/bin/pm\(dotless)"
         let destination = "/usr/local/bin/pm\(dotless)"
 
-        if !FileSystem.fileExists(destination) {
+        if !Filesystem.fileExists(destination) {
             Log.info("Creating new symlink: \(destination)")
-            await Shell.quiet("ln -s \(source) \(destination)")
+            Shell.run("ln -s \(source) \(destination)")
             return
         }
 
-        if !FileSystem.isSymlink(destination) {
+        if !Filesystem.fileIsSymlink(destination) {
             Log.info("Overwriting existing file with new symlink: \(destination)")
-            await Shell.quiet("ln -fs \(source) \(destination)")
+            Shell.run("ln -fs \(source) \(destination)")
             return
         }
 

phpmon/Common/PHP/PHP Version/PhpVersionNumber.swift

@@ -0,0 +1,208 @@
+//
+//  PhpVersionNumber.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 23/01/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+public struct PhpVersionNumberCollection: Equatable {
+    let versions: [PhpVersionNumber]
+
+    public static func make(from versions: [String]) -> Self {
+        return PhpVersionNumberCollection(
+            versions: versions.map { try! PhpVersionNumber.parse($0) }
+        )
+    }
+
+    public var first: PhpVersionNumber? {
+        return self.versions.first
+    }
+
+    public var all: [PhpVersionNumber] {
+        return self.versions
+    }
+
+    /**
+     Checks if any versions of PHP are valid for the constraint provided.
+     Due to the complexity of evaluating these, a important test is maintained.
+     More information on these constraints can be found here:
+     https://getcomposer.org/doc/articles/versions.md#writing-version-constraints
+     
+     - Parameter constraint: The full constraint as a string (e.g. "^7.0")
+     - Parameter strict: Whether the patch version check is strict. See more below.
+     
+     The strict mode does not matter if a patch version is provided for all versions in the collection.
+     
+     Strict mode assumes that any PHP version lacking precise patch information, e.g. inferred
+     from Homebrew corresponds to the .0 patch version of that version. The default, which is imprecise,
+     assumes that the patch version is .999, which means that in all cases the patch version check is
+     always going to pass.
+     
+     **STRICT MODE (= patch precision on)**
+     
+     Given versions 8.0.? and 8.1.?, but the requirement is ^8.0.1, in strict mode only 8.1.? will
+     be considered valid (8.0 translates to 8.0.0 and as such is older than 8.0.1, 8.1.0 is OK).
+     When checking against actual PHP versions installed by the user (with patch precision), use
+     strict mode.
+     
+     **NON-STRICT MODE (= patch precision off)**
+     
+     Given versions 8.0.? and 8.1.?, but the requirement is ^8.0.1, in non-strict mode version 8.0
+     is assumed to be equal to version 8.0.999, which is actually fine if 8.0.1 is the required version.
+     In non-strict mode, the patch version is ignored for regular version checks (no caret / tilde).
+     If checking compatibility with general Homebrew versions of PHP, do NOT use strict mode, since
+     the patch version there is not used. (The formula php@8.0 suffices for ^8.0.1.)
+     */
+    public func matching(constraint: String, strict: Bool = false) -> [PhpVersionNumber] {
+        if let version = PhpVersionNumber.make(from: constraint, type: .versionOnly) {
+            // Strict constraint (e.g. "7.0") -> returns specific version
+            return self.versions.filter { $0.isSameAs(version, strict) }
+        }
+
+        if let version = PhpVersionNumber.make(from: constraint, type: .caretVersionRange) {
+            // Caret range means that the major version is never higher but minor version can be higher
+            // ^7.2 will be compatible with all versions between 7.2 and 8.0
+            return self.versions.filter { $0.hasNewerMinorVersionOrPatch(version, strict) }
+        }
+
+        if let version = PhpVersionNumber.make(from: constraint, type: .tildeVersionRange) {
+            // Tilde range means that most specific digit is used as the basis.
+            return self.versions.filter {
+                version.patch != nil
+                // If a patch is provided then the minor version cannot be bumped.
+                ? $0.hasSameMajorAndMinorButNewerOrSamePatch(version, strict)
+                // If a patch is not provided then the major version cannot be bumped.
+                : $0.hasSameMajorButNewerOrSameMinor(version, strict)
+            }
+        }
+
+        if let version = PhpVersionNumber.make(from: constraint, type: .greaterThanOrEqual) {
+            return self.versions.filter { $0.isSameAs(version, strict) || $0.isNewerThan(version, strict) }
+        }
+
+        if let version = PhpVersionNumber.make(from: constraint, type: .greaterThan) {
+            return self.versions.filter { $0.isNewerThan(version, strict) }
+        }
+
+        if let version = PhpVersionNumber.make(from: constraint, type: .smallerThanOrEqual) {
+            return self.versions.filter { $0.isSameAs(version, strict) || $0.isOlderThan(version, strict)}
+        }
+
+        if let version = PhpVersionNumber.make(from: constraint, type: .smallerThan) {
+            return self.versions.filter { $0.isOlderThan(version, strict)}
+        }
+
+        return []
+    }
+}
+
+public struct PhpVersionNumber: Equatable, Hashable {
+    let major: Int
+    let minor: Int
+    let patch: Int?
+
+    public func toString() -> String {
+        return self.patch == nil
+            ? "\(major).\(minor)"
+            : "\(major).\(minor).\(patch!)"
+    }
+
+    public func patch(_ strictFallback: Bool = true, _ constraint: PhpVersionNumber? = nil) -> Int {
+        return patch ?? (strictFallback ? 0 : constraint?.patch ?? 999)
+    }
+
+    public var homebrewVersion: String {
+        return "\(major).\(minor)"
+    }
+
+    public enum MatchType: String {
+        case versionOnly = #"^(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
+        case caretVersionRange = #"^\^(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
+        case tildeVersionRange = #"^~(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
+        case greaterThanOrEqual = #"^>=(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
+        case greaterThan = #"^>(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
+        case smallerThanOrEqual = #"^<=(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
+        case smallerThan = #"^<(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
+    }
+
+    public static func parse(_ text: String) throws -> Self {
+        guard let versionText = VersionExtractor.from(text) else {
+            throw VersionParseError()
+        }
+
+        return Self.make(from: versionText)!
+    }
+
+    public static func make(from versionString: String, type: MatchType = .versionOnly) -> Self? {
+        let regex = try! NSRegularExpression(pattern: type.rawValue, options: [])
+
+        let match = regex.matches(
+            in: versionString,
+            options: [],
+            range: NSRange(location: 0, length: versionString.count)
+        ).first
+
+        if match != nil {
+            let major = Int(
+                versionString[Range(match!.range(withName: "major"), in: versionString)!]
+            )!
+            let minor = Int(
+                versionString[Range(match!.range(withName: "minor"), in: versionString)!]
+            )!
+            var patch: Int?
+            if let minorRange = Range(match!.range(withName: "patch"), in: versionString) {
+                patch = Int(versionString[minorRange])
+            }
+            return Self(major: major, minor: minor, patch: patch)
+        }
+
+        return nil
+    }
+
+    // MARK: Comparison Logic
+
+    internal func isSameAs(_ version: PhpVersionNumber, _ strict: Bool) -> Bool {
+        return self.major == version.major
+            && self.minor == version.minor
+            && (strict ? self.patch(strict, version) == version.patch(strict) : true)
+    }
+
+    internal func isNewerThan(_ version: PhpVersionNumber, _ strict: Bool) -> Bool {
+        return (
+            self.major > version.major ||
+            self.major == version.major && self.minor > version.minor ||
+            self.major == version.major && self.minor == version.minor
+                && self.patch(strict) > version.patch(strict)
+        )
+    }
+
+    internal func isOlderThan(_ version: PhpVersionNumber, _ strict: Bool) -> Bool {
+        return (
+            self.major < version.major ||
+            self.major == version.major && self.minor < version.minor ||
+            self.major == version.major && self.minor == version.minor
+            && self.patch(strict) < version.patch(strict)
+        )
+    }
+
+    internal func hasNewerMinorVersionOrPatch(_ version: PhpVersionNumber, _ strict: Bool) -> Bool {
+        return self.major == version.major &&
+        (
+            (self.minor == version.minor && self.patch(strict) >= version.patch(strict, self))
+            || self.minor > version.minor
+        )
+    }
+
+    internal func hasSameMajorAndMinorButNewerOrSamePatch(_ version: PhpVersionNumber, _ strict: Bool) -> Bool {
+        return self.major == version.major && self.minor == version.minor
+            && self.patch(strict, version) >= version.patch(strict)
+    }
+
+    internal func hasSameMajorButNewerOrSameMinor(_ version: PhpVersionNumber, _ strict: Bool) -> Bool {
+        return self.major == version.major
+            && self.minor >= version.minor
+    }
+}

phpmon/Common/PHP/PHP Version/PhpVersionNumberCollection.swift

@@ -1,100 +0,0 @@
-//
-//  PhpVersionNumberCollection.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 06/01/2023.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-public struct PhpVersionNumberCollection: Equatable {
-    let versions: [VersionNumber]
-
-    public static func make(from versions: [String]) -> Self {
-        return PhpVersionNumberCollection(
-            versions: versions.map { try! VersionNumber.parse($0) }
-        )
-    }
-
-    public var first: VersionNumber? {
-        return self.versions.first
-    }
-
-    public var all: [VersionNumber] {
-        return self.versions
-    }
-
-    /**
-     Checks if any versions of PHP are valid for the constraint provided.
-     Due to the complexity of evaluating these, a important test is maintained.
-     More information on these constraints can be found here:
-     https://getcomposer.org/doc/articles/versions.md#writing-version-constraints
-
-     - Parameter constraint: The full constraint as a string (e.g. "^7.0")
-     - Parameter strict: Whether the patch version check is strict. See more below.
-
-     The strict mode does not matter if a patch version is provided for all versions in the collection.
-
-     Strict mode assumes that any PHP version lacking precise patch information, e.g. inferred
-     from Homebrew corresponds to the .0 patch version of that version. The default, which is imprecise,
-     assumes that the patch version is .999, which means that in all cases the patch version check is
-     always going to pass.
-
-     **STRICT MODE (= patch precision on)**
-
-     Given versions 8.0.? and 8.1.?, but the requirement is ^8.0.1, in strict mode only 8.1.? will
-     be considered valid (8.0 translates to 8.0.0 and as such is older than 8.0.1, 8.1.0 is OK).
-     When checking against actual PHP versions installed by the user (with patch precision), use
-     strict mode.
-
-     **NON-STRICT MODE (= patch precision off)**
-
-     Given versions 8.0.? and 8.1.?, but the requirement is ^8.0.1, in non-strict mode version 8.0
-     is assumed to be equal to version 8.0.999, which is actually fine if 8.0.1 is the required version.
-     In non-strict mode, the patch version is ignored for regular version checks (no caret / tilde).
-     If checking compatibility with general Homebrew versions of PHP, do NOT use strict mode, since
-     the patch version there is not used. (The formula php@8.0 suffices for ^8.0.1.)
-     */
-    public func matching(constraint: String, strict: Bool = false) -> [VersionNumber] {
-        if let version = VersionNumber.make(from: constraint, type: .versionOnly) {
-            // Strict constraint (e.g. "7.0") -> returns specific version
-            return self.versions.filter { $0.isSameAs(version, strict) }
-        }
-
-        if let version = VersionNumber.make(from: constraint, type: .caretVersionRange) {
-            // Caret range means that the major version is never higher but minor version can be higher
-            // ^7.2 will be compatible with all versions between 7.2 and 8.0
-            return self.versions.filter { $0.hasNewerMinorVersionOrPatch(version, strict) }
-        }
-
-        if let version = VersionNumber.make(from: constraint, type: .tildeVersionRange) {
-            // Tilde range means that most specific digit is used as the basis.
-            return self.versions.filter {
-                version.patch != nil
-                // If a patch is provided then the minor version cannot be bumped.
-                ? $0.hasSameMajorAndMinorButNewerOrSamePatch(version, strict)
-                // If a patch is not provided then the major version cannot be bumped.
-                : $0.hasSameMajorButNewerOrSameMinor(version, strict)
-            }
-        }
-
-        if let version = VersionNumber.make(from: constraint, type: .greaterThanOrEqual) {
-            return self.versions.filter { $0.isSameAs(version, strict) || $0.isNewerThan(version, strict) }
-        }
-
-        if let version = VersionNumber.make(from: constraint, type: .greaterThan) {
-            return self.versions.filter { $0.isNewerThan(version, strict) }
-        }
-
-        if let version = VersionNumber.make(from: constraint, type: .smallerThanOrEqual) {
-            return self.versions.filter { $0.isSameAs(version, strict) || $0.isOlderThan(version, strict)}
-        }
-
-        if let version = VersionNumber.make(from: constraint, type: .smallerThan) {
-            return self.versions.filter { $0.isOlderThan(version, strict)}
-        }
-
-        return []
-    }
-}

phpmon/Common/PHP/PHP Version/VersionNumber.swift

@@ -1,131 +0,0 @@
-//
-//  PhpVersionNumber.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 23/01/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-/**
- A version number that is (mostly) compatible with the semantic versioning standard.
- For more information about semantic versioning, see: https://semver.org/
-
- - Note: If you want to check version constraints for PHP versions, please see `PhpVersionNumberCollection`.
- */
-public struct VersionNumber: Equatable, Hashable {
-    let major: Int
-    let minor: Int
-    let patch: Int?
-
-    var text: String {
-        return self.patch == nil
-        ? "\(major).\(minor)"
-        : "\(major).\(minor).\(patch!)"
-    }
-
-    public func patch(_ strictFallback: Bool = true, _ constraint: VersionNumber? = nil) -> Int {
-        return patch ?? (strictFallback ? 0 : constraint?.patch ?? 999)
-    }
-
-    public var long: String {
-        return "\(major).\(minor).\(patch ?? 0)"
-    }
-
-    public var short: String {
-        return "\(major).\(minor)"
-    }
-
-    public enum MatchType: String {
-        case versionOnly = #"^(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
-        case caretVersionRange = #"^\^(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
-        case tildeVersionRange = #"^~(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
-        case greaterThanOrEqual = #"^>=(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
-        case greaterThan = #"^>(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
-        case smallerThanOrEqual = #"^<=(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
-        case smallerThan = #"^<(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
-    }
-
-    public static func parse(_ text: String) throws -> Self {
-        guard let versionText = VersionExtractor.from(text) else {
-            throw VersionParseError()
-        }
-
-        return Self.make(from: versionText)!
-    }
-
-    public static func make(from versionString: String, type: MatchType = .versionOnly) -> Self? {
-        let regex = try! NSRegularExpression(pattern: type.rawValue, options: [])
-
-        let match = regex.matches(
-            in: versionString,
-            options: [],
-            range: NSRange(location: 0, length: versionString.count)
-        ).first
-
-        if match != nil {
-            let major = Int(
-                versionString[Range(match!.range(withName: "major"), in: versionString)!]
-            )!
-            let minor = Int(
-                versionString[Range(match!.range(withName: "minor"), in: versionString)!]
-            )!
-            var patch: Int?
-            if let minorRange = Range(match!.range(withName: "patch"), in: versionString) {
-                patch = Int(versionString[minorRange])
-            }
-            return Self(major: major, minor: minor, patch: patch)
-        }
-
-        return nil
-    }
-
-    // MARK: Comparison Logic
-
-    internal func isSameMajorVersionAs(_ version: VersionNumber) -> Bool {
-        return self.major == version.major
-    }
-
-    internal func isSameAs(_ version: VersionNumber, _ strict: Bool) -> Bool {
-        return self.major == version.major
-            && self.minor == version.minor
-            && (strict ? self.patch(strict, version) == version.patch(strict) : true)
-    }
-
-    internal func isNewerThan(_ version: VersionNumber, _ strict: Bool) -> Bool {
-        return (
-            self.major > version.major ||
-            self.major == version.major && self.minor > version.minor ||
-            self.major == version.major && self.minor == version.minor
-                && self.patch(strict) > version.patch(strict)
-        )
-    }
-
-    internal func isOlderThan(_ version: VersionNumber, _ strict: Bool) -> Bool {
-        return (
-            self.major < version.major ||
-            self.major == version.major && self.minor < version.minor ||
-            self.major == version.major && self.minor == version.minor
-            && self.patch(strict) < version.patch(strict)
-        )
-    }
-
-    internal func hasNewerMinorVersionOrPatch(_ version: VersionNumber, _ strict: Bool) -> Bool {
-        return self.major == version.major &&
-        (
-            (self.minor == version.minor && self.patch(strict) >= version.patch(strict, self))
-            || self.minor > version.minor
-        )
-    }
-
-    internal func hasSameMajorAndMinorButNewerOrSamePatch(_ version: VersionNumber, _ strict: Bool) -> Bool {
-        return self.major == version.major && self.minor == version.minor
-            && self.patch(strict, version) >= version.patch(strict)
-    }
-
-    internal func hasSameMajorButNewerOrSameMinor(_ version: VersionNumber, _ strict: Bool) -> Bool {
-        return self.major == version.major
-            && self.minor >= version.minor
-    }
-}

phpmon/Common/PHP/PhpConfigurationFile.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 04/05/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -35,7 +35,7 @@ class PhpConfigurationFile: CreatedFromFile {
         let path = filePath.replacingOccurrences(of: "~", with: Paths.homePath)
 
         do {
-            let fileContents = try FileSystem.getStringFromFile(path)
+            let fileContents = try String(contentsOfFile: path)
             return Self.init(path: path, contents: fileContents)
         } catch {
             Log.warn("Could not read the PHP configuration file at: `\(filePath)`")

phpmon/Common/PHP/PhpExtension.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 31/01/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -75,23 +75,16 @@ class PhpExtension {
      This simply toggles the extension in the .ini file.
      You may need to restart the other services in order for this change to apply.
      */
-    func toggle() async {
+    func toggle() {
         let newLine = enabled
             // DISABLED: Commented out line
             ? "; \(line)"
             // ENABLED: Line where the comment delimiter (;) is removed
             : line.replacingOccurrences(of: "; ", with: "")
 
-        await sed(file: file, original: line, replacement: newLine)
+        sed(file: file, original: line, replacement: newLine)
 
         enabled.toggle()
-
-        if !isRunningTests {
-            Task { @MainActor in
-                MainMenu.shared.rebuild()
-            }
-        }
-
     }
 
     // MARK: - Static Methods

phpmon/Common/PHP/PhpInstallation.swift

@@ -3,14 +3,14 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 28/11/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
 
 class PhpInstallation {
 
-    var versionNumber: VersionNumber
+    var versionNumber: PhpVersionNumber
 
     /**
      In order to determine details about a PHP installation, we’ll simply run `php-config --version`
@@ -19,18 +19,17 @@ class PhpInstallation {
     init(_ version: String) {
 
         let phpConfigExecutablePath = "\(Paths.optPath)/php@\(version)/bin/php-config"
-        self.versionNumber = VersionNumber.make(from: version)!
+        self.versionNumber = PhpVersionNumber.make(from: version)!
 
-        if FileSystem.fileExists(phpConfigExecutablePath) {
+        if Filesystem.fileExists(phpConfigExecutablePath) {
             let longVersionString = Command.execute(
                 path: phpConfigExecutablePath,
-                arguments: ["--version"],
-                trimNewlines: false
+                arguments: ["--version"]
             ).trimmingCharacters(in: .whitespacesAndNewlines)
 
             // The parser should always work, or the string has to be very unusual.
             // If so, the app SHOULD crash, so that the users report what's up.
-            self.versionNumber = try! VersionNumber.parse(longVersionString)
+            self.versionNumber = try! PhpVersionNumber.parse(longVersionString)
         }
     }
 

phpmon/Common/PHP/Switcher/InternalSwitcher.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 24/12/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -15,50 +15,49 @@ class InternalSwitcher: PhpSwitcher {
      - unlinking the current version
      - stopping the active services
      - linking the new desired version
-
+     
      Please note that depending on which version is installed,
      the version that is switched to may or may not be identical to `php`
      (without @version).
      */
-    func performSwitch(to version: String) async {
+    func performSwitch(to version: String, completion: @escaping () -> Void) {
         Log.info("Switching to \(version), unlinking all versions...")
 
         let versions = getVersionsToBeHandled(version)
 
-        await withTaskGroup(of: String.self, body: { group in
-            for available in PhpEnv.shared.availablePhpVersions {
-                group.addTask {
-                    await self.disableDefaultPhpFpmPool(available)
-                    await self.stopPhpVersion(available)
-                    return available
-                }
-            }
+        let group = DispatchGroup()
 
-            var unlinked: [String] = []
-            for await version in group {
-                unlinked.append(version)
-            }
+        PhpEnv.shared.availablePhpVersions.forEach { (available) in
+            group.enter()
 
-            Log.info("These versions have been unlinked: \(unlinked)")
-            Log.info("Linking the new version \(version)!")
+            DispatchQueue.global(qos: .userInitiated).async {
+                self.disableDefaultPhpFpmPool(available)
+                self.stopPhpVersion(available)
+                group.leave()
+            }
+        }
+
+        group.notify(queue: .global(qos: .userInitiated)) {
+            Log.info("All versions have been unlinked!")
+            Log.info("Linking the new version!")
 
             for formula in versions {
-                Log.info("Will start PHP \(version)... (primary: \(version == formula))")
-                await self.startPhpVersion(formula, primary: (version == formula))
+                self.startPhpVersion(formula, primary: (version == formula))
             }
 
             Log.info("Restarting nginx, just to be sure!")
-            await brew("services restart nginx", sudo: true)
+            brew("services restart \(Homebrew.Formulae.nginx)", sudo: true)
 
             Log.info("The new version(s) have been linked!")
-        })
+            completion()
+        }
     }
 
     func getVersionsToBeHandled(_ primary: String) -> Set<String> {
         let isolated = Valet.shared.sites.filter { site in
             site.isolatedPhpVersion != nil
         }.map { site in
-            return site.isolatedPhpVersion!.versionNumber.short
+            return site.isolatedPhpVersion!.versionNumber.homebrewVersion
         }
 
         var versions: Set<String> = [primary]
@@ -72,22 +71,22 @@ class InternalSwitcher: PhpSwitcher {
 
     func requiresDisablingOfDefaultPhpFpmPool(_ version: String) -> Bool {
         let pool = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf"
-        return FileSystem.fileExists(pool)
+        return FileManager.default.fileExists(atPath: pool)
     }
 
-    func disableDefaultPhpFpmPool(_ version: String) async {
+    func disableDefaultPhpFpmPool(_ version: String) {
         let pool = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf"
-        if FileSystem.fileExists(pool) {
+        if FileManager.default.fileExists(atPath: pool) {
             Log.info("A default `www.conf` file was found in the php-fpm.d directory for PHP \(version).")
-            let existing = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf"
-            let new = "\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf.disabled-by-phpmon"
+            let existing = URL(string: "file://\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf")!
+            let new = URL(string: "file://\(Paths.etcPath)/php/\(version)/php-fpm.d/www.conf.disabled-by-phpmon")!
             do {
-                if FileSystem.fileExists(new) {
+                if FileManager.default.fileExists(atPath: new.path) {
                     Log.info("A moved `www.conf.disabled-by-phpmon` file was found for PHP \(version), "
                              + "cleaning up so the newer `www.conf` can be moved again.")
-                    try FileSystem.remove(new)
+                    try FileManager.default.removeItem(at: new)
                 }
-                try FileSystem.move(from: existing, to: new)
+                try FileManager.default.moveItem(at: existing, to: new)
                 Log.info("Success: A default `www.conf` file was disabled for PHP \(version).")
             } catch {
                 Log.err(error)
@@ -95,28 +94,28 @@ class InternalSwitcher: PhpSwitcher {
         }
     }
 
-    func stopPhpVersion(_ version: String) async {
-        let formula = (version == PhpEnv.brewPhpAlias) ? "php" : "php@\(version)"
-        await brew("unlink \(formula)")
-        await brew("services stop \(formula)", sudo: true)
+    func stopPhpVersion(_ version: String) {
+        let formula = (version == PhpEnv.brewPhpVersion) ? "php" : "php@\(version)"
+        brew("unlink \(formula)")
+        brew("services stop \(formula)", sudo: true)
         Log.info("Unlinked and stopped services for \(formula)")
     }
 
-    func startPhpVersion(_ version: String, primary: Bool) async {
-        let formula = (version == PhpEnv.brewPhpAlias) ? "php" : "php@\(version)"
+    func startPhpVersion(_ version: String, primary: Bool) {
+        let formula = (version == PhpEnv.brewPhpVersion) ? "php" : "php@\(version)"
 
         if primary {
             Log.info("\(formula) is the primary formula, linking and starting services...")
-            await brew("link \(formula) --overwrite --force")
+            brew("link \(formula) --overwrite --force")
         } else {
             Log.info("\(formula) is an isolated PHP version, starting services only...")
         }
 
-        await brew("services start \(formula)", sudo: true)
+        brew("services start \(formula)", sudo: true)
 
         if Valet.enabled(feature: .isolatedSites) && primary {
             let socketVersion = version.replacingOccurrences(of: ".", with: "")
-            await Shell.quiet("ln -sF ~/.config/valet/valet\(socketVersion).sock ~/.config/valet/valet.sock")
+            Shell.run("ln -sF ~/.config/valet/valet\(socketVersion).sock ~/.config/valet/valet.sock")
             Log.info("Symlinked new socket version (valet\(socketVersion).sock → valet.sock).")
         }
 

phpmon/Common/PHP/Switcher/PhpSwitcher.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 24/12/2021.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -18,6 +18,6 @@ protocol PhpSwitcherDelegate: AnyObject {
 
 protocol PhpSwitcher {
 
-    func performSwitch(to version: String) async
+    func performSwitch(to version: String, completion: @escaping () -> Void)
 
 }

phpmon/Common/Protocols/CreatedFromFile.swift

@@ -3,7 +3,7 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 15/05/2022.
-//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation