From c1d90cb9091428e42f7f52af4dfbddc13d467f03 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Tue, 10 Jun 2025 18:25:49 +0200 Subject: [PATCH 01/14] =?UTF-8?q?=F0=9F=94=A7=20Plan=20for=20version=2025?= =?UTF-8?q?=20later=20this=20year?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PHP Monitor 25 will use a new numbering scheme, following the format: 25.06 = 25 . 06 . 0 M m p (Minor, minor and patch.) So what was supposed to be PHP Monitor 7.3 will now be version 25, with the minor version number decided by the release month. The cut-off date for PHP Monitor 7.2 is currently 2025-11-30, so I have time but I'd prefer to have two releases out this year: - One release migrating to the new numbering scheme - One release with full support for macOS 26 Since I plan on only doing maintenance releases with no patches except when bugs pop up, the major/minor version notation combination should suffice. With this release, the minimum supported version of macOS will become macOS Ventura 13.5. That means that support is dropped for Monterey and Ventura's older builds. Since Homebrew is also changing with built-in service management I think it's time to drop support for these older versions of macOS, which I no longer intend to test for. Older versions of PHP Monitor will, of course, remain functional, but since Homebrew is an ever-changing thing, I cannot guarantee nothing will break in those older versions with the newer API. --- PHP Monitor.xcodeproj/project.pbxproj | 24 ++++++++++++------------ README.md | 2 +- SECURITY.md | 7 +++++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index c742305..c3e8717 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -3706,8 +3706,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.2; + MACOSX_DEPLOYMENT_TARGET = 13.5; + MARKETING_VERSION = 25.06; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3737,8 +3737,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.2; + MACOSX_DEPLOYMENT_TARGET = 13.5; + MARKETING_VERSION = 25.06; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3978,8 +3978,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.2; + MACOSX_DEPLOYMENT_TARGET = 13.5; + MARKETING_VERSION = 25.06; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME) DEV"; @@ -4095,8 +4095,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.2; + MACOSX_DEPLOYMENT_TARGET = 13.5; + MARKETING_VERSION = 25.06; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME) DEV"; @@ -4212,8 +4212,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.2; + MACOSX_DEPLOYMENT_TARGET = 13.5; + MARKETING_VERSION = 25.06; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME) EAP"; @@ -4395,8 +4395,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.2; + MACOSX_DEPLOYMENT_TARGET = 13.5; + MARKETING_VERSION = 25.06; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap; PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_NAME = "$(TARGET_NAME) EAP"; diff --git a/README.md b/README.md index adaee26..539f41c 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ You can also add new domains as links, isolate sites, manage various services, a PHP Monitor is a universal application that runs natively on Apple Silicon **and** Intel-based Macs. * Your user account can administer your computer (required for some functionality, e.g. certificate generation) -* macOS 12.4 or later +* macOS 13.5 or later * Homebrew is installed in the default location (`/usr/local/homebrew` or `/opt/homebrew`) * Homebrew `php` formula is installed * Optional but recommended: Laravel Valet diff --git a/SECURITY.md b/SECURITY.md index 6f443d8..162bed8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,11 +2,13 @@ ## Supported versions -Generally speaking, only the latest version of **PHP Monitor** is supported, except during transition periods (for example, when particular system requirements go up): +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 | Minimum Deployment | Detected PHP Versions | Recommended Valet Version | | ------- | ------------- | ------------------ | ----- | ----- | ----- | ---- -| 7.1 | ✅ Universal binary | ✅ Yes | Monterey (12.4+)
Ventura (13.0+)
Sonoma (14.0+)
Sequoia (15.0+) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)
PHP 7.0—PHP 8.4 (w/ Valet 3.x)
PHP 7.1-PHP 8.5 (w/ Valet 4.x)| 3.0 or higher recommended
2.16.2 minimum | +| 25 | ✅ Universal binary | ✅ Yes | Ventura (13.5+)
Sonoma (14.0+)
Sequoia (15.0+)
Tahoe (26.0+)* | macOS 13.5+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)
PHP 7.0—PHP 8.4 (w/ Valet 3.x)
PHP 7.1-PHP 8.5 (w/ Valet 4.x)| 3.0 or higher recommended
2.16.2 minimum | + +(*) Denotes preliminary supported based on the app being built with the latest version of the SDK prior to the release of the latest release of macOS. Please check out the pinned issue for more information. ## Legacy versions @@ -14,6 +16,7 @@ These versions of PHP Monitor are no longer supported, but if you’re using an | Version | Apple Silicon | Supported | Supported macOS | Minimum Deployment | Detected PHP Versions | Minimum Required Valet Version | | ------- | ------------- | ------------------ | ----- | ----- | ----- | ---- +| 7.1 | ✅ Universal binary | ❌ | Monterey (12.4+)
Ventura (13.0+)
Sonoma (14.0+)
Sequoia (15.0+) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)
PHP 7.0—PHP 8.4 (w/ Valet 3.x)
PHP 7.1-PHP 8.5 (w/ Valet 4.x)| 3.0 or higher recommended
2.16.2 minimum | | 7.0 | ✅ Universal binary | ❌ | Monterey (12.4+)
Ventura (13.0+)
Sonoma (14.0) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)
PHP 7.0—PHP 8.4 (w/ Valet 3.x)
PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended
2.16.2 minimum | | 6.2 | ✅ Universal binary | ❌ | Monterey (12.4+)
Ventura (13.0+)
Sonoma (14.0) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)
PHP 7.0—PHP 8.4 (w/ Valet 3.x)
PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended
2.16.2 minimum | | 6.1 | ✅ Universal binary | ❌ | Monterey (12.4+)
Ventura (13.0+)
Sonoma (14.0) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)
PHP 7.0—PHP 8.4 (w/ Valet 3.x)
PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended
2.16.2 minimum | From 8e24851014a34ced5a916fbd556f3f321ba8ed8d Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Tue, 10 Jun 2025 19:45:43 +0200 Subject: [PATCH 02/14] =?UTF-8?q?=F0=9F=8D=B1=20Add=20icon=20w/=20Icon=20C?= =?UTF-8?q?omposer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icon.icon/Assets/phpmon.svg | 10 +++++ .../xcode-icon-composer/icon.icon/icon.json | 45 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 assets/xcode-icon-composer/icon.icon/Assets/phpmon.svg create mode 100644 assets/xcode-icon-composer/icon.icon/icon.json diff --git a/assets/xcode-icon-composer/icon.icon/Assets/phpmon.svg b/assets/xcode-icon-composer/icon.icon/Assets/phpmon.svg new file mode 100644 index 0000000..948ce02 --- /dev/null +++ b/assets/xcode-icon-composer/icon.icon/Assets/phpmon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xcode-icon-composer/icon.icon/icon.json b/assets/xcode-icon-composer/icon.icon/icon.json new file mode 100644 index 0000000..0ad2488 --- /dev/null +++ b/assets/xcode-icon-composer/icon.icon/icon.json @@ -0,0 +1,45 @@ +{ + "fill" : { + "linear-gradient" : [ + "srgb:0.27800,0.58000,0.98800,1.00000", + "srgb:0.27800,0.58000,0.98800,1.00000" + ] + }, + "groups" : [ + { + "blend-mode" : "screen", + "blur-material" : null, + "layers" : [ + { + "blend-mode" : "normal", + "glass" : true, + "image-name" : "phpmon.svg", + "name" : "phpmon", + "position" : { + "scale" : 1.85, + "translation-in-points" : [ + 10.0234375, + 8.21875 + ] + } + } + ], + "lighting" : "individual", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file From 9988b775c9f3032bad733c5c3fa7d16c020f26ca Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Tue, 17 Jun 2025 12:01:25 +0200 Subject: [PATCH 03/14] =?UTF-8?q?=F0=9F=90=9B=20Add=20spinner=20back=20to?= =?UTF-8?q?=20domain=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Domain/App/Base.lproj/Main.storyboard | 51 ++++++++++++++----- .../Modules/Domain List/UI/DomainListVC.swift | 6 +++ 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/phpmon/Domain/App/Base.lproj/Main.storyboard b/phpmon/Domain/App/Base.lproj/Main.storyboard index 55a04db..f1a7b70 100644 --- a/phpmon/Domain/App/Base.lproj/Main.storyboard +++ b/phpmon/Domain/App/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -826,13 +826,6 @@ Gw - - - - - - - @@ -1150,21 +1143,51 @@ Gw + + - - + + + @@ -1399,7 +1422,7 @@ Gw - -