🚀 Version 5.7.2

You can start extra verbose logging by running: `touch ~/.config/phpmon/verbose`

Once this file exists, you can find the latest log in: `~/.config/phpmon/last_session.log`.

.github/FUNDING.yml

@@ -1 +1,2 @@
-custom: ['https://nicoverbruggen.be/sponsor', 'https://paypal.me/nicoverbruggen']
+github: nicoverbruggen
+custom: ['https://nicoverbruggen.be/sponsor']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+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 log**
+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 here!
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

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

.swiftlint.yml

@@ -0,0 +1,15 @@
+disabled_rules:
+  - todo
+  - identifier_name
+  - force_try
+  - force_cast
+  
+opt_in_rules:
+  - empty_count
+
+included:
+  - phpmon
+  - phpmon-tests
+
+excluded:
+  - phpmon/Vendor

DEVELOPER.md

@@ -0,0 +1,90 @@
+# DEVELOPER README
+
+## ✅ Linting
+
+This project uses the [SwiftLint](https://github.com/realm/SwiftLint) linter. You must install it and can run it like so:
+
+```
+swiftlint
+```
+
+It also automatically runs when you try to build the project. You'll get a warning if `swiftlint` is not installed, though. You can attempt to automatically fix issues:
+
+```
+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"/>
+
+If you'd like to build PHP Monitor yourself, you need:
+
+* Xcode (usually the latest version)
+* 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.)
+
+If you'd like to create a production build, choose "Any Mac" as the target and select Product > Archive.
+
+## 🚀 Release procedure
+
+1. Merge into `main`
+2. Create tag
+3. Add changes to changelog + update security document
+4. Archive
+5. Notarize and prepare for own distribution
+6. After notarization, export .app
+7. Create zipped version
+8. Calculate SHA256: `openssl dgst -sha256 phpmon.zip`
+9. Upload to GitHub and add to tagged release
+10. Update Cask with new version + hash
+11. Check new version can be installed via Cask
+
+## 🍱 Marketing Mode
+
+You can enable marketing mode by setting the `PHPMON_MARKETING_MODE` environment variable. It preloads a list of (fake) domains in the domain window list for screenshot & marketing purposes.
+
+    launchctl setenv PHPMON_MARKETING_MODE true
+
+## 🐛 Symbolication of crashes
+
+If you have an archived build of the app and exported the DSYM, it is possible to symbolicate .ips crash logs.
+
+For example, given the following crash (from an .ips file):
+
+```
+Thread 2 Crashed::  Dispatch queue: com.apple.root.user-initiated-qos
+0   libswiftDispatch.dylib        	    0x7ff82aa3ab8c static OS_dispatch_source.makeProcessSource(identifier:eventMask:queue:) + 28
+1   PHP Monitor                   	       0x1096907d8 0x10965e000 + 206808
+                                                |            |
+                                             address      load address
+2   PHP Monitor                   	       0x1096903ac 0x10965e000 + 205740
+3   PHP Monitor                   	       0x10968f88b 0x10965e000 + 202891
+```
+
+You must use the correct order for the the address and load address in the command below:
+
+```
+$ atos -arch x86_64 -o '/path/to/PHP Monitor.app.dSYM/Contents/Resources/DWARF/PHP Monitor' -l 0x10965e000 0x1096907d8
+             |                                           |                                       |              |
+             architecture                                path to DSYM                         load address    address
+```
+
+This will return the relevant information, for example:
+
+```
+FSWatcher.startMonitoring(_:behaviour:) (in PHP Monitor) (PhpConfigWatcher.swift:95)
+```
+
+For more information, see [Apple's documentation](https://developer.apple.com/documentation/xcode/adding-identifiable-symbol-names-to-a-crash-report).

LICENSE

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

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
-   version = "1.3">
+   LastUpgradeVersion = "1400"
+   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"
-               BlueprintName = "phpmon-tests"
+               BuildableName = "Unit Tests.xctest"
+               BlueprintName = "Unit Tests"
+               ReferencedContainer = "container:PHP Monitor.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C471E7AC28F9B4940021E251"
+               BuildableName = "Feature Tests.xctest"
+               BlueprintName = "Feature Tests"
+               ReferencedContainer = "container:PHP Monitor.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C471E7BB28F9B90F0021E251"
+               BuildableName = "UI Tests.xctest"
+               BlueprintName = "UI Tests"
                ReferencedContainer = "container:PHP Monitor.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -61,6 +89,29 @@
             ReferencedContainer = "container:PHP Monitor.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "--v"
+            isEnabled = "NO">
+         </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 = ""
+            isEnabled = "NO">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

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

@@ -1,26 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C415D3D52770F341005EF286"
-               BuildableName = "phpmon-cli"
-               BlueprintName = "phpmon-cli"
-               ReferencedContainer = "container:PHP Monitor.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
@@ -28,6 +12,16 @@
       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
@@ -40,22 +34,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C415D3D52770F341005EF286"
-            BuildableName = "phpmon-cli"
-            BlueprintName = "phpmon-cli"
-            ReferencedContainer = "container:PHP Monitor.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <CommandLineArguments>
-         <CommandLineArgument
-            argument = "help"
-            isEnabled = "YES">
-         </CommandLineArgument>
-      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -63,16 +41,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C415D3D52770F341005EF286"
-            BuildableName = "phpmon-cli"
-            BlueprintName = "phpmon-cli"
-            ReferencedContainer = "container:PHP Monitor.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

README.md

@@ -1,47 +1,74 @@
-# PHP Monitor
+> **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!** ⭐️
 
-> 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.
-> You can also send me [feedback](https://twitter.com/nicoverbruggen) if the app came in handy.<br>**Thank you!** ⭐️
+<p align="center"><img src="./docs/logo.png" alt="PHP Monitor Logo" width="500px" /></p>
 
-<img src="./phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png" alt="phpmon icon" width="128px" />
+**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).
 
-**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 you need to have it set up before you can use this.
+<img src="./docs/screenshot.jpg#gh-light-mode-only" 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)"/>
 
-<img src="./docs/screenshot41.jpg" width="800px" alt="phpmon screenshot (menu bar app)"/>
-
-<small><i>Screenshot: A menu showing all of the functionality of PHP Monitor.</i></small>
+<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" width="370px" alt="phpmon screenshot (notification)"/>
+<img src="./docs/notification.png#gh-light-mode-only" 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).
 
+You can also add new domains as links, isolate sites, manage various services, and perform First Aid to fix all kinds of common PHP link issues.
+
 ## 🖥 System requirements
 
-PHP Monitor is a universal application that runs on Apple Silicon **and** Intel-based Macs.
+PHP Monitor is a universal application that runs natively on Apple Silicon **and** Intel-based Macs.
 
-* macOS 11 Big Sur or higher (supports macOS 12 Monterey)
+* Your user account can administer your computer (required for some functionality, e.g. certificate generation)
+* macOS 11 Big Sur or later
 * Homebrew is installed in `/usr/local/homebrew` or `/opt/homebrew`
-* The brew formula `php` has to be installed (which version is detected)
-* Laravel Valet 2.16.2 or higher (older versions might be compatible but are not supported)
+* Homebrew `php` formula is installed
+* Laravel Valet (works with Valet v2, v3 and v4)
 
-_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`._
+_You may need to update your Valet installation to keep everything working if a major version update of PHP has been released. You can do this by running `composer global update && valet install`. Some features are not supported when running Valet 2._
+
+For more information, please see [SECURITY.md](./SECURITY.md) to find out which version of the app is currently supported.
 
 ## 🚀 How to install
 
-You can install via Homebrew (recommended), or may download the latest release on GitHub.
+Again, make sure you have **[Laravel Valet](https://laravel.com/docs/master/valet)** installed first:
+
+```sh
+composer global require laravel/valet
+valet install
+valet trust
+```
+
+Once that's done, you can install PHP Monitor via Homebrew (recommended), or (alternatively) you may download the latest release on GitHub.
 
 To install via Homebrew, run:
 
-	brew tap nicoverbruggen/homebrew-cask
-	brew install --cask phpmon
+```sh
+brew tap nicoverbruggen/homebrew-cask
+brew install --cask phpmon
+```
 
 To upgrade your existing installation, run:
 
-	brew upgrade phpmon
+```sh
+brew upgrade phpmon
+```
 
-_The app is signed and notarized, meaning all you have to do is approve its first launch._
+(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.)
+
+## ⚡️ Launchers (Alfred, Raycast)
+
+If you would like to integrate with your launcher of choice, you can also download an [Alfred workflow](https://github.com/nicoverbruggen/phpmon/raw/main/integrations/phpmon.alfredworkflow) or [Raycast extension](https://www.raycast.com/nicoverbruggen/php-monitor) that works with PHP Monitor.
+
+The app must be running in the background for these to work, and the _Allow third-party integrations_ checkbox must be enabled in Preferences (it is by default).
+
+## 🔑 Is the app signed & notarized?
+
+Yes, the app is signed and notarized, meaning all you have to do is approve its first launch (or whenever it updates).
 
 ## 👨‍💻 Why build this?
 
@@ -51,10 +78,12 @@ Initially, I had an Alfred workflow for this — but it has now been replaced wi
 
 ## 🤬 The app won't start?!
 
-PHP Monitor performs some integrity checks to ensure a good experience when using the app. You'll get a message telling you that PHP Monitor won't work correctly in a variety of scenarios. 
+PHP Monitor performs some integrity checks to ensure a good experience when using the app. You'll get a message telling you that PHP Monitor won't work correctly in a variety of scenarios.
 
 **Follow instructions as specified in the alert in order to resolve any issues.**
 
+(If the app crashes at launch without showing you any of these messages, you might have a non-standard Homebrew and Valet setup. Those are not supported.)
+
 ## 🙋‍♂️ FAQ & Troubleshooting
 
 > If you are having issues, the first thing you should be doing is installing the latest version of PHP Monitor _and_ Laravel Valet. This can resolve a variety of issues. To upgrade Valet, run `composer global update`. Don't forget to run `valet install` after upgrading.
@@ -64,20 +93,43 @@ 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>
-<li>PHP 5.6</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>
+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.
 
-For more details, consult the [constants file](https://github.com/nicoverbruggen/phpmon/blob/main/phpmon/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 are available via [this tap](https://github.com/shivammathur/homebrew-php). For more information about those backports, please see the next FAQ entry.
+
+For maximum compatibility with older PHP versions, you may wish to keep using Valet 2 or 3. For more information, please see [SECURITY.md](./SECURITY.md) to find out which versions of PHP are supported with different versions of Valet.
+
+</details>
+
+<details>
+<summary><strong>How do I install additional versions of PHP, including legacy versions?</strong></summary>
+
+Assuming you have installed the `php` formula, the latest stable version of PHP is installed. At the time of writing, this is PHP 8.2.
+
+You can install other supported versions of PHP out of the box, so `php@8.0` and `php@8.1` at the time of writing.
+
+If you wish to install older (officially unsupported) versions of PHP for local use, you can do so by using [Shivam Mathur's tap](https://github.com/shivammathur/homebrew-php):
+
+```sh
+brew tap shivammathur/php
+```
+
+You may find that this tap is already in use: if you've used Valet before, it automatically uses this tap for legacy versions of PHP.
+
+```sh
+brew install shivammathur/php/php@7.4
+brew install shivammathur/php/php@7.3
+brew install shivammathur/php/php@7.2
+brew install shivammathur/php/php@7.1
+brew install shivammathur/php/php@7.0
+```
+
+**Always make sure to restart PHP Monitor after installing or upgrading PHP versions!**
+
+> *Note*: Using this tap may cause [temporary alias conflicts](https://github.com/nicoverbruggen/phpmon/issues/54#issuecomment-979789724) while the core tap alias and the tap's alias refer to a different version of PHP, but this is generally speaking a minor inconvenience, since this normally only applies when a new PHP version releases.
 </details>
 
 <details>
@@ -91,14 +143,14 @@ Super convenient!
 <details>
 <summary><strong>I want to set up PHP Monitor from scratch! I don't have Homebrew installed either, where do I begin?</strong></summary>
 
-If you want to set up your computer for the very first time with PHP Monitor, here's how I do it:
+If you want to set up your computer for the very first time with PHP Monitor, here's how I do it.
 
-Install [Homebrew](https://brew.sh) first.
+**I have also created [a video tutorial](https://www.youtube.com/watch?v=fO3hVhkvm3w) which may be easier to follow. If you just want the terminal commands, keep reading.**
 
-Install PHP, composer, add to path:
+Install [Homebrew](https://brew.sh) first. Follow the instructions there first!
+
+Then, you'll need to set up your PATH. 
 
-    brew install php
-    brew install composer
     nano .zshrc
 
 Make sure the following line is not in the comments:
@@ -111,30 +163,93 @@ If you're on an Apple Silicon-based Mac, you'll need to add:
     # on an M1 Mac
     export PATH=$HOME/bin:/opt/homebrew/bin:$PATH
 
-and add the following to your .zshrc, but add this BEFORE the homebrew PATH additions:
+and add the following to your `.zshrc` file, but add this BEFORE the homebrew PATH additions:
 
     export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH
     
-If you're adding composer and Homebrew binaries, ensure that Homebrew binaries are preferred by adding these to the path last. On my system, that looks like this:
+If you're adding `composer` and Homebrew binaries, ensure that Homebrew binaries are preferred by adding these to the path last. On my system, that looks like this:
 
     export PATH=$HOME/bin:/usr/local/bin:$PATH
     export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH
     export PATH=$HOME/bin:/opt/homebrew/bin:$PATH
 
+If you are *not* on Apple Silicon, you should remove the third line.
+
+Install the `php` and `composer` formulae:
+
+    brew install php composer
+
 Make sure PHP is linked correctly:
 
     which php
 
-should return: `/usr/local/bin/php` (or `/opt/homebrew/bin/php`)
+should return: `/usr/local/bin/php` (or `/opt/homebrew/bin/php` if you are on Apple Silicon)
 
     composer global require laravel/valet
+    
+For optimal results, you should lock your PHP platform for global dependencies to the oldest version of PHP you intend to run. If that version is PHP 7.0, your `~/.composer/composer.json` file could look like this (please adjust the version accordingly!):
+
+```
+{
+    "require": {
+        "laravel/valet": "^3.0",
+    },
+    "config": {
+        "platform": {
+            "php": "7.0"
+        }
+    }
+}
+```
+
+Run `composer global update` again. This ensures that when you switch to a different global PHP version, [Valet won't break](https://github.com/nicoverbruggen/phpmon/issues/178). If it does, PHP Monitor will let you know what you can do about this.
+
+Then, install Valet:
+    
     valet install
 
 This should install `dnsmasq` and set up Valet. Great, almost there!
 
     valet trust
 
-Finally, run PHP Monitor. Since the app is notarized and signed with a developer ID, it should work.
+You can now install PHP Monitor, if you haven't already:
+
+    brew tap nicoverbruggen/homebrew-cask
+	brew install --cask phpmon
+
+Finally, run PHP Monitor. Since the app is notarized and signed with a developer ID, it should work. You will need to approve the initial launch of the app, but you should be ready to go now.
+</details>
+
+<details>
+<summary><strong>How frequently does PHP Monitor check for updates?</strong></summary>
+
+PHP Monitor will check if an update is available every time you start the app.
+
+You can disable this behaviour by going to Preferences (via the PHP Monitor icon in the menu bar) and unchecking "Automatically check for updates". You can always check for updates manually.
+
+</details>
+
+<details>
+<summary><strong>I have PHP Monitor installed, and it works. I want to upgrade my PHP installations to the latest version, what's the best way to do this?</strong></summary>
+
+It's easy to make a mistake here, and end up with an unlinked version of PHP or have versions missing from PHP Monitor.
+
+Here's what I usually do:
+
+* Open PHP Monitor and select **First Aid & Services** > **Restore Homebrew Permissions**.
+* Close PHP Monitor after the pop-up tells you the permissions were restored.
+* Run `brew update-reset`
+* Run `brew upgrade`
+
+If after this, any PHP versions are missing in PHP Monitor, please run the following for the versions that are missing:
+
+* Run `brew uninstall php@x.x` (where `x.x` is the version)
+* Run `brew cleanup` (if you get any permission issues you may need to manually clean up the folder)
+* Run `brew install php@x.x` (where `x.x` is the version)
+
+You may still need to run `brew link php` after upgrading, too.
+
+That's it. Now start up PHP Monitor again and you should be golden!
 </details>
 
 <details>
@@ -189,6 +304,12 @@ You should see an error or a warning here in the output.
 Usually this is a duplicate extension declaration causing issues, or an extension that couldn't be loaded. You'll have to solve that issue yourself (usually by removing the offending extension or reinstalling).
 
 </details>
+
+<details>
+<summary><strong>The option to isolate a site is disabled! What's going on?</strong></summary>
+
+Make sure you have at least **Valet 3.0** installed, since support for isolation was added in this version of Valet. (Please note that this version of Valet drops support for PHP 5.6.)
+</details>
 	
 <details>
 <summary><strong>One of the limits (memory limit, max POST size, max upload size) shows an exclamation mark!</strong></summary>
@@ -223,16 +344,116 @@ Since v3.4 all of the loaded .ini files are sourced to determine which extension
 <details>
 <summary><strong>I've got two Homebrew installations on my Apple Silicon Mac, can I choose which installation to use with PHP Monitor?</strong></summary>
 
-Not at this time, no. PHP Monitor will prefer the `/opt/homebrew` installation over the classic installation directory.
+If you are using PHP Monitor on an Intel machine or on an Apple Silicon machine with Rosetta enabled, PHP Monitor expects the main Homebrew binary in `/usr/local/bin/brew`.
 
+If you are using PHP Monitor on Apple Silicon without Rosetta, PHP Monitor expects the main Homebrew binary in `/opt/homebrew/bin/brew`.
+
+If there's an issue here, you'll get an alert at launch.
+
+Make sure that the version of Homebrew that you are running normally is the same as the one that PHP Monitor expects. If you are on M1 hardware for example, but still using Rosetta for Homebrew, you'll need to run PHP Monitor under Rosetta as well. 
+
+PHP Monitor is a universal app and supports both architectures, so [find out here](https://support.apple.com/en-us/HT211861) how to enable Rosetta with PHP Monitor.
 </details>
 
 <details>
 <summary><strong>Why is the app doing network requests?</strong></summary>
 
-It's Homebrew. I can't prevent `brew` from doing things via the network when I invoke it.
+The app will automatically check for updates, which is the most likely culprit. 
 
-PHP Monitor itself doesn't do any network requests. Feel free to check the source code or intercept the traffic, if you don't believe me.
+This happens at launch (unless disabled), and the app directly checks the Caskfile hosted on GitHub. This data is not, and will not be used for analytics (and, as far as I can tell, cannot).
+
+I also can't prevent `brew` from doing things via the network when PHP Monitor uses the binary.
+
+The app includes an Internet Access Policy file, so if you're using something like Little Snitch there should be a description why these calls occur.
+
+</details>
+
+<details>
+<summary><strong>How do I various presets to show up?</strong></summary>
+
+You must set these presets up in a JSON file, located in `~/.config/phpmon/config.json`. 
+
+You must have set up at least one valid preset for this presets to work in PHP Monitor.
+
+Here's an example of a working preset:
+
+<pre>
+{
+    "scan_apps": [],
+    "services": [],
+    "presets": [
+        {
+            "name": "Legacy Project",
+            "php": "8.0",
+            "extensions": {
+                "xdebug": false
+            },
+            "configuration": {
+                "memory_limit": "128M",
+                "upload_max_filesize": "128M",
+                "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>
 
@@ -247,7 +468,7 @@ All of these apps should just be detected correctly, no matter their location on
 
 To see which files are checked to determine availability, see [this file](./phpmon/Domain/Helpers/Application.swift).
 
-You can add your own apps by creating and editing a `~/.phpmon.conf.json` file, with the following entry:
+You can add your own apps by creating and editing a `~/.config/phpmon/config.json` file, and make sure the `scan_apps` key is set:
 
 <pre>
 {
@@ -256,14 +477,70 @@ You can add your own apps by creating and editing a `~/.phpmon.conf.json` file,
 </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>
+<summary><strong>How can the app integrate with third party tools, like Alfred or Raycast?</strong></summary>
+
+PHP Monitor supports third party app integrations by default, and this feature is enabled in Preferences unless you disable it.
+
+You can grab the official [Alfred workflow](https://github.com/nicoverbruggen/phpmon/raw/main/integrations/phpmon.alfredworkflow) or [Raycast extension](https://www.raycast.com/nicoverbruggen/php-monitor).
+
+If you'd like to integrate something yourself, all you need to to is use the `phpmon://` protocol and ensure that third party app integrations are enabled in Preferences (in PHP Monitor).
+
+Using app callbacks, macOS and PHP Monitor allow for the following to be called:
+
+* phpmon://list
+* phpmon://services/stop
+* phpmon://services/restart/all
+* phpmon://services/restart/nginx
+* phpmon://services/restart/php
+* phpmon://services/restart/dnsmasq
+* phpmon://locate/config
+* phpmon://locate/composer
+* phpmon://locate/valet
+* phpmon://phpinfo
+* phpmon://switch/php/{version}
+
+</details>
+
+<details>
+<summary><strong>How does the app know what PHP version is required for my app?</strong></summary>
+
+The `composer.json` file in the root of the folder (if it exists) is scanned and interpreted.
+
+If the version is set in `platform`, it takes precendence.
+If the version is not set in `platform` but it is in `require` (most common) then that version is used.
+</details>
+
+<details>
+<summary><strong>What do the checkmarks next to the PHP version mean in the site list?</strong></summary>
+
+You'll see a checkmark next to the version number if the currently enabled PHP version is compatible with the version required to run the site. 
+
+This is determined by evaluating the PHP requirement constraint (e.g. `^8.0`, `~8.0` or a specific version: `8.0`).
+</details>
+
+<details>
+<summary><strong>Why can't I see the driver type any more? It says "Project Type" now.</strong></summary>
+
+PHP Monitor currently checks your `composer.json` file to try to figure out what project you are running. 
+
+This approach is a lot faster than asking for a driver when you have many sites linked, but is slightly less reliable since the framework or type of project inferred via `composer.json` might not be 100% accurate.
+
+You can always still ask Valet using the command line, should it be necessary. In my experience fetching the drivers slowed down the app unnecessarily.
+
 </details>
 
 <details>
 <summary><strong>After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade` or `brew cleanup`!</strong></summary>
 
-<strike>This is a security feature of Homebrew. When you start a service as an administrator, the root user becomes the owner of relevant binaries. You will need to manually clean up those folders yourself using `rm -rf` (or by manually removing those folders via Finder).</strike>
+You can now use **First Aid & Services > Restore Homebrew Permissions** to (temporarily) resolve this issue and allow for a clean and painless `brew upgrade` or `brew cleanup` process.
 
-**Update**: If you are using the Valet switcher (currently not available in the latest stable build) you will not encounter this issue. For more information on this, see [this issue](https://github.com/nicoverbruggen/phpmon/issues/17) and also [this issue about switching to Valet's switcher](https://github.com/nicoverbruggen/phpmon/issues/34).
+If you would like to know more, consult [this issue](https://github.com/nicoverbruggen/phpmon/issues/85) for more information about why this is needed.
 
 </details>
 
@@ -272,6 +549,14 @@ You can put as many apps as you'd like in the `scan_apps` array, and PHP Monitor
 
 Please get in touch and open an issue. PHP Monitor shouldn't crash... (unless you are actually removing PHP *while* the app is running, that’s considered normal behaviour!)
 
+If you would like to report a crash, please include the associated **log files** so I can find out what exactly went wrong.
+
+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?
@@ -288,15 +573,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, I have been lucky enough to do various experiments during work hours at [DIVE](https://dive.be). I'd also like to shout out the following folks:
+Special thanks go out to:
 
-* My colleagues at [DIVE](https://dive.be)
-* The [Homebrew](https://brew.sh/) team who maintain
-* The [developers & maintainers of Valet](https://github.com/laravel/valet/graphs/contributors)
-* Everyone in the Laravel community who shared the app (thanks!)
-* Various folks who [reached](https://twitter.com/stauffermatt) [out](https://twitter.com/marcelpociot)
-* Everyone who left feedback via issues
-* Everyone who donated to keep the project up and running
+* 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
+* Everyone who has left feedback and reported bugs
+* Everyone in the Laravel community who shared the app, especially on Twitter
 
 Thank you very much for your contributions, kind words and support.
 
@@ -312,7 +596,9 @@ In order to save power, this only happens once every 60 seconds.
 
 This utility will detect which PHP versions you have installed via Homebrew, and then allows you to switch between them.
 
-The switcher will disable all PHP-FPM services not belonging to the version you wish to use, and link the desired version of PHP. Then, it'll restart your desired PHP version's FPM process. This all happens in parallel, so this should be much faster than Valet’s switcher.
+The switcher will disable all PHP-FPM services not belonging to the version you wish to use, and link the desired version of PHP. Then, it'll restart your desired PHP version's FPM process. This all happens in parallel, so this should be a bit faster than Valet’s switcher.
+
+If you're using Valet 3, versions of PHP-FPM required to keep isolated sites up and running will also be started or stopped as needed.
 
 ### Config change detection
 
@@ -326,23 +612,17 @@ If an extension or other process writes to a single file a bunch of times in a s
 
 1. **Location of your sites**: PHP Monitor uses the Valet configuration file to determine which folders to look into. Each folder is scanned and then PHP Monitor will validate if a composer.json file exists to determine the desired PHP version.
 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. **Site drivers**: PHP Monitor runs `valet which` to determine which driver is currently in use for each individual site. This command is executed once for each site whenever the site list is refreshed.
+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?
 
 If you want to know more about how this works, I recommend you check out the source code.
 
-## 🔧 Build instructions
+I have done my best to annotate as much as humanly possible, and have avoided using an overly complicated architecture to keep the code as easy to maintain as possible. The code isn't perfect by a long shot (lots of cleanup can still happen!) but the application works well.
 
-<img src="./docs/build.png" width="404px" alt="build button in Xcode"/>
+I also have a few tests for key parts of the application that I found needed to be tested. In the future, I would like to add even more tests for some of the UI stuff, but for now the tests are more unit tests than feature tests.
 
-If you'd like to build PHP Monitor yourself, you need:
-
-* Xcode (usually the latest version)
-* 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.)
-
-If you'd like to create a production build, choose "Any Mac" as the target and select Product > Archive.
+For more detailed information for developers, please see [the documentation file for developers](./DEVELOPER.md).

RELEASE.md

@@ -1,13 +0,0 @@
-# Release Procedure
-
-1. Merge into `main`
-2. Create tag
-3. Add changes to changelog + update security document
-4. Archive
-5. Notarize and prepare for own distribution
-6. After notarization, export .app
-7. Create zipped version
-8. Calculate SHA256: `openssl dgst -sha256 phpmon.zip`
-9. Upload to GitHub and add to tagged release
-10. Update Cask with new version + hash
-11. Check new version can be installed via Cask

SECURITY.md

@@ -4,19 +4,22 @@
 
 Generally speaking, only the latest version of **PHP Monitor** is supported, except during transition periods (for example, when particular system requirements go up):
 
-| Version | Apple silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Minimum Required Valet Version |
+| Version | Apple Silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Recommended Valet Version |
 | ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
-| 5.x       | ✅ Universal binary | ✅ Yes | Big Sur (11.0) and Monterey (12.0) | macOS 11+ | PHP 5.6—PHP 8.2 | TBD |
+| 5.7       | ✅ Universal binary | ✅ Yes | Big Sur (11.0)<br/>Monterey (12.0)<br/>Ventura (13.0) | macOS 11+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x*) | 3.0 or higher recommended<br/> 2.16.2 minimum |
+
+(*) Preliminary listing. Valet 4 hasn't been released yet and the versions of PHP Valet can work with might still change.
 
 ## Legacy versions
 
 These versions of PHP Monitor are no longer supported, but if you’re using an older computer with an older version of Homebrew, Valet or macOS, you might want to use one of these versions.
 
-| Version | Apple silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Minimum Required Valet Version |
+| Version | Apple Silicon | Supported          | Supported macOS | Deployment Target | Detected PHP Versions | Minimum Required Valet Version |
 | ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
-| 4.1       | ✅ Universal binary | ❌ | Big Sur (11.0) and Monterey (12.0) | macOS 11+ | PHP 5.6—PHP 8.2 | 2.16.2 |
-| 4.0       | ✅ Universal binary | ❌ | Big Sur (11.0) and Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 | 2.13 |
-| 3.5       | ✅ Universal binary | ❌ | Big Sur (11.0) and Monterey (12.0) | macOS 10.14+ | PHP 5.6—PHP 8.2 | 2.13 |
+| 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 |
 | 3.0—3.4   | ✅ Universal binary | ❌ | Big Sur (11.0) | macOS 10.14+ | PHP 5.6—PHP 8.1 | 2.13 |
 | 2.6       | ✅ Universal binary | ❌ | Big Sur (11.0) | macOS 10.14+ | PHP 5.6—PHP 8.0 | 2.13 |
 | 2.5       | ✴️ Universal binary<br/>`/usr/local/homebrew` installations only | ❌ | Big Sur (11.0)<br/>Catalina (10.15) | macOS 10.14+ | not applicable | not applicable |

phpmon-cli/AllowedArguments.swift

@@ -1,26 +0,0 @@
-//
-//  AllowedArguments.swift
-//  phpmon-cli
-//
-//  Created by Nico Verbruggen on 20/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-enum AllowedArguments: String, CaseIterable {
-    case use = "use"
-    case performSwitch = "switch"
-    case fix = "fix"
-    case help = "help"
-    
-    static func has(_ string: String) -> Bool {
-        return Self.allCases.contains { arg in
-            return arg.rawValue == string
-        }
-    }
-    
-    static var rawValues: [String] {
-        return Self.allCases.map { $0.rawValue }
-    }
-}

phpmon-cli/main.swift

@@ -1,103 +0,0 @@
-//
-//  main.swift
-//  phpmon-cli
-//
-//  Created by Nico Verbruggen on 20/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-let toolver = "0.1 (early access)"
-
-let log = Log.shared
-log.verbosity = .info
-
-if CommandLine.arguments.contains("-q") || CommandLine.arguments.contains("--quiet") {
-    Log.shared.verbosity = .warning
-}
-if CommandLine.arguments.contains("-p") || CommandLine.arguments.contains("--performance") {
-    Log.shared.verbosity = .performance
-}
-
-var argument = "help"
-if CommandLine.arguments.count > 1 {
-    argument = CommandLine.arguments[1]
-}
-
-if !AllowedArguments.has(argument) {
-    Log.err("The supported arguments are: \(AllowedArguments.rawValues)")
-    exit(1)
-}
-
-let action = AllowedArguments.init(rawValue: argument)
-
-switch action {
-case .use, .performSwitch:
-    if !Shell.fileExists("\(Paths.binPath)/php") {
-        Log.err("PHP is currently not linked. Attempting quick fix...")
-        _ = Shell.user.executeSynchronously("brew link php", requiresPath: true)
-    }
-    
-    let phpenv = PhpEnv.shared
-    PhpEnv.detectPhpVersions()
-    
-    if CommandLine.arguments.count < 3 {
-        Log.err("You must enter at least two additional arguments when using this command.")
-        exit(1)
-    }
-    
-    let version = CommandLine.arguments[2].replacingOccurrences(of: "php@", with: "")
-    if phpenv.availablePhpVersions.contains(version) {
-        Log.info("Switching to PHP \(version)...")
-        Actions.switchToPhpVersion(
-            version: version,
-            availableVersions: phpenv.availablePhpVersions,
-            completed: {
-                Log.info("The switch has been completed.")
-                exit(0)
-            }
-        )
-    } else {
-        Log.err("A PHP installation with version \(version) is not installed.")
-        Log.err("The installed versions are: \(phpenv.availablePhpVersions.joined(separator: ", ")).")
-        Log.err("If this version is available, you may be able to install it by using `brew install php@\(version)`.")
-        exit(1)
-    }
-case .fix:
-    Log.info("Fixing your PHP installation...")
-    Actions.fixMyPhp()
-    Log.info("All operations completed. You can check which version of PHP is linked by using `php -v`.")
-    exit(0)
-case .help:
-    print("""
-    ===============================================================
-    PHP MONITOR CLI \(toolver)
-    by Nico Verbruggen
-    ===============================================================
-    
-    Gives access to the quick version switcher from PHP Monitor,
-    but without the GUI and 100% of the speed!
-    
-    SUPPORTED COMMANDS
-    
-    * use {version}:      Switch to a specific version of PHP.
-                          (e.g. `phpmon-cli use 8.0`)
-    * switch {version}:   Alias for the `use` command.
-    * fix                 Attempts to unlink all PHP versions,
-                          and link the latest version of PHP.
-    * help:               Show this help.
-    
-    SUPPORTED FLAGS
-    
-    * `-q / --quiet`:     Silences all logs except for warnings and exceptions.
-    * `-p / --perf`:      Enables performance mode.
-    
-    """)
-    exit(0)
-case .none:
-    Log.err("Action not recognized!")
-    exit(1)
-}
-
-RunLoop.main.run()

phpmon-common/Core/Actions.swift

@@ -1,121 +0,0 @@
-//
-//  Services.swift
-//  PHP Monitor
-//
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-import AppKit
-
-class Actions {
-    
-    // MARK: - Services
-    
-    public static func restartPhpFpm()
-    {
-        brew("services restart \(PhpEnv.phpInstall.formula)", sudo: true)
-    }
-    
-    public static func restartNginx()
-    {
-        brew("services restart nginx", sudo: true)
-    }
-    
-    public static func restartDnsMasq()
-    {
-        brew("services restart dnsmasq", sudo: true)
-    }
-    
-    public static func stopAllServices()
-    {
-        brew("services stop \(PhpEnv.phpInstall.formula)", sudo: true)
-        brew("services stop nginx", sudo: true)
-        brew("services stop dnsmasq", sudo: true)
-    }
-    
-    /**
-     Kindly asks Valet to switch to a specific PHP version.
-     */
-    public static func switchToPhpVersionUsingValet(
-        version: String,
-        availableVersions: [String],
-        completed: @escaping () -> Void
-    ) {
-        Log.info("Switching to \(version) using Valet")
-        Log.info(valet("use php@\(version)"))
-        completed()
-    }
-    
-    // MARK: - Finding Config Files
-    
-    public static func openGenericPhpConfigFolder()
-    {
-        let files = [NSURL(fileURLWithPath: "\(Paths.etcPath)/php")];
-        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 openValetConfigFolder()
-    {
-        let file = FileManager.default.homeDirectoryForCurrentUser
-            .appendingPathComponent(".config/valet")
-        NSWorkspace.shared.activateFileViewerSelecting([file] as [URL])
-    }
-
-    // MARK: - Other Actions
-    
-    public static func createTempPhpInfoFile() -> URL
-    {
-        // Write a file called `phpmon_phpinfo.php` to /tmp
-        try! "<?php phpinfo();".write(toFile: "/tmp/phpmon_phpinfo.php", atomically: true, encoding: .utf8)
-        
-        // Tell php-cgi to run the PHP and output as an .html file
-        Shell.run("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
-        
-        return URL(string: "file:///private/tmp/phpmon_phpinfo.html")!
-    }
-    
-    // MARK: - Quick Fix
-    
-    /**
-     Detects all currently available PHP versions,
-     and unlinks each and every one of them.
-     
-     After this, the brew services are also stopped,
-     the latest PHP version is linked, and php + nginx are restarted.
-     
-     If this does not solve the issue, the user may need to install additional
-     extensions and/or run `composer global update`.
-     */
-    public static func fixMyPhp()
-    {
-        brew("services restart dnsmasq", sudo: true)
-        
-        PhpEnv.shared.detectPhpVersions().forEach { (version) in
-            let formula = (version == PhpEnv.brewPhpVersion) ? "php" : "php@\(version)"
-            brew("unlink php@\(version)")
-            brew("services stop \(formula)")
-            brew("services stop \(formula)", sudo: true)
-        }
-        
-        brew("services stop php")
-        brew("services stop nginx")
-        brew("link php")
-        brew("services restart dnsmasq", sudo: true)
-        brew("services stop php", sudo: true)
-        brew("services stop nginx", sudo: true)
-    }
-}

phpmon-common/Core/Constants.swift

@@ -1,54 +0,0 @@
-//
-//  Constants.swift
-//  PHP Monitor
-//
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Cocoa
-
-class 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.
-     */
-    static let SupportedPhpVersions = [
-        // ====================
-        // STABLE RELEASES
-        // ====================
-        // Versions of PHP that are stable and are supported.
-        "5.6",
-        "7.0",
-        "7.1",
-        "7.2",
-        "7.3",
-        "7.4",
-        "8.0",
-        "8.1",
-        
-        // ====================
-        // EXPERIMENTAL SUPPORT
-        // ====================
-        // Every release that supports the next release will always support the next
-        // dev release. In this case, that means that the version below is detected.
-        "8.2"
-    ]
-
-}

phpmon-common/Core/Helpers.swift

@@ -1,55 +0,0 @@
-//
-//  Helpers.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 24/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-// MARK: Common Shell Commands
-
-/**
- Runs a `valet` command.
- */
-func valet(_ command: String) -> String
-{
-    return Shell.pipe("sudo \(Paths.valet) \(command)", requiresPath: true)
-}
-
-/**
- Runs a `brew` command. Can run as superuser.
- */
-func brew(_ command: String, sudo: Bool = false)
-{
-    Shell.run("\(sudo ? "sudo " : "")" + "\(Paths.brew) \(command)")
-}
-
-/**
- Runs `sed` in order to replace all occurrences of a string in a specific file with another.
- */
-func sed(file: String, original: String, replacement: String)
-{
-    // 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 Shell.fileExists("\(Paths.binPath)/gsed") {
-        Shell.run("\(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)")
-    }
-}
-
-/**
- Uses `grep` to determine whether a particular query string can be found in a particular file.
- */
-func grepContains(file: String, query: String) -> Bool
-{
-    return Shell.pipe("""
-            grep -q '\(query)' \(file); [ $? -eq 0 ] && echo "YES" || echo "NO"
-            """)
-        .trimmingCharacters(in: .whitespacesAndNewlines)
-        .contains("YES")
-}

phpmon-common/Core/Logger.swift

@@ -1,52 +0,0 @@
-//
-//  Logger.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 21/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-class Log {
-    
-    static var shared = Log()
-    
-    enum Verbosity: Int {
-        case error = 1,
-             warning = 2,
-             info = 3,
-             performance = 4
-        
-        public func isApplicable() -> Bool {
-            return Log.shared.verbosity.rawValue >= self.rawValue
-        }
-    }
-    
-    var verbosity: Verbosity = .warning
-    
-    static func err(_ item: Any) {
-        if Verbosity.error.isApplicable() {
-            print(item)
-        }
-    }
-    
-    static func warn(_ item: Any) {
-        if Verbosity.warning.isApplicable() {
-            print(item)
-        }
-    }
-    
-    static func info(_ item: Any) {
-        if Verbosity.info.isApplicable() {
-            print(item)
-        }
-    }
-    
-    static func perf(_ item: Any) {
-        if Verbosity.performance.isApplicable() {
-            print(item)
-        }
-    }
-    
-}

phpmon-common/Core/Paths.swift

@@ -1,67 +0,0 @@
-//
-//  Paths.swift
-//  PHP Monitor
-//
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-/**
- The `Paths` class is used to locate various binaries on the system,
- and provides a full
- */
-public class Paths {
-    
-    public static let shared = Paths()
-    
-    private var baseDir : Paths.HomebrewDir
-    
-    init() {
-        baseDir = Shell.fileExists("\(HomebrewDir.opt.rawValue)/bin/brew") ? .opt : .usr
-    }
-    
-    // - MARK: Binaries
-    
-    public static var valet: String {
-        return "\(binPath)/valet"
-    }
-    
-    public static var brew: String {
-        return "\(binPath)/brew"
-    }
-    
-    public static var php: String {
-        return "\(binPath)/php"
-    }
-    
-    public static var phpConfig: String {
-        return "\(binPath)/php-config"
-    }
-    
-    // - MARK: Paths
-    
-    public static var whoami: String {
-        return String(Shell.pipe("whoami").split(separator: "\n")[0])
-    }
-    
-    public static var binPath: String {
-        return "\(shared.baseDir.rawValue)/bin"
-    }
-    
-    public static var optPath: String {
-        return "\(shared.baseDir.rawValue)/opt"
-    }
-    
-    public static var etcPath: String {
-        return "\(shared.baseDir.rawValue)/etc"
-    }
-    
-    // MARK: - Enum
-    
-    public enum HomebrewDir: String {
-        case opt = "/opt/homebrew"
-        case usr = "/usr/local"
-    }
-    
-}

phpmon-common/Core/Shell.swift

@@ -1,180 +0,0 @@
-//
-//  Shell.swift
-//  PHP Monitor
-//
-//  Copyright © 2021 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()
-    
-        return Shell.Output(
-            standardOutput: String(
-                data: outputPipe.fileHandleForReading.readDataToEndOfFile(),
-                encoding: .utf8
-            )!,
-            errorOutput: String(
-                data: errorPipe.fileHandleForReading.readDataToEndOfFile(),
-                encoding: .utf8
-            )!,
-            task: task
-        )
-    }
-    
-    /**
-     Checks if a file exists at the provided path.
-     Uses `/bin/echo` instead of the `builtin` (which does not support `-n`).
-     */
-    public static func fileExists(_ path: String) -> Bool {
-        let escapedPath = path.replacingOccurrences(of: " ", with: "\\ ")
-        return Shell.pipe("if [ -f \(escapedPath) ]; then /bin/echo -n \"0\"; fi") == "0"
-    }
-    
-    /**
-     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 = ["--login", "-c", tailoredCommand]
-        
-        return task
-    }
-    
-    public static func captureOutput(
-        _ task: Process,
-        didReceiveStdOutData: @escaping (String) -> Void,
-        didReceiveStdErrData: @escaping (String) -> Void
-    ) {
-        let outputPipe = Pipe()
-        let errorPipe = Pipe()
-        
-        task.standardOutput = outputPipe
-        task.standardError = errorPipe
-        
-        [(outputPipe, didReceiveStdOutData), (errorPipe, didReceiveStdErrData)].forEach {
-            (pipe: Pipe, callback: @escaping (String) -> Void) in
-            pipe.fileHandleForReading.waitForDataInBackgroundAndNotify()
-            NotificationCenter.default.addObserver(
-                forName: NSNotification.Name.NSFileHandleDataAvailable,
-                object: pipe.fileHandleForReading,
-                queue: nil
-            ) { notification in
-                if let outputString = String(data: pipe.fileHandleForReading.availableData, encoding: String.Encoding.utf8) {
-                    callback(outputString)
-                }
-                pipe.fileHandleForReading.waitForDataInBackgroundAndNotify()
-            }
-        }
-    }
-    
-    public static func haltCapturingOutput(_ task: Process) {
-        if let pipe = task.standardOutput as? Pipe {
-            NotificationCenter.default.removeObserver(pipe.fileHandleForReading)
-        }
-        if let pipe = task.standardError as? Pipe {
-            NotificationCenter.default.removeObserver(pipe.fileHandleForReading)
-        }
-    }
-    
-    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/PHP/Homebrew/HomebrewService.swift

@@ -1,21 +0,0 @@
-//
-//  HomebrewService.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 11/01/2022.
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-struct HomebrewService: Decodable, Equatable {
-    let name: String
-    let service_name: String
-    let running: Bool
-    let loaded: Bool
-    let pid: Int?
-    let user: String?
-    let status: String?
-    let log_path: String?
-    let error_log_path: String?
-}

phpmon-common/PHP/PHP Version/PhpEnv.swift

@@ -1,158 +0,0 @@
-//
-//  PhpSwitcher.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 21/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-protocol PhpSwitcherDelegate: AnyObject {
-    func switcherDidStartSwitching()
-    func switcherDidCompleteSwitch()
-}
-
-class PhpEnv {
-    
-    // MARK: - Initializer
-    
-    init() {
-        self.currentInstall = ActivePhpInstallation()
-        
-        let brewPhpAlias = Shell.pipe("\(Paths.brew) info php --json");
-        
-        self.homebrewPackage = try! JSONDecoder().decode(
-            [HomebrewPackage].self,
-            from: brewPhpAlias.data(using: .utf8)!
-        ).first!
-        
-        Log.info("When on your system, the `php` formula means version \(homebrewPackage.version)!")
-    }
-    
-    // MARK: - Properties
-    
-    /** The delegate that is informed of updates. */
-    weak var delegate: PhpSwitcherDelegate?
-
-    /** The static app instance. Accessible at any time. */
-    static let shared = PhpEnv()
-    
-    /** Whether the switcher is busy performing any actions. */
-    var isBusy: Bool = false
-    
-    /** All available versions of PHP. */
-    var availablePhpVersions: [String] = []
-    
-    /** Cached information about the PHP installations. */
-    var cachedPhpInstallations: [String: PhpInstallation] = [:]
-    
-    /** Information about the currently linked PHP installation. */
-    var currentInstall: ActivePhpInstallation
-    
-    /**
-     The version that the `php` formula via Brew is aliased to on the current system.
-     
-     If you're up to date, `php` will be aliased to the latest version,
-     but that might not be the case since not everyone keeps their
-     software up-to-date.
-     
-     As such, we take that information from Homebrew.
-     */
-    static var brewPhpVersion: String {
-        return Self.shared.homebrewPackage.version
-    }
-    
-    /**
-     The currently linked and active PHP installation.
-     */
-    static var phpInstall: ActivePhpInstallation {
-        return Self.shared.currentInstall
-    }
-    
-    /**
-     Information we were able to discern from the Homebrew info command.
-     */
-    var homebrewPackage: HomebrewPackage! = nil
-    
-    // MARK: - Methods
-    
-    public static var switcher: PhpSwitcher {
-        return InternalSwitcher()
-    }
-    
-    public static func detectPhpVersions() -> Void {
-        _ = Self.shared.detectPhpVersions()
-    }
-    
-    /**
-     Detects which versions of PHP are installed.
-     */
-    public func detectPhpVersions() -> [String]
-    {
-        let files = Shell.pipe("ls \(Paths.optPath) | grep php@")
-        
-        var versionsOnly = extractPhpVersions(from: files.components(separatedBy: "\n"))
-        
-        // Make sure the aliased version is detected
-        // The user may have `php` installed, but not e.g. `php@8.0`
-        // We should also detect that as a version that is installed
-        let phpAlias = homebrewPackage.version
-        
-        // Avoid inserting a duplicate
-        if (!versionsOnly.contains(phpAlias) && Shell.fileExists("\(Paths.optPath)/php/bin/php")) {
-            versionsOnly.append(phpAlias)
-        }
-        
-        Log.info("The PHP versions that were detected are: \(versionsOnly)")
-        
-        availablePhpVersions = versionsOnly
-        
-        var mappedVersions: [String: PhpInstallation] = [:]
-        
-        availablePhpVersions.forEach { version in
-            mappedVersions[version] = PhpInstallation(version)
-        }
-        
-        cachedPhpInstallations = mappedVersions
-        
-        return versionsOnly
-    }
-    
-    /**
-     Extracts valid PHP versions from an array of strings.
-     This array of strings is usually retrieved from `grep`.
-     */
-    public func extractPhpVersions(
-        from versions: [String],
-        checkBinaries: Bool = true
-    ) -> [String] {
-        var output : [String] = []
-        
-        versions.filter { (version) -> Bool in
-            // Omit everything that doesn't start with php@
-            // (e.g. something-php@8.0 won't be detected)
-            return version.starts(with: "php@")
-        }.forEach { (string) in
-            let version = string.components(separatedBy: "php@")[1]
-            // Only append the version if it doesn't already exist (avoid dupes),
-            // is supported and where the binary exists (avoids broken installs)
-            if !output.contains(version)
-                && Constants.SupportedPhpVersions.contains(version)
-                && (checkBinaries ? Shell.fileExists("\(Paths.optPath)/php@\(version)/bin/php") : true)
-            {
-                output.append(version)
-            }
-        }
-        
-        return output
-    }
-    
-    public func validVersions(for constraint: String) -> [PhpVersionNumber] {
-        constraint.split(separator: "|").flatMap {
-            return PhpVersionNumberCollection
-                .make(from: self.availablePhpVersions)
-                .matching(constraint: $0.trimmingCharacters(in: .whitespacesAndNewlines))
-        }
-    }
-}

phpmon-common/PHP/PHP Version/PhpVersionNumber.swift

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

phpmon-common/PHP/Switcher/InternalSwitcher.swift

@@ -1,58 +0,0 @@
-//
-//  InternalSwitcher.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 24/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-class InternalSwitcher: PhpSwitcher {
-    
-    /**
-     Switching to a new PHP version involves:
-     - unlinking the current version
-     - stopping the active services
-     - linking the new desired version
-     
-     Please note that depending on which version is installed,
-     the version that is switched to may or may not be identical to `php`
-     (without @version).
-     */
-    func performSwitch(to version: String, completion: @escaping () -> Void)
-    {
-        Log.info("Switching to \(version), unlinking all versions...")
-        
-        let group = DispatchGroup()
-        
-        PhpEnv.shared.availablePhpVersions.forEach { (available) in
-            group.enter()
-            
-            DispatchQueue.global(qos: .userInitiated).async {
-                let formula = (available == PhpEnv.brewPhpVersion)
-                ? "php" : "php@\(available)"
-                
-                brew("unlink \(formula)")
-                brew("services stop \(formula)", sudo: true)
-                
-                Log.perf("Unlinked and stopped services for \(formula)")
-                
-                group.leave()
-            }
-        }
-        
-        group.notify(queue: .global(qos: .userInitiated)) {
-            Log.info("All versions have been unlinked!")
-            Log.info("Linking the new version!")
-            
-            let formula = (version == PhpEnv.brewPhpVersion) ? "php" : "php@\(version)"
-            brew("link \(formula) --overwrite --force")
-            brew("services start \(formula)", sudo: true)
-            
-            Log.info("The new version has been linked!")
-            completion()
-        }
-    }
-    
-}

phpmon-common/PHP/Switcher/PhpSwitcher.swift

@@ -1,15 +0,0 @@
-//
-//  PhpVersionSwitchContract.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 24/12/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
-//
-
-import Foundation
-
-protocol PhpSwitcher {
-    
-    func performSwitch(to version: String, completion: @escaping () -> Void)
-    
-}

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/PhpVersionDetectionTest.swift

@@ -1,29 +0,0 @@
-//
-//  PhpVersionDetectionTest.swift
-//  phpmon-tests
-//
-//  Created by Nico Verbruggen on 01/04/2021.
-//  Copyright © 2021 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)
-        
-        XCTAssertEqual(outcome, ["8.0", "7.0", "5.6"])
-    }
-}

phpmon-tests/PhpVersionNumberTest.swift

@@ -1,194 +0,0 @@
-//
-//  PhpVersionNumberTest.swift
-//  PHP Monitor
-//
-//  Created by Nico Verbruggen on 23/01/2022.
-//  Copyright © 2022 Nico Verbruggen. All rights reserved.
-//
-
-import XCTest
-
-class PhpVersionNumberTest: XCTestCase {
-
-    func testCanDeconstructPhpVersion() throws {
-        XCTAssertEqual(
-            PhpVersionNumber.make(from: "8.0.11"),
-            PhpVersionNumber(major: 8, minor: 0, patch: 11)
-        )
-        XCTAssertEqual(
-            PhpVersionNumber.make(from: "7.4.2"),
-            PhpVersionNumber(major: 7, minor: 4, patch: 2)
-        )
-        XCTAssertEqual(
-            PhpVersionNumber.make(from: "7.4"),
-            PhpVersionNumber(major: 7, minor: 4, patch: nil)
-        )
-        XCTAssertEqual(
-            PhpVersionNumber.make(from: "7"),
-            nil
-        )
-    }
-    
-    func testCanCheckFixedConstraints() throws {
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
-                .matching(constraint: "7.0"),
-            PhpVersionNumberCollection
-                .make(from: ["7.0"]).all
-        )
-        
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4.3", "7.3.3", "7.2.3", "7.1.3", "7.0.3"])
-                .matching(constraint: "7.0.3"),
-            PhpVersionNumberCollection
-                .make(from: ["7.0.3"]).all
-        )
-        
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
-                .matching(constraint: "7.0.3", strict: false),
-            PhpVersionNumberCollection
-                .make(from: ["7.0"]).all
-        )
-        
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
-                .matching(constraint: "7.0.3", strict: true),
-            PhpVersionNumberCollection
-                .make(from: []).all
-        )
-    }
-    
-    func testCanCheckCaretConstraints() throws {
-        // 1. Imprecise checks
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
-                .matching(constraint: "^7.0", strict: true),
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]).all
-        )
-        
-        // 2. Imprecise check with precise constraint (lenient AKA not strict)
-        // These versions are interpreted as 7.4.999, 7.3.999, 7.2.999, etc.
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
-                .matching(constraint: "^7.0.1", strict: false),
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]).all
-        )
-        
-        // 3. Imprecise check with precise constraint (strict mode)
-        // These versions are interpreted as 7.4.0, 7.3.0, 7.2.0, etc.
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
-                .matching(constraint: "^7.0.1", strict: true),
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1"]).all
-        )
-        
-        // 4. Precise members and constraint all around
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
-                .matching(constraint: "^7.0.1", strict: true),
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
-        )
-        
-        // 5. Precise members but imprecise constraint (strict mode)
-        // In strict mode the constraint's patch version is assumed to be 0
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
-                .matching(constraint: "^7.0", strict: true),
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
-        )
-        
-        // 6. Precise members but imprecise constraint (lenient mode)
-        // In lenient mode the constraint's patch version is assumed to be equal
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
-                .matching(constraint: "^7.0", strict: false),
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
-        )
-    }
-    
-    func testCanCheckTildeConstraints() throws {
-        // 1. Imprecise checks
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
-                .matching(constraint: "~7.0", strict: true),
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]).all
-        )
-        
-        // 2. Imprecise check with precise constraint (lenient AKA not strict)
-        // These versions are interpreted as 7.4.999, 7.3.999, 7.2.999, etc.
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
-                .matching(constraint: "~7.0.1", strict: false),
-            // One result because 7.0.1 to 7.0.x is expected.
-            // 7.0.999 (assumed due to no strictness) is valid.
-            // 7.1.0 and up are not valid (minor version is too high).
-            PhpVersionNumberCollection
-                .make(from: ["7.0"]).all
-        )
-        
-        // 3. Imprecise check with precise constraint (strict mode)
-        // These versions are interpreted as 7.4.0, 7.3.0, 7.2.0, etc.
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
-                .matching(constraint: "~7.0.1", strict: true),
-            // No results because 7.0.1 to 7.0.x is expected.
-            // 7.0.0 (assumed due to strictness) is not valid.
-            // 7.1.0 and up are also not valid (minor version is too high).
-            PhpVersionNumberCollection
-                .make(from: []).all
-        )
-        
-        // 4. Precise members and constraint all around
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
-                .matching(constraint: "~7.0.1", strict: true),
-            // Only 7.0 with a patch version of .1 or higher is OK.
-            // In this example, 7.0.10 is OK but all other versions are too new.
-            PhpVersionNumberCollection
-                .make(from: ["7.0.10"]).all
-        )
-        
-        // 5. Precise members but imprecise constraint (strict mode)
-        // In strict mode the constraint's patch version is assumed to be 0.
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
-                .matching(constraint: "~7.0", strict: true),
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
-        )
-        
-        // 6. Precise members but imprecise constraint (lenient mode)
-        // In lenient mode the constraint's patch version is assumed to be equal.
-        // (Strictness does not make any difference here, but both should be tested.)
-        XCTAssertEqual(
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"])
-                .matching(constraint: "~7.0", strict: false),
-            PhpVersionNumberCollection
-                .make(from: ["7.4.10", "7.3.10", "7.2.10", "7.1.10", "7.0.10"]).all
-        )
-    }
-}

phpmon-tests/Test Files/brew.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/ValetTest.swift

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

phpmon/Assets.xcassets/AppColor.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/AppIconEA.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/AppSecondary.colorset/Contents.json

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

phpmon/Assets.xcassets/IconColorGreen.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/IconColorNormal.colorset/Contents.json

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

phpmon/Assets.xcassets/IconColorRed.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/IconDefault.imageset/Contents.json

@@ -1,11 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "Default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "question-circle.svg",
+      "filename" : "Default@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

phpmon/Assets.xcassets/IconLinked.imageset/Contents.json

@@ -1,11 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "Linked.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "link.svg",
+      "filename" : "Linked@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

phpmon/Assets.xcassets/IconLinked.imageset/link.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z"/></svg>

phpmon/Assets.xcassets/IconParked.imageset/Contents.json

@@ -1,11 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "Parked.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "car-alt.svg",
+      "filename" : "Parked@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

phpmon/Assets.xcassets/IconParked.imageset/car-alt.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 480 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M438.66 212.33l-11.24-28.1-19.93-49.83C390.38 91.63 349.57 64 303.5 64h-127c-46.06 0-86.88 27.63-103.99 70.4l-19.93 49.83-11.24 28.1C17.22 221.5 0 244.66 0 272v48c0 16.12 6.16 30.67 16 41.93V416c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32v-32h256v32c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32v-54.07c9.84-11.25 16-25.8 16-41.93v-48c0-27.34-17.22-50.5-41.34-59.67zm-306.73-54.16c7.29-18.22 24.94-30.17 44.57-30.17h127c19.63 0 37.28 11.95 44.57 30.17L368 208H112l19.93-49.83zM80 319.8c-19.2 0-32-12.76-32-31.9S60.8 256 80 256s48 28.71 48 47.85-28.8 15.95-48 15.95zm320 0c-19.2 0-48 3.19-48-15.95S380.8 256 400 256s32 12.76 32 31.9-12.8 31.9-32 31.9z"/></svg>

phpmon/Assets.xcassets/IconProxy.imageset/Contents.json

@@ -1,11 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "Proxy.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "check-circle.svg",
+      "filename" : "Proxy@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

phpmon/Assets.xcassets/Isolated.imageset/Contents.json

@@ -1,11 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "Isolated.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "times-circle.svg",
+      "filename" : "Isolated@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

phpmon/Assets.xcassets/Menu Bar Icons/Contents.json

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

phpmon/Assets.xcassets/Menu Bar Icons/MenuBar_elephant.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "Menu Bar Elephant.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Menu Bar Elephant@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}