Skip to content

Commit 3e319cd

Browse files
🚀 Version 7.1
2 parents 9778fd5 + 595dc8c commit 3e319cd

File tree

73 files changed

+954
-872
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+954
-872
lines changed

DEVELOPER.md

+17
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@ It also automatically runs when you try to build the project. You'll get a warni
1414
swiftlint --fix
1515
```
1616

17+
## 📦 Swift Packages
18+
19+
Starting from PHP Monitor 7.1, the app now uses various first-party package dependencies.
20+
21+
The following package dependencies are in use:
22+
23+
* [`NVAppUpdater`](https://github.com/nicoverbruggen/NVAppUpdater)
24+
* [`NVAlert`](https://github.com/nicoverbruggen/NVAlert)
25+
26+
You may need an internet connection to download these dependencies, or you can also clone the dependencies and include them manually.
27+
1728
## ⚙️ Preferences
1829

1930
You can find the persisted configuration file in `~/Library/Preferences/com.nicoverbruggen.phpmon.plist`
@@ -40,6 +51,12 @@ Once you have downloaded this repository, open `PHP Monitor.xcodeproj`, and you
4051

4152
If you'd like to create a production build, choose "Any Mac" as the target and select Product > Archive.
4253

54+
## ✅ Testing
55+
56+
In order to properly test everything, you will want to use the _PHP Monitor DEV_ target. There are unit and UI tests both.
57+
58+
You may sporadically see failures in UI tests due to the following error: `Invalid parameter not satisfying: point.x != INFINITY && point.y != INFINITY`. This seems to be an issue with Xcode that Apple may need to resolve?
59+
4360
## 🚀 Release procedure
4461

4562
1. Merge into `main`

PHP Monitor.xcodeproj/project.pbxproj

+115-65
Large diffs are not rendered by default.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1540"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1540"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1540"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1540"
3+
LastUpgradeVersion = "1610"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1540"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You can also add new domains as links, isolate sites, manage various services, a
2222
PHP Monitor is a universal application that runs natively on Apple Silicon **and** Intel-based Macs.
2323

2424
* Your user account can administer your computer (required for some functionality, e.g. certificate generation)
25-
* macOS 12.4 or later (Monterey, Ventura and Sonoma are supported)
25+
* macOS 12.4 or later
2626
* Homebrew is installed in the default location (`/usr/local/homebrew` or `/opt/homebrew`)
2727
* Homebrew `php` formula is installed
2828
* Optional but recommended: Laravel Valet

SECURITY.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ Generally speaking, only the latest version of **PHP Monitor** is supported, exc
66

77
| Version | Apple Silicon | Supported | Supported macOS | Minimum Deployment | Detected PHP Versions | Recommended Valet Version |
88
| ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
9-
| 7.0 | ✅ Universal binary | ✅ Yes | Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
9+
| 7.1 | ✅ Universal binary | ✅ Yes | Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0+)<br/>Sequoia (15.0+) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.5 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
1010

1111
## Legacy versions
1212

1313
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.
1414

1515
| Version | Apple Silicon | Supported | Supported macOS | Minimum Deployment | Detected PHP Versions | Minimum Required Valet Version |
1616
| ------- | ------------- | ------------------ | ----- | ----- | ----- | ----
17+
| 7.0 | ✅ Universal binary || Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
1718
| 6.2 | ✅ Universal binary || Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
1819
| 6.1 | ✅ Universal binary || Monterey (12.4+)<br/>Ventura (13.0+)<br/>Sonoma (14.0) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.4 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.4 (w/ Valet 4.x)| 3.0 or higher recommended<br/> 2.16.2 minimum |
1920
| 6.0 | ✅ Universal binary || Monterey (12.4+)<br/>Ventura (13.0+) | macOS 12.4+ | PHP 5.6—PHP 8.2 (w/ Valet 2.x)<br/>PHP 7.0—PHP 8.2 (w/ Valet 3.x)<br/>PHP 7.1-PHP 8.2 (w/ Valet 4.x) | 3.0 or higher recommended<br/> 2.16.2 minimum |

phpmon-updater/LaunchControl.swift

-46
This file was deleted.

phpmon-updater/Updater.swift

-162
This file was deleted.

phpmon-updater/Utility.swift

-34
This file was deleted.

phpmon-updater/main.swift

+12-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,17 @@
77
//
88

99
import Cocoa
10+
import NVAppUpdater
1011

11-
let app = NSApplication.shared
12-
let delegate = Updater()
13-
app.delegate = delegate
12+
let delegate = SelfUpdater(
13+
appName: "PHP Monitor",
14+
bundleIdentifiers: [
15+
"com.nicoverbruggen.phpmon.eap",
16+
"com.nicoverbruggen.phpmon.dev",
17+
"com.nicoverbruggen.phpmon"
18+
],
19+
selfUpdaterPath: "~/.config/phpmon/updater"
20+
)
21+
22+
NSApplication.shared.delegate = delegate
1423
_ = NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv)

0 commit comments

Comments
 (0)