🔧 Bump build for new DEV build

For this to work, Homebrew cannot be installed in /usr/local, which
means that the /usr/local/Cellar folder will be missing and the folder
/usr/local/homebrew will exist.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,33 +0,0 @@
----
-name: Bug report
-about: Something going wrong? File a bug report!
-title: ''
-labels: bug
-assignees: nicoverbruggen
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Required information**
- - Did you consult the FAQ in the README? [yes/no]
- - Did you try "Fix My Valet"? [yes/no]
- - OS: [e.g. macOS Monterey]
- - PHP Monitor version [e.g. v5.0.1]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,62 @@
+name: 🐞 Bug report
+description: Something going wrong? File a bug report!
+title: "[Bug] <title>"
+labels: [bug]
+assignees: nicoverbruggen
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered.
+    options:
+    - label: I have searched the existing issues
+      required: true
+- type: textarea
+  attributes:
+    label: Current Behavior
+    description: A concise description of what you're experiencing.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: A concise description of what you expected to happen.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Steps To Reproduce
+    description: Steps to reproduce the behavior.
+    placeholder: |
+      1. Open this menu...
+      2. Click here...
+      3. Scroll to...
+      4. See error...
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Environment
+    description: |
+      examples:
+        - **macOS**: (e.g. Ventura 13.3)
+        - **Valet**: (e.g. 4.0)
+        - **PHP Monitor**: (e.g. 5.8)
+    value: |
+        - macOS:
+        - Valet:
+        - PHP Monitor:
+    render: markdown
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Do you have a log file (or a screenshot) or any additional information?
+    description: |
+      You can start extra verbose logging by running: `touch ~/.config/phpmon/verbose` and restarting PHP Monitor. 
+
+      You can find the latest log in: `~/.config/phpmon/last_session.log`. Please attach it here!
+
+      (You can attach images or log files by clicking this area to highlight it and then dragging files in.)
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,22 +0,0 @@
----
-name: Feature request
-about: Suggest an enhancement.
-title: ''
-labels: enhancement
-assignees: nicoverbruggen
-
----
-
-_Enhancement requests that are not immediately approved will be moved to a discussion instead._
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,31 @@
+name: 😎 Feature request
+description: Do you have a great idea for an enhancement that could improve PHP Monitor?
+title: "[Feature] <title>"
+labels: [enhancement]
+assignees: nicoverbruggen
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered. Please make sure you've checked the discussions tab as well. Enhancement requests that are not immediately approved will be moved to a discussion instead, so you will find some there.
+    options:
+    - label: I have searched the existing issues and discussions
+      required: true
+- type: textarea
+  attributes:
+    label: Is this feature request related to a problem?
+    description: "A clear and concise description of what the problem is. For example: 'I am always frustrated when...'"
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like to see
+    description: What would be a user-friendly way of resolving this particular issue?
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Additional information or context
+    description: Add any other context or screenshots about the feature request here.
+  validations:
+    required: false

.github/contributing.md

@@ -0,0 +1,23 @@
+# Contribution Guidelines
+
+Thank you for your interest in contributing to PHP Monitor.
+
+I consider this project a bit of a nice side-project to my daily gig, so it is very much a personal affair where I love to tinker around.
+
+**While the code of the latest PHP Monitor release is public, many things are constantly in flux that may not be pushed to this repository yet.**
+
+I don't mean to be rude, but I don't want other people involved with the project beyond simply contributing a few small things here and there, as has been the case in the past.
+
+The extra mental overhead of having additional contributors to report to, whose code will need to be reviewed... it's a lot and it makes working on PHP Monitor less enjoyable for me. 
+
+Plus, at this point, the majority of PHP Monitor's main functionality is also done.
+
+As a result, I may refer you to this file at some point. Again, I don't wish to be rude, but this general rule stands:
+
+**Making any changes in a fork and opening a pull request without opening an issue first will most likely result in your PR being closed without mercy.**
+
+To repeat, I am **not opposed** to small contributions and fixes, if they are **meaningful or insightful**.
+
+To learn more, please check out the [pull request template](/.github/pull_request_template.md) which contains more information about my contribution requirements. (This will also show up when you open a new PR.)
+
+Thank you for respecting this!

.github/pull_request_template.md

@@ -16,7 +16,7 @@ In short: It is usually best to *get in touch first* if you are making substanti
 
 ## About destination branches
 
-Please keep in mind that `main` is reserved for the current code state of the latest release and should *never* be the destination branch unless a new release is happening. **Merge requests that target `main` will be closed without mercy.**
+Please keep in mind that `main` is reserved for the current code state of the latest release and should *never* be the destination branch unless a new release is happening. **Pull requests that target `main` will be closed without mercy.**
 
 Usually, the best target is the stable `dev/x.x` branch that corresponds with the latest major version that is released. 
 

.gitignore

@@ -2,4 +2,5 @@ phpmon.xcodeproj/project.xcworkspace
 phpmon.xcodeproj/xcuserdata
 PHP Monitor.xcodeproj/project.xcworkspace
 PHP Monitor.xcodeproj/xcuserdata
-.DS_Store
+phpmon-updater/PHP Monitor Self-Updater.app/
+.DS_Store

DEVELOPER.md

@@ -14,19 +14,36 @@ 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"/>
 
+### PHP Monitor
+
 If you'd like to build PHP Monitor yourself, you need:
 
 * Xcode (usually the latest version)
+* *PHP Monitor Self-Updater.app* in the `phpmon-updater` directory (You can build it yourself, it is included as a target OR copy the signed app so it is included w/ PHP Monitor)
 * The contents of this repository
 
-Once you have downloaded this repository, open `PHP Monitor.xcodeproj`, and you should be able to immediately build the app for your system by pressing Cmd-R. This will create a debug build. (If Xcode complains about code signing, you can turn it off.)
+Once you have downloaded this repository, open `PHP Monitor.xcodeproj`, and you should be able to build the app for your system by pressing Cmd-R. This will create a debug build. (If Xcode complains about code signing, you can turn it off.)
 
 If you'd like to create a production build, choose "Any Mac" as the target and select Product > Archive.
 
+### PHP Monitor Updater
+
+Select the separate target and build. You can then copy the product to the `phpmon-updater` directory. The binary will be re-signed when distributing the main build.
+
 ## 🚀 Release procedure
 
 1. Merge into `main`

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2022 Nico Verbruggen
+Copyright (c) 2019-2023 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

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   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 = "--cli"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--configuration:~/.phpmon_fconf_working.json"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--configuration:~/.phpmon_fconf_working_no_valet.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 EAP.xcscheme

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   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.EA"
+      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.EA"
+      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 = "--cli"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--configuration:~/.phpmon_fconf_working.json"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--configuration:~/.phpmon_fconf_working_no_valet.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.EA"
+      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.EA">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release.EA"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor Self-Updater.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C406A5EF298AD2CE00B5B85A"
+               BuildableName = "PHP Monitor Self-Updater.app"
+               BlueprintName = "PHP Monitor Self-Updater"
+               ReferencedContainer = "container:PHP Monitor.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C406A5EF298AD2CE00B5B85A"
+            BuildableName = "PHP Monitor Self-Updater.app"
+            BlueprintName = "PHP Monitor Self-Updater"
+            ReferencedContainer = "container:PHP Monitor.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C406A5EF298AD2CE00B5B85A"
+            BuildableName = "PHP Monitor Self-Updater.app"
+            BlueprintName = "PHP Monitor Self-Updater"
+            ReferencedContainer = "container:PHP Monitor.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      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 = "1320"
+   LastUpgradeVersion = "1430"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,14 +27,42 @@
       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 = "phpmon-tests.xctest"
+               BuildableName = "Unit Tests.xctest"
-               BlueprintName = "phpmon-tests"
+               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"
                ReferencedContainer = "container:PHP Monitor.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -68,6 +96,16 @@
          </CommandLineArgument>
       </CommandLineArguments>
       <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "EXTREME_DOCTOR_MODE"
+            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

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   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

@@ -1,18 +1,17 @@
-> If this software has been useful to you, I ask that you **please star the repository**, that way I know that the software is being used. Also, please consider leaving [a one-time donation](https://nicoverbruggen.be/sponsor) to support the project, as this is something I make in my free time. **Thank you!** ⭐️
+> **Note**
+> If this software has been useful to you, I ask that you **please star the repository**, that way I know that the software is being used. Also, please consider [sponsoring](https://nicoverbruggen.be/sponsor) to support the project, as this is something I make in my free time. **Thank you!** ⭐️
 
 <p align="center"><img src="./docs/logo.png" alt="PHP Monitor Logo" width="500px" /></p>
 
 **PHP Monitor** (or *phpmon*) is a lightweight macOS utility app that runs on your Mac and displays the active PHP version in your status bar. It's tightly integrated with [Laravel Valet](https://github.com/laravel/valet), so <u>you need to have it set up before you can use this app</u> (consult the FAQ below with info about how to set up your environment).
 
-<img src="./docs/screenshot.jpg#gh-light-mode-only" width="1280px" alt="phpmon screenshot (menu bar app)"/>
+<img src="./docs/screenshot.jpg" width="1280px" alt="phpmon screenshot (menu bar app)"/>
-<img src="./docs/screenshot-dark.jpg#gh-dark-mode-only" width="1280px" alt="phpmon screenshot (menu bar app)"/>
 
 <small><i>Screenshot: Showing the key functionality of PHP Monitor.</i></small>
 
 It's super convenient to switch between different versions of PHP. You'll even get notifications (only if you choose to opt-in, of course)!
 
-<img src="./docs/notification.png#gh-light-mode-only" width="370px" alt="phpmon screenshot (notification)"/>
+<img src="./docs/notification.png" width="370px" alt="phpmon screenshot (notification)"/>
-<img src="./docs/notification-dark.png#gh-dark-mode-only" width="370px" alt="phpmon screenshot (notification)"/>
 
 PHP Monitor also gives you quick access to various useful functionality (like accessing configuration files, restarting services, and more).
 
@@ -23,27 +22,48 @@ You can also add new domains as links, isolate sites, manage various services, a
 PHP Monitor is a universal application that runs natively on Apple Silicon **and** Intel-based Macs.
 
 * Your user account can administer your computer (required for some functionality, e.g. certificate generation)
-* macOS 11 Big Sur or later
+* macOS 12.4 or later (Monterey and Ventura are supported)
 * Homebrew is installed in `/usr/local/homebrew` or `/opt/homebrew`
 * Homebrew `php` formula is installed
-* 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._
+_Starting with PHP Monitor 6.0, you do not need to have Laravel Valet installed for PHP Monitor to work. To get access to all features of PHP Monitor however, installing Valet is **recommended**._
+
+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** installed first. Once that's done, you can install via Homebrew (recommended), or may download the latest release on GitHub.
+Again, if you want to have access to *all features* of PHP Monitor, I recommend installing **[Laravel Valet](https://laravel.com/docs/master/valet)** first:
 
-To install via Homebrew, run:
+```sh
+composer global require laravel/valet
+valet install
+valet trust
+```
 
-	brew tap nicoverbruggen/homebrew-cask
+Currently, PHP Monitor is compatible with Laravel Valet v2, v3 and v4. Each of these versions of Valet support slightly different PHP versions, which is why legacy versions remain supported. Please note that some features are not available in older versions of Valet, like site isolation.
-	brew install --cask phpmon
 
-To upgrade your existing installation, run:
+#### Manual installation (recommended, first time only)
 
-	brew upgrade phpmon
+Once that's done, you can [download the latest release](https://github.com/nicoverbruggen/phpmon/releases/latest), unzip it and place it in `/Applications`.
 
-(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.)
+#### Installation via Homebrew
+
+*Prior to version 5.8, this was the recommended way of installing PHP Monitor.*
+
+If you prefer to install the app via Homebrew, you can also run the following:
+
+```sh
+brew tap nicoverbruggen/homebrew-cask
+brew install --cask phpmon
+```
+
+## ⬆️ How to update
+
+The recommended method of updating the app to the latest version is to use **the built-in updater**.
+
+If you have a very slow internet connection, the updater may report that the download has timed out. In that case, you may wish to manually update by [downloading the latest release](https://github.com/nicoverbruggen/phpmon/releases/latest) and placing the app in `/Applications`.
+
+(You may also use Homebrew to update PHP Monitor, but this will require you to approve the app every time an update is installed. If you use the built-in updater, this won't be necessary.)
 
 ## ⚡️ Launchers (Alfred, Raycast)
 
@@ -78,26 +98,38 @@ 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>
 
-<ul>
+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.
-<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 (experimental)</li>
-</ul>
 
-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.
+> **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. (⚠️)
 
+Backports that are installable via PHP Monitor's **PHP Manager** functionality are subject to availability via [this tap](https://github.com/shivammathur/homebrew-php).
+
+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 via PHP Monitor's **PHP Manager**. (You can manually install or upgrade PHP versions too, but this is not recommended.)
+
+Please keep in mind that installing or updating PHP versions, even when done via PHP Monitor's **PHP Manager**, may cause other required formula dependencies (required software needed to keep those PHP versions functional) to be upgraded. It might not be very transparent when this happens, but this is likely the cause if installing a PHP version takes longer than expected: usually other dependencies are also being installed.
+
+Additionally, upgrading one specific version of PHP may also cause other installed versions of PHP to *also* be updated in one go, if the dependencies for that one version also apply to the other (newer) version(s) of PHP. It's a bit tricky to manage PHP versions via Homebrew, and even PHP Monitor may encounter some difficulties. 
+
+If you encounter a strange scenario or a malfunction, please open an issue on the issue tracker and get in touch. I'd like to keep enhancing this process to make it as foolproof as possible.
+
+> *Note*: Using PHP Monitor when managing PHP versions 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.
+If you are running macOS Ventura or newer, there's an option in the Settings menu that you can select: "Start PHP Monitor at login".
+
+If you are on an older version 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>
@@ -235,6 +267,8 @@ This problem is usually resolved by upgrading Valet and running `valet install`
 
 	composer global update
 	valet install
+ 
+If you are seeing a 502 (Bad Gateway) error after about 30 seconds or so, your request is likely timing out. You may need to solve a performance issue with your own code.
 
 </details>
 
@@ -342,6 +376,7 @@ Here's an example of a working preset:
 <pre>
 {
     "scan_apps": [],
+    "services": [],
     "presets": [
         {
             "name": "Legacy Project",
@@ -355,11 +390,67 @@ Here's an example of a working preset:
                 "post_max_size": "128M"
             }
         }
-    ]
+    ],
+    "export": {}
 }
 </pre>
 
 You can omit the `php` key in the preset if you do not wish for the preset to switch to a given PHP version.
+
+> **Warning**
+> You must restart PHP Monitor for these changes to be detected.
+</details>
+
+<details>
+<summary><strong>How do I ensure additional Homebrew services are shown in the app?</strong></summary>
+
+You must set these services up in a JSON file, located in `~/.config/phpmon/config.json`. 
+
+You can specify custom services in the configuration file for Homebrew services that run as your own user (not root). 
+
+> **Info**
+> If your service must run as root, it cannot currently be added to PHP Monitor.
+
+You can find out which services are available by running `brew services list`. 
+
+Here's an example where we add the `mailhog` and `mysql` services to PHP Monitor:
+
+<pre>
+{
+    "scan_apps": [],
+    "services": ["mailhog", "mysql"],
+    "presets": [],
+    "export": {}
+}
+</pre>
+
+> **Warning**
+> You must restart PHP Monitor for these changes to be detected.
+</details>
+
+<details>
+<summary><strong>How do I set custom environment variables?</strong></summary>
+
+You must configure these custom environment variables up in a JSON file, located in `~/.config/phpmon/config.json`. 
+
+PHP Monitor uses a default Shell environment, with no custom environment variables. You need to set custom environment variables manually. These are then used for e.g. Composer.
+
+Here's an example of a working `COMPOSER_HOME` environment variable which is respected:
+
+<pre>
+{
+    "scan_apps": [],
+    "services": [],
+    "presets": [],
+    "export": {
+        "COMPOSER_HOME": "/absolute/path/to/composer/folder"
+    }
+}
+</pre>
+
+> **Warning**
+> You must restart PHP Monitor for these changes to be detected.
+
 </details>
 
 <details>
@@ -377,12 +468,14 @@ You can add your own apps by creating and editing a `~/.config/phpmon/config.jso
 
 <pre>
 {
-    "scan_apps": ["Xcode", "Kraken"],
+    "scan_apps": ["Xcode", "Kraken"]
-    "presets": []
 }
 </pre>
 
 You can put as many apps as you'd like in the `scan_apps` array, and PHP Monitor will check for the existence of these apps. You do not need to set the full path, just the name of the app should work. Not all apps support opening a folder, though, so your success might vary.
+
+> **Warning**
+> You must restart PHP Monitor for these changes to be detected.
 </details>
 
 <details>
@@ -456,6 +549,10 @@ If you would like to report a crash, please include the associated **log files**
 
 To find the logs, take a look in `~/Library/Logs/DiagnosticReports` (in Finder) and see if there's any (log) files that start with "PHP Monitor".
 
+Additionally, you can help me figure out even more information by sending me your verbose log for your latest session of PHP Monitor. Logging is disabled by default. 
+
+You can start extra verbose logging by running: `touch ~/.config/phpmon/verbose` and restarting PHP Monitor. You can find the latest log in: `~/.config/phpmon/last_session.log`. Please attach it to the relevant bug report.
+
 </details>
 
 ## 📝 Having another issue?
@@ -472,14 +569,14 @@ Donations really help with the Apple Developer Program cost, and keep me motivat
 
 ## 😎 Acknowledgements
 
-While I did make this application during my own free time, PHP Monitor started out from various learning experiments during work hours at my employer, DIVE. I'd also like to shout out the following folks:
+Special thanks go out to:
 
-* My colleagues at [DIVE](https://dive.be)
+* Everyone supporting me via [GitHub Sponsors](https://github.com/sponsors/nicoverbruggen)
+* Everyone who has donated via [my sponsor page](https://nicoverbruggen.be/sponsor)
 * The [Homebrew](https://brew.sh/) team & [Valet maintainers](https://github.com/laravel/valet/graphs/contributors)
 * Various folks who [reached](https://twitter.com/stauffermatt) [out](https://twitter.com/marcelpociot) when PHP Monitor was still very much a small app with a handful of stars or so
-* My [GitHub Sponsors](https://github.com/sponsors/nicoverbruggen) and those who have donated
+* Everyone who has left feedback and reported bugs
-* Everyone who has left feedback and reported bugs (appreciate it!)
+* Everyone in the Laravel community who shared the app, especially on Twitter
-* Everyone in the Laravel community who shared the app (thanks!)
 
 Thank you very much for your contributions, kind words and support.
 
@@ -513,7 +610,8 @@ If an extension or other process writes to a single file a bunch of times in a s
 1. **Sites secured or not secured**: Whether the directory has been secured is determined by checking if a matching certificate exists under Valet's `Certificates` directory for that site name.
 1. **Project type**: PHP Monitor checks your `composer.json` file for "notable dependencies". If you have `laravel/framework` in your `require`, there's a good chance the project type is `Laravel`, after all.
 
-*Note*: If you have linked a folder in Documents, Desktop or Downloads you might need to grant PHP Monitor access to those directories for PHP Monitor to work correctly.
+> **Note**
+> If you have linked a folder in Documents, Desktop or Downloads you might need to grant PHP Monitor access to those directories for PHP Monitor to work correctly.
 
 ### Want to know more?
 

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.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 |
+| 6.0      | ✅ Universal binary | ✅ Yes | Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4 | 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 |
-
-_(*) macOS Ventura (13.0) is not officially supported until it officially releases._
 
 ## Legacy versions
 
@@ -16,6 +14,9 @@ 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.8       | ✅ Universal binary | ✅ Yes | Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4 | 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 |
+| 5.7       | ✅ 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)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |
+| 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/Info.plist

@@ -1,22 +0,0 @@
-<?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/Test Files/brew/brew-formula.json

@@ -1,332 +0,0 @@
-[
-    {
-        "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/Versions/AppUpdaterCheckTest.swift

@@ -1,21 +0,0 @@
-//
-//  AppUpdaterCheckTest.swift
-//  phpmon-tests
-//
-//  Created by Nico Verbruggen on 10/05/2022.
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
-//
-
-import XCTest
-
-class AppUpdaterCheckTest: XCTestCase {
-
-    func testCanRetrieveVersionFromCask() {
-        let caskVersion = AppUpdateChecker.retrieveVersionFromCask()
-
-        let version = VersionExtractor.from(caskVersion)
-
-        XCTAssertNotNil(version)
-    }
-
-}

phpmon-tests/Versions/PhpVersionDetectionTest.swift

@@ -1,29 +0,0 @@
-//
-//  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/ValetVersionExtractorTest.swift

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

phpmon-updater/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

phpmon-updater/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "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-updater/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

phpmon-updater/LaunchControl.swift

@@ -0,0 +1,46 @@
+//
+//  LaunchControl.swift
+//  PHP Monitor Self-Updater
+//
+//  Created by Nico Verbruggen on 02/02/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+
+class LaunchControl {
+    public static func smartRestart(priority: [String]) async {
+        for appPath in priority {
+            if FileManager.default.fileExists(atPath: appPath) {
+                let app = await LaunchControl.startApplication(at: appPath)
+                if app != nil {
+                    return
+                }
+            }
+        }
+    }
+
+    public static func terminateApplications(bundleIds: [String]) async {
+        let runningApplications = NSWorkspace.shared.runningApplications
+
+        // Terminate all instances found
+        for id in bundleIds {
+            if let phpmon = runningApplications.first(where: {
+                (application) in return application.bundleIdentifier == id
+            }) {
+                phpmon.terminate()
+            }
+        }
+    }
+
+    public static func startApplication(at path: String) async -> NSRunningApplication? {
+        await withCheckedContinuation { continuation in
+            let url = NSURL(fileURLWithPath: path, isDirectory: true) as URL
+            let configuration = NSWorkspace.OpenConfiguration()
+            NSWorkspace.shared.openApplication(at: url, configuration: configuration) { phpmon, error in
+                continuation.resume(returning: phpmon)
+            }
+        }
+    }
+}

phpmon-updater/Updater.swift

@@ -0,0 +1,162 @@
+//
+//  Updater.swift
+//  PHP Monitor Updater
+//
+//  Created by Nico Verbruggen on 01/02/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+class Updater: NSObject, NSApplicationDelegate {
+
+    var updaterDirectory: String = ""
+    var manifestPath: String = ""
+    var manifest: ReleaseManifest! = nil
+
+    func applicationDidFinishLaunching(_ aNotification: Notification) {
+        Task { await self.installUpdate() }
+    }
+
+    func installUpdate() async {
+        print("PHP MONITOR SELF-UPDATER by Nico Verbruggen")
+        print("===========================================")
+
+        self.updaterDirectory = "~/.config/phpmon/updater"
+            .replacingOccurrences(of: "~", with: NSHomeDirectory())
+
+        print("Updater directory set to: \(self.updaterDirectory)")
+
+        self.manifestPath = "\(updaterDirectory)/update.json"
+
+        // Fetch the manifest on the local filesystem
+        let manifest = await parseManifest()!
+
+        // Download the latest file
+        let zipPath = await download(manifest)
+
+        // Terminate all instances of PHP Monitor first
+        await LaunchControl.terminateApplications(bundleIds: [
+            "com.nicoverbruggen.phpmon.eap",
+            "com.nicoverbruggen.phpmon.dev",
+            "com.nicoverbruggen.phpmon"
+        ])
+
+        // Install the app based on the zip
+        let appPath = await extractAndInstall(zipPath: zipPath)
+
+        // Restart PHP Monitor, this will also close the updater
+        _ = await LaunchControl.startApplication(at: appPath)
+
+        exit(1)
+    }
+
+    func applicationWillTerminate(_ aNotification: Notification) {
+        exit(1)
+    }
+
+    func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+        return false
+    }
+
+    private func parseManifest() async -> ReleaseManifest? {
+        // Read out the correct information from the manifest JSON
+        print("Checking manifest file at \(manifestPath)...")
+
+        do {
+            let manifestText = try String(contentsOfFile: manifestPath)
+            manifest = try JSONDecoder().decode(ReleaseManifest.self, from: manifestText.data(using: .utf8)!)
+            return manifest
+        } catch {
+            print("Parsing the manifest failed (or the manifest file doesn't exist)!")
+            await Alert.show(description: "The manifest file for a potential update was not found. Please try searching for updates again in PHP Monitor.")
+        }
+
+        return nil
+    }
+
+    private func download(_ manifest: ReleaseManifest) async -> String {
+        // Remove all zips
+        system_quiet("rm -rf \(updaterDirectory)/*.zip")
+
+        // Download the file (and follow redirects + no output on failure)
+        system_quiet("cd \"\(updaterDirectory)\" && curl \(manifest.url) -fLO --max-time 20")
+
+        // Identify the downloaded file
+        let filename = system("cd \"\(updaterDirectory)\" && ls | grep .zip")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+
+        // Ensure the zip exists
+        if filename.isEmpty {
+            print("The update has not been downloaded. Sadly, that means that PHP Monitor cannot not updated!")
+            await Alert.show(description: "The update could not be downloaded, or the file was not correctly written to disk. \n\nPlease try again. \n\n(Note that the download will time-out after 20 seconds, so for slow connections it is recommended to manually download the update.)")
+        }
+
+        // Calculate the checksum for the downloaded file
+        let checksum = system("openssl dgst -sha256 \"\(updaterDirectory)/\(filename)\" | awk '{print $NF}'")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+
+        // Compare the checksums
+        print("""
+        Comparing checksums...
+        Expected SHA256: \(manifest.sha256)
+        Actual SHA256: \(checksum)
+        """)
+
+        // Make sure the checksum matches before we do anything with the file
+        if checksum != manifest.sha256 {
+            print("The checksums failed to match. Cancelling!")
+            await Alert.show(description: "The downloaded update failed checksum validation. Please try again. If this issue persists, there may be an issue with the server and I do not recommend upgrading.")
+        }
+
+        // Return the path to the zip
+        return "\(updaterDirectory)/\(filename)"
+    }
+
+    private func extractAndInstall(zipPath: String) async -> String {
+        // Remove the directory that will contain the extracted update
+        system_quiet("rm -rf \"\(updaterDirectory)/extracted\"")
+
+        // Recreate the directory where we will unzip the .app file
+        system_quiet("mkdir -p \"\(updaterDirectory)/extracted\"")
+
+        // Make sure the updater directory exists
+        var isDirectory: ObjCBool = true
+        if !FileManager.default.fileExists(atPath: "\(updaterDirectory)/extracted", isDirectory: &isDirectory) {
+            await Alert.show(description: "The updater directory is missing. The automatic updater will quit. Make sure that ` ~/.config/phpmon/updater` is writeable.")
+        }
+
+        // Unzip the file
+        system_quiet("unzip \"\(zipPath)\" -d \"\(updaterDirectory)/extracted\"")
+
+        // Find the .app file
+        let app = system("ls \"\(updaterDirectory)/extracted\" | grep .app")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+
+        print("Finished extracting: \(updaterDirectory)/extracted/\(app)")
+
+        // Make sure the file was extracted
+        if app.isEmpty {
+            await Alert.show(description: "The downloaded file could not be extracted. The automatic updater will quit. Make sure that ` ~/.config/phpmon/updater` is writeable.")
+        }
+
+        // Remove the original app
+        print("Removing \(app) before replacing...")
+        system_quiet("rm -rf \"/Applications/\(app)\"")
+
+        // Move the new app in place
+        system_quiet("mv \"\(updaterDirectory)/extracted/\(app)\" \"/Applications/\(app)\"")
+
+        // Remove the zip
+        system_quiet("rm \"\(zipPath)\"")
+
+        // Remove the manifest
+        system_quiet("rm \"\(manifestPath)\"")
+
+        // Write a file that is only written when we upgraded successfully
+        system_quiet("touch \"\(updaterDirectory)/upgrade.success\"")
+
+        // Return the new location of the app
+        return "/Applications/\(app)"
+    }
+}

phpmon-updater/Utility.swift

@@ -0,0 +1,34 @@
+//
+//  Utility.swift
+//  PHP Monitor Self-Updater
+//
+//  Created by Nico Verbruggen on 02/02/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+
+class Alert {
+    public static func show(description: String, shouldExit: Bool = true) async {
+        await withUnsafeContinuation { continuation in
+            DispatchQueue.main.async {
+                let alert = NSAlert()
+                alert.messageText = "The app could not be updated."
+                alert.informativeText = description
+                alert.addButton(withTitle: "OK")
+                alert.alertStyle = .critical
+                alert.runModal()
+                if shouldExit {
+                    exit(0)
+                }
+                continuation.resume()
+            }
+        }
+    }
+}
+
+public struct ReleaseManifest: Codable {
+    let url: String
+    let sha256: String
+}

phpmon-updater/main.swift

@@ -0,0 +1,14 @@
+//
+//  AppDelegate.swift
+//  PHP Monitor Self-Updater
+//
+//  Created by Nico Verbruggen on 01/02/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+let app = NSApplication.shared
+let delegate = Updater()
+app.delegate = delegate
+_ = NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv)

phpmon-updater/phpmon-updater.entitlements

@@ -0,0 +1,5 @@
+<?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/>
+</plist>

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

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

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

@@ -0,0 +1,68 @@
+{
+  "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/StatusColorBlue.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.988",
+          "green" : "0.580",
+          "red" : "0.278"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.988",
+          "green" : "0.723",
+          "red" : "0.277"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -0,0 +1,38 @@
+{
+  "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

@@ -0,0 +1,38 @@
+{
+  "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

@@ -0,0 +1,38 @@
+{
+  "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

@@ -0,0 +1,25 @@
+//
+//  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

@@ -0,0 +1,41 @@
+//
+//  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.
+     - Parameter withStandardError: Outputs standard error output to the same string output as well.
+     */
+    func execute(
+        path: String,
+        arguments: [String],
+        trimNewlines: Bool,
+        withStandardError: Bool
+    ) -> 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.
+     */
+    func execute(
+        path: String,
+        arguments: [String],
+        trimNewlines: Bool
+    ) -> String
+
+}

phpmon/Common/Command/RealCommand.swift

@@ -0,0 +1,56 @@
+//
+//  Command.swift
+//  PHP Monitor
+//
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+public class RealCommand: CommandProtocol {
+
+    public func execute(
+        path: String,
+        arguments: [String],
+        trimNewlines: Bool,
+        withStandardError: Bool
+    ) -> String {
+        let task = Process()
+        task.launchPath = path
+        task.arguments = arguments
+
+        let pipe = Pipe()
+        task.standardOutput = pipe
+
+        if withStandardError {
+            task.standardError = pipe
+        }
+
+        task.launch()
+
+        let data = pipe.fileHandleForReading.readDataToEndOfFile()
+        let output: String = String.init(data: data, encoding: String.Encoding.utf8)!
+
+        if trimNewlines {
+            return output.components(separatedBy: .newlines)
+                .filter({ !$0.isEmpty })
+                .joined(separator: "\n")
+        }
+
+        return output
+    }
+
+    public func execute(
+        path: String,
+        arguments: [String],
+        trimNewlines: Bool = false
+    ) -> String {
+        self.execute(
+            path: path,
+            arguments: arguments,
+            trimNewlines: trimNewlines,
+            withStandardError: false
+        )
+    }
+
+}

phpmon/Common/Core/Actions.swift

@@ -2,7 +2,7 @@
 //  Services.swift
 //  PHP Monitor
 //
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -12,36 +12,43 @@ class Actions {
 
     // MARK: - Services
 
-    public static func restartPhpFpm() {
+    public static func linkPhp() async {
-        brew("services restart \(PhpEnv.phpInstall.formula)", sudo: true)
+        await brew("link php --overwrite --force")
+
+        // TODO: Verify that this worked, if not, notify the user
     }
 
-    public static func restartNginx() {
+    public static func restartPhpFpm() async {
-        brew("services restart nginx", sudo: true)
+        await brew("services restart \(HomebrewFormulae.php)", sudo: HomebrewFormulae.php.elevated)
     }
 
-    public static func restartDnsMasq() {
+    public static func restartNginx() async {
-        brew("services restart dnsmasq", sudo: true)
+        await brew("services restart \(HomebrewFormulae.nginx)", sudo: HomebrewFormulae.nginx.elevated)
     }
 
-    public static func stopValetServices() {
+    public static func restartDnsMasq() async {
-        brew("services stop \(PhpEnv.phpInstall.formula)", sudo: true)
+        await brew("services restart \(HomebrewFormulae.dnsmasq)", sudo: HomebrewFormulae.dnsmasq.elevated)
-        brew("services stop nginx", sudo: true)
+    }
-        brew("services stop dnsmasq", sudo: true)
+
+    public static func stopValetServices() async {
+        await brew("services stop \(HomebrewFormulae.php)", sudo: HomebrewFormulae.php.elevated)
+        await brew("services stop \(HomebrewFormulae.nginx)", sudo: HomebrewFormulae.nginx.elevated)
+        await brew("services stop \(HomebrewFormulae.dnsmasq)", sudo: HomebrewFormulae.dnsmasq.elevated)
     }
 
     public static func fixHomebrewPermissions() throws {
         var servicesCommands = [
-            "\(Paths.brew) services stop nginx",
+            "\(Paths.brew) services stop \(HomebrewFormulae.nginx)",
-            "\(Paths.brew) services stop dnsmasq"
+            "\(Paths.brew) services stop \(HomebrewFormulae.dnsmasq)"
-        ]
-        var cellarCommands = [
-            "chown -R \(Paths.whoami):admin \(Paths.cellarPath)/nginx",
-            "chown -R \(Paths.whoami):admin \(Paths.cellarPath)/dnsmasq"
         ]
 
-        PhpEnv.shared.availablePhpVersions.forEach { version in
+        var cellarCommands = [
-            let formula = version == PhpEnv.brewPhpVersion
+            "chown -R \(Paths.whoami):admin \(Paths.cellarPath)/\(HomebrewFormulae.nginx)",
+            "chown -R \(Paths.whoami):admin \(Paths.cellarPath)/\(HomebrewFormulae.dnsmasq)"
+        ]
+
+        PhpEnvironments.shared.availablePhpVersions.forEach { version in
+            let formula = version == PhpEnvironments.brewPhpAlias
                 ? "php"
                 : "php@\(version)"
             servicesCommands.append("\(Paths.brew) services stop \(formula)")
@@ -53,9 +60,10 @@ class Actions {
             + " && "
             + cellarCommands.joined(separator: " && ")
 
-        let appleScript = NSAppleScript(
+        let source = "do shell script \"\(script)\" with administrator privileges"
-            source: "do shell script \"\(script)\" with administrator privileges"
+
-        )
+        Log.perf(source)
+        let appleScript = NSAppleScript(source: source)
 
         let eventResult: NSAppleEventDescriptor? = appleScript?.executeAndReturnError(nil)
 
@@ -64,29 +72,6 @@ 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() {
@@ -94,37 +79,33 @@ 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 = FileManager.default.homeDirectoryForCurrentUser
+        let file = URL(string: "file://~/.config/valet".replacingTildeWithHomeDirectory)!
-            .appendingPathComponent(".config/valet")
         NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
     }
 
     public static func openPhpMonitorConfigFile() {
-        let file = FileManager.default.homeDirectoryForCurrentUser
+        let file = URL(string: "file://~/.config/phpmon".replacingTildeWithHomeDirectory)!
-            .appendingPathComponent(".config/phpmon")
         NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
     }
 
     // MARK: - Other Actions
 
-    public static func createTempPhpInfoFile() -> URL {
+    public static func createTempPhpInfoFile() async -> URL {
-        // Write a file called `phpmon_phpinfo.php` to /tmp
+        try! FileSystem.writeAtomicallyToFile("/tmp/phpmon_phpinfo.php", content: "<?php phpinfo();")
-        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
-        Shell.run("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
+        await Shell.quiet("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
 
         return URL(string: "file:///private/tmp/phpmon_phpinfo.html")!
     }
@@ -143,12 +124,10 @@ 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(completed: @escaping () -> Void) {
+    public static func fixMyValet() async {
-        InternalSwitcher().performSwitch(to: PhpEnv.brewPhpVersion, completion: {
+        await InternalSwitcher().performSwitch(to: PhpEnvironments.brewPhpAlias)
-            brew("services restart dnsmasq", sudo: true)
+        await brew("services restart \(HomebrewFormulae.dnsmasq)", sudo: HomebrewFormulae.dnsmasq.elevated)
-            brew("services restart php", sudo: true)
+        await brew("services restart \(HomebrewFormulae.php)", sudo: HomebrewFormulae.php.elevated)
-            brew("services restart nginx", sudo: true)
+        await brew("services restart \(HomebrewFormulae.nginx)", sudo: HomebrewFormulae.nginx.elevated)
-            completed()
-        })
     }
 }

phpmon/Common/Core/Command.swift

@@ -1,40 +0,0 @@
-//
-//  Command.swift
-//  PHP Monitor
-//
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
-//
-
-import Cocoa
-
-public class Command {
-
-    /**
-     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
-
-        let pipe = Pipe()
-        task.standardOutput = pipe
-        task.launch()
-
-        let data = pipe.fileHandleForReading.readDataToEndOfFile()
-        let output: String = String.init(data: data, encoding: String.Encoding.utf8)!
-
-        if trimNewlines {
-            return output.components(separatedBy: .newlines)
-                .filter({ !$0.isEmpty })
-                .joined(separator: "\n")
-        }
-
-        return output
-    }
-
-}

phpmon/Common/Core/Constants.swift

@@ -2,69 +2,74 @@
 //  Constants.swift
 //  PHP Monitor
 //
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
 
 struct Constants {
 
-    /**
-     * The latest PHP version that is considered to be stable at the time of release.
-     * This version number is currently not used (only as a default fallback).
-     */
-    static let LatestStablePhpVersion = "8.1"
-
     /**
      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.
-     * Versions that do not appear in this array are omitted from the list.
+     * Any other PHP versions are considered invalid.
      */
-    static let SupportedPhpVersions = [
+    static let DetectedPhpVersions: Set = [
-        // ====================
+        "5.6",
-        // STABLE RELEASES
+        "7.0", "7.1", "7.2", "7.3", "7.4",
-        // ====================
+        "8.0", "8.1", "8.2", "8.3"
-        // 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",
 
-        // ====================
+    /**
-        // EXPERIMENTAL SUPPORT
+     The PHP versions supported by each version of Valet.
-        // ====================
+     */
-        // Every release that supports the next release will always support the next
+    static let ValetSupportedPhpVersionMatrix: [Int: Set] = [
-        // dev release. In this case, that means that the version below is detected.
+        2: // Valet v2 has the broadest legacy support
-        "8.2"
+        [
+            "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
+        ]
     ]
 
     struct Urls {
 
-        static let DonationPayment = URL(
+        // phpmon.app URLs (these are aliased to redirect correctly)
-            string: "https://nicoverbruggen.be/sponsor#pay-now"
-        )!
 
         static let DonationPage = URL(
-            string: "https://nicoverbruggen.be/sponsor"
+            string: "https://phpmon.app/sponsor"
         )!
 
         static let FrequentlyAskedQuestions = URL(
-            string: "https://github.com/nicoverbruggen/phpmon#%EF%B8%8F-faq--troubleshooting"
+            string: "https://phpmon.app/faq"
         )!
 
+        static let DonationPayment = URL(
+            string: "https://phpmon.app/sponsor/now"
+        )!
+
+        // GitHub URLs (do not alias these)
+
         static let GitHubReleases = URL(
             string: "https://github.com/nicoverbruggen/phpmon/releases"
         )!
@@ -77,6 +82,14 @@ struct Constants {
             string: "https://raw.githubusercontent.com/nicoverbruggen/homebrew-cask/master/Casks/phpmon-dev.rb"
         )!
 
+        static let EarlyAccessCaskFile = URL(
+            string: "https://phpmon.app/builds/early-access/sponsors/phpmon-eap.rb"
+        )!
+
+        static let EarlyAccessChangelog = URL(
+            string: "https://phpmon.app/early-access/release-notes"
+        )!
+
     }
 
 }

phpmon/Common/Core/Events.swift

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

phpmon/Common/Core/Helpers.swift

@@ -3,49 +3,50 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 24/12/2021.
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 // MARK: Common Shell Commands
 
-/**
- Runs a `valet` command. Defaults to running as superuser.
- */
-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) {
+func brew(_ command: String, sudo: Bool = false) async {
-    Shell.run("\(sudo ? "sudo " : "")" + "\(Paths.brew) \(command)")
+    await Shell.quiet("\(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) {
+func sed(file: String, original: String, replacement: String) async {
     // 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") {
+    if FileSystem.fileExists("\(Paths.binPath)/gsed") {
-        Shell.run("\(Paths.binPath)/gsed -i --follow-symlinks 's/\(e_original)/\(e_replacement)/g' \(file)")
+        await Shell.quiet("\(Paths.binPath)/gsed -i --follow-symlinks 's/\(e_original)/\(e_replacement)/g' \(file)")
     } else {
-        Shell.run("sed -i '' 's/\(e_original)/\(e_replacement)/g' \(file)")
+        await Shell.quiet("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) -> Bool {
+func grepContains(file: String, query: String) async -> Bool {
-    return Shell.pipe("""
+    return await 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

@@ -0,0 +1,56 @@
+//
+//  Homebrew.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 21/11/2022.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+struct HomebrewFormulae {
+    static var php: HomebrewFormula {
+        if PhpEnvironments.shared.homebrewPackage == nil {
+            return HomebrewFormula("php", elevated: true)
+        }
+
+        guard let install = PhpEnvironments.phpInstall else {
+            return HomebrewFormula("php", elevated: true)
+        }
+
+        return HomebrewFormula(install.formula, elevated: true)
+    }
+
+    static var nginx: HomebrewFormula {
+        return BrewDiagnostics.usesNginxFullFormula
+        ? HomebrewFormula("nginx-full", elevated: true)
+        : HomebrewFormula("nginx", elevated: true)
+    }
+
+    static var dnsmasq: HomebrewFormula {
+        return HomebrewFormula("dnsmasq", elevated: true)
+    }
+}
+
+class HomebrewFormula: Equatable, Hashable, CustomStringConvertible {
+    let name: String
+    let elevated: Bool
+
+    var description: String {
+        return name
+    }
+
+    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 © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -12,47 +12,83 @@ class Log {
 
     static var shared = Log()
 
+    var logFilePath = "~/.config/phpmon/last_session.log"
+
+    var logExists = false
+
     enum Verbosity: Int {
         case error = 1,
              warning = 2,
              info = 3,
-             performance = 4
+             performance = 4,
+             cli = 5
 
         public func isApplicable() -> Bool {
             return Log.shared.verbosity.rawValue >= self.rawValue
         }
     }
 
-    var verbosity: Verbosity = .warning
+    public func prepareLogFile() {
+        if !isRunningTests && Verbosity.cli.isApplicable() {
+            system_quiet("mkdir -p ~/.config/phpmon 2> /dev/null")
+            system_quiet("rm ~/.config/phpmon/last_session.log 2> /dev/null")
+            system_quiet("touch ~/.config/phpmon/last_session.log 2> /dev/null")
+            self.logExists = FileSystem.fileExists(self.logFilePath)
+        }
+    }
+
+    var verbosity: Verbosity = .warning {
+        didSet {
+            self.prepareLogFile()
+        }
+    }
 
     static func err(_ item: Any) {
         if Verbosity.error.isApplicable() {
-            print("[E] \(item)")
+            Log.shared.log("[E] \(item)")
         }
     }
 
     static func warn(_ item: Any) {
         if Verbosity.warning.isApplicable() {
-            print("[W] \(item)")
+            Log.shared.log("[W] \(item)")
         }
     }
 
     static func info(_ item: Any) {
         if Verbosity.info.isApplicable() {
-            print("\(item)")
+            Log.shared.log("\(item)")
         }
     }
 
     static func perf(_ item: Any) {
         if Verbosity.performance.isApplicable() {
-            print("[P] \(item)")
+            Log.shared.log("[P] \(item)")
         }
     }
 
     static func separator(as verbosity: Verbosity = .info) {
         if verbosity.isApplicable() {
-            print("==================================")
+            Log.shared.log("==================================")
         }
     }
 
+    static func line(as verbosity: Verbosity = .info) {
+        if verbosity.isApplicable() {
+            Log.shared.log("----------------------------------")
+        }
+    }
+
+    private func log(_ text: String) {
+        print(text)
+
+        if logExists && Verbosity.cli.isApplicable() {
+            let logFile = URL(string: self.logFilePath.replacingTildeWithHomeDirectory)!
+            if let fileHandle = try? FileHandle(forWritingTo: logFile) {
+                fileHandle.seekToEndOfFile()
+                fileHandle.write(text.appending("\n").data(using: .utf8).unsafelyUnwrapped)
+                fileHandle.closeFile()
+            }
+        }
+    }
 }

phpmon/Common/Core/Paths.swift

@@ -2,7 +2,7 @@
 //  Paths.swift
 //  PHP Monitor
 //
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -16,12 +16,22 @@ public class Paths {
     public static let shared = Paths()
 
     internal var baseDir: Paths.HomebrewDir
-
     private var userName: String
 
     init() {
+        // Assume the default directory is correct
         baseDir = App.architecture != "x86_64" ? .opt : .usr
-        userName = String(Shell.pipe("whoami").split(separator: "\n")[0])
+
+        // Ensure that if a different location is used, it takes precendence
+        if baseDir == .usr
+            && FileSystem.directoryExists("/usr/local/homebrew")
+            && !FileSystem.directoryExists("/usr/local/Cellar") {
+            Log.warn("Using /usr/local/homebrew as base directory!")
+            baseDir = .usr_hb
+        }
+
+        userName = identity()
+        Log.info("The current username is `\(userName)`.")
     }
 
     public func detectBinaryPaths() {
@@ -57,6 +67,19 @@ public class Paths {
         return shared.userName
     }
 
+    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")
+    }
+
     public static var cellarPath: String {
         return "\(shared.baseDir.rawValue)/Cellar"
     }
@@ -73,15 +96,22 @@ public class Paths {
         return "\(shared.baseDir.rawValue)/etc"
     }
 
+    public static var caskroomPath: String {
+        return "\(shared.baseDir.rawValue)/Caskroom/"
+            + (App.identifier.contains(".dev") ? "phpmon-dev" : "phpmon")
+    }
+
     // MARK: - Flexible Binaries
     // (these can be in multiple locations, so we scan common places because)
     // (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 if FileSystem.fileExists("/usr/local/homebrew/bin/composer") {
+            Paths.composer = "/usr/local/homebrew/bin/composer"
         } else {
             Paths.composer = nil
             Log.warn("Composer was not found.")
@@ -93,6 +123,7 @@ public class Paths {
     public enum HomebrewDir: String {
         case opt = "/opt/homebrew"
         case usr = "/usr/local"
+        case usr_hb = "/usr/local/homebrew"
     }
 
 }

phpmon/Common/Core/Process.swift

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

phpmon/Common/Core/Shell.swift

@@ -1,158 +0,0 @@
-//
-//  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"
-
-    /**
-     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 {
-        let tailoredCommand = requiresPath
-        ? "export PATH=\(Paths.binPath):$PATH && \(command)"
-        : command
-
-        let task = Process()
-        task.launchPath = self.shell
-        task.arguments = ["--noprofile", "-norc", "--login", "-c", tailoredCommand]
-
-        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 © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 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 © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 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 © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Extensions/DataExtension.swift

@@ -0,0 +1,21 @@
+//
+//  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 © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa

phpmon/Common/Extensions/DictionaryExtension.swift

@@ -0,0 +1,17 @@
+//
+//  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,49 +3,23 @@
 //  PHP Monitor
 //
 //  Created by Nico Verbruggen on 14/04/2021.
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
 
 extension NSMenu {
-
+    convenience init(items: [NSMenuItem], target: NSObject? = nil) {
-    open func addItem(_ newItem: NSMenuItem, withKeyModifier modifier: NSEvent.ModifierFlags) {
+        self.init()
-        newItem.keyEquivalentModifierMask = modifier
+        self.addItems(items, target: target)
-        self.addItem(newItem)
     }
 
-}
+    public func addItems(_ items: [NSMenuItem], target: NSObject? = nil) {
-
+        for item in items {
-@IBDesignable class LocalizedMenuItem: NSMenuItem {
+            self.addItem(item)
-
+            if target != nil {
-    @IBInspectable
+                item.target = target
-    var localizationKey: String? {
+            }
-        didSet {
-            self.title = localizationKey?.localized ?? self.title
         }
     }
-
-}
-
-// MARK: - NSMenuItem subclasses
-
-class PhpMenuItem: NSMenuItem {
-    var version: String = ""
-}
-
-class XdebugMenuItem: NSMenuItem {
-    var mode: String = ""
-}
-
-class ExtensionMenuItem: NSMenuItem {
-    var phpExtension: PhpExtension?
-}
-
-class EditorMenuItem: NSMenuItem {
-    var editor: Application?
-}
-
-class PresetMenuItem: NSMenuItem {
-    var preset: Preset?
 }

phpmon/Common/Extensions/NSMenuItemExtension.swift

@@ -0,0 +1,87 @@
+//
+//  NSMenuItem.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 18/08/2022.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+extension NSMenuItem {
+    convenience init(
+        title: String,
+        action: Selector? = nil,
+        keyEquivalent: String = "",
+        keyModifier: NSEvent.ModifierFlags = [],
+        toolTip: String? = nil
+    ) {
+        self.init(title: title, action: action, keyEquivalent: keyEquivalent)
+        self.keyEquivalentModifierMask = keyModifier
+        self.toolTip = toolTip
+    }
+
+    convenience init(
+        title: String,
+        keyEquivalent: String = "",
+        keyModifier: NSEvent.ModifierFlags = [],
+        toolTip: String? = nil,
+        submenu: [NSMenuItem],
+        target: NSObject? = nil
+    ) {
+        self.init(title: title, action: nil, keyEquivalent: keyEquivalent)
+        self.keyEquivalentModifierMask = keyModifier
+        self.toolTip = toolTip
+        self.submenu = NSMenu(items: submenu, target: target)
+    }
+}
+
+// MARK: - NSMenuItem subclasses
+
+@IBDesignable class LocalizedMenuItem: NSMenuItem {
+    @IBInspectable var localizationKey: String? {
+        didSet {
+            self.title = localizationKey?.localized ?? self.title
+        }
+    }
+}
+
+class PhpMenuItem: NSMenuItem {
+    var version: String = ""
+}
+
+class XdebugMenuItem: NSMenuItem {
+    var mode: String = ""
+}
+
+class ExtensionMenuItem: NSMenuItem {
+    var phpExtension: PhpExtension?
+}
+
+class EditorMenuItem: NSMenuItem {
+    var editor: Application?
+}
+
+class PresetMenuItem: NSMenuItem {
+    var preset: Preset?
+
+    static func getAll() -> [NSMenuItem] {
+        return Preferences.custom.presets!.map { preset in
+            let presetMenuItem = PresetMenuItem(
+                title: preset.getMenuItemText(),
+                action: #selector(MainMenu.togglePreset(sender:))
+            )
+
+            if let attributedString = try? NSMutableAttributedString(
+                data: preset.getMenuItemText().data(using: .utf8)!,
+                options: [.documentType: NSAttributedString.DocumentType.html],
+                documentAttributes: nil
+            ) {
+                presetMenuItem.attributedTitle = attributedString
+            }
+
+            presetMenuItem.preset = preset
+            return presetMenuItem
+        }
+    }
+}

phpmon/Common/Extensions/NSWindowExtension.swift

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

phpmon/Common/Extensions/StringExtension.swift

@@ -2,19 +2,47 @@
 //  StringExtension.swift
 //  PHP Monitor
 //
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 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: Bundle.main, value: "", comment: ""
+                self, tableName: nil, bundle: Localization.bundle, value: "", comment: ""
             ).replacingOccurrences(of: "Preferences", with: "Settings")
         }
 
-        return NSLocalizedString(self, tableName: nil, bundle: Bundle.main, value: "", comment: "")
+        return NSLocalizedString(self, tableName: nil, bundle: Localization.bundle, value: "", comment: "")
+    }
+
+    var localizedForSwiftUI: LocalizedStringKey {
+        return LocalizedStringKey(self.localized)
     }
 
     func localized(_ args: CVarArg...) -> String {
@@ -37,6 +65,16 @@ 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
@@ -93,5 +131,4 @@ extension String {
             return ""
         }
     }
-
 }

phpmon/Common/Extensions/TimeIntervalExtension.swift

@@ -0,0 +1,15 @@
+//
+//  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 © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation

phpmon/Common/Filesystem/ActiveFileSystem.swift

@@ -0,0 +1,26 @@
+//
+//  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

@@ -0,0 +1,50 @@
+//
+//  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

@@ -0,0 +1,129 @@
+//
+//  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.replacingTildeWithHomeDirectory)
+    }
+
+    func getDestinationOfSymlink(_ path: String) throws -> String {
+        return try FileManager.default.destinationOfSymbolicLink(atPath: path.replacingTildeWithHomeDirectory)
+    }
+
+    // MARK: - Move & Delete Files
+
+    func move(from path: String, to newPath: String) throws {
+        try FileManager.default.moveItem(
+            atPath: path.replacingTildeWithHomeDirectory,
+            toPath: newPath.replacingTildeWithHomeDirectory
+        )
+    }
+
+    func remove(_ path: String) throws {
+        try FileManager.default.removeItem(atPath: path.replacingTildeWithHomeDirectory)
+    }
+
+    // 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 © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
@@ -13,8 +13,9 @@ class Alert {
         onWindow window: NSWindow,
         messageText: String,
         informativeText: String,
-        buttonTitle: String = "OK",
+        buttonTitle: String = "generic.ok".localized,
-        secondButtonTitle: String = "Cancel",
+        buttonIsDestructive: Bool = false,
+        secondButtonTitle: String = "generic.cancel".localized,
         style: NSAlert.Style = .warning,
         onFirstButtonPressed: @escaping (() -> Void)
     ) {
@@ -27,6 +28,7 @@ class Alert {
         alert.messageText = messageText
         alert.informativeText = informativeText
         alert.addButton(withTitle: buttonTitle)
+        alert.buttons.first?.hasDestructiveAction = buttonIsDestructive
         if !secondButtonTitle.isEmpty {
             alert.addButton(withTitle: secondButtonTitle)
         }

phpmon/Common/Helpers/Application.swift

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

phpmon/Common/Helpers/FSNotifier.swift

@@ -0,0 +1,69 @@
+//
+//  FSNotifier.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 13/01/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+class FSNotifier {
+    enum Kind {
+        case homebrewLocks, homebrewBinaries
+    }
+
+    public static var shared: FSNotifier! = nil
+
+    let queue = DispatchQueue(label: "FSWatch2Queue", attributes: .concurrent)
+    var lastUpdate: TimeInterval?
+
+    private var fileDescriptor: CInt = -1
+    private var dispatchSource: DispatchSourceFileSystemObject?
+
+    internal let url: URL
+
+    init(for url: URL, eventMask: DispatchSource.FileSystemEvent, onChange: @escaping () -> Void) {
+        self.url = url
+
+        fileDescriptor = open(url.path, O_EVTONLY)
+
+        dispatchSource = DispatchSource.makeFileSystemObjectSource(
+            fileDescriptor: fileDescriptor,
+            eventMask: eventMask,
+            queue: self.queue
+        )
+
+        dispatchSource?.setEventHandler(handler: {
+            let distance = self.lastUpdate?.distance(to: Date().timeIntervalSince1970)
+
+            if distance == nil || distance != nil && distance! > 1.00 {
+                // FS event fired, checking in 1s, no duplicate FS events will be acted upon
+                self.lastUpdate = Date().timeIntervalSince1970
+
+                Task {
+                    await delay(seconds: 1)
+                    onChange()
+                }
+            }
+        })
+
+        dispatchSource?.setCancelHandler(handler: { [weak self] in
+            guard let self = self else { return }
+
+            close(self.fileDescriptor)
+            self.fileDescriptor = -1
+            self.dispatchSource = nil
+        })
+
+        dispatchSource?.resume()
+    }
+
+    func terminate() {
+        dispatchSource?.cancel()
+    }
+
+    deinit {
+        Log.perf("FSNotifier for \(self.url) will be deinitialized.")
+    }
+}

phpmon/Common/Helpers/Filesystem.swift

@@ -1,23 +0,0 @@
-//
-//  FileSystem.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 07/12/2021.
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
-//
-
-import Cocoa
-
-class Filesystem {
-
-    /**
-     Checks if a file exists at the provided path.
-     Uses `FileManager`.
-     */
-    public static func fileExists(_ path: String) -> Bool {
-        return FileManager.default.fileExists(
-            atPath: path.replacingOccurrences(of: "~", with: "/Users/\(Paths.whoami)")
-        )
-    }
-
-}

phpmon/Common/Helpers/LocalNotification.swift

@@ -2,7 +2,7 @@
 //  LocalNotification.swift
 //  PHP Monitor
 //
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Foundation
@@ -10,8 +10,8 @@ import UserNotifications
 
 class LocalNotification {
 
-    public static func send(title: String, subtitle: String, preference: PreferenceName) {
+    @MainActor public static func send(title: String, subtitle: String, preference: PreferenceName?) {
-        if !Preferences.isEnabled(preference) {
+        if preference != nil && !Preferences.isEnabled(preference!) {
             return
         }
 

phpmon/Common/Helpers/LoginItemManager.swift

@@ -0,0 +1,25 @@
+//
+//  LoginItemManager.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 15/02/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import AppKit
+import ServiceManagement
+
+@available(macOS 13.0, *)
+class LoginItemManager {
+    func loginItemIsEnabled() -> Bool {
+        return SMAppService.mainApp.status == .enabled
+    }
+
+    func disableLoginItem() {
+        try? SMAppService.mainApp.unregister()
+    }
+
+    func enableLoginItem() {
+        try? SMAppService.mainApp.register()
+    }
+}

phpmon/Common/Helpers/Measurements.swift

@@ -0,0 +1,17 @@
+//
+//  Measurements.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 02/03/2023.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+public struct Measurement {
+    let started = Date()
+
+    var milliseconds: Double {
+        return round(Date().timeIntervalSince(started) * 1000 * 1000) / 1000
+    }
+}

phpmon/Common/Helpers/MenuBarImageGenerator.swift

@@ -2,7 +2,7 @@
 //  ImageGenerator.swift
 //  PHP Monitor
 //
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 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 © 2022 Nico Verbruggen. All rights reserved.
+//  Copyright © 2023 Nico Verbruggen. All rights reserved.
 //
 
 import Cocoa
@@ -30,20 +30,20 @@ class PMWindowController: NSWindowController, NSWindowDelegate {
     }
 
     deinit {
-        Log.perf("Window controller '\(windowName)' was deinitialized")
+        Log.perf("deinit: \(String(describing: self)).\(#function)")
     }
 
 }
 
 extension NSWindowController {
 
-    public func positionWindowInTopLeftCorner() {
+    public func positionWindowInTopLeftCorner(offsetY: CGFloat = 0, offsetX: CGFloat = 0) {
         guard let frame = NSScreen.main?.frame else { return }
         guard let window = self.window else { return }
 
         window.setFrame(NSRect(
-            x: frame.size.width - window.frame.size.width - 20,
+            x: frame.size.width - window.frame.size.width - 20 + offsetX,
-            y: frame.size.height - window.frame.size.height - 40,
+            y: frame.size.height - window.frame.size.height - 40 + offsetY,
             width: window.frame.width,
             height: window.frame.height
         ), display: true)

phpmon/Common/Helpers/System.swift

@@ -0,0 +1,67 @@
+//
+//  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
+}
+
+/**
+ Same as the `system` command, but does not return the output.
+ */
+public func system_quiet(_ command: String) {
+    let task = Process()
+    task.launchPath = "/bin/sh"
+    task.arguments = ["-c", command]
+
+    let pipe = Pipe()
+    task.standardOutput = pipe
+    task.launch()
+
+    _ = pipe.fileHandleForReading.readDataToEndOfFile()
+    return
+}
+
+/**
+ Retrieves the username for the currently signed in user via `/usr/bin/id`.
+ This cannot fail or the application will crash.
+ */
+public func identity() -> String {
+    let task = Process()
+    task.launchPath = "/usr/bin/id"
+    task.arguments = ["-un"]
+
+    let pipe = Pipe()
+    task.standardOutput = pipe
+    task.launch()
+
+    guard let output = String(
+        data: pipe.fileHandleForReading.readDataToEndOfFile(),
+        encoding: String.Encoding.utf8
+    ) else {
+        fatalError("Could not retrieve username via `id -un`!")
+    }
+
+    return output.trimmingCharacters(in: .whitespacesAndNewlines)
+}