Skip to content

Commit 2e58bbb

Browse files
🚀 Version 5.0.1
🔀 Merge branch 'dev/5.x'
2 parents ab81bf5 + bb6abc5 commit 2e58bbb

File tree

98 files changed

+1127
-853
lines changed

Some content is hidden

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

98 files changed

+1127
-853
lines changed

DEVELOPER.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# DEVELOPER README
2+
3+
## 🔧 Build instructions
4+
5+
<img src="./docs/build.png" width="404px" alt="build button in Xcode"/>
6+
7+
If you'd like to build PHP Monitor yourself, you need:
8+
9+
* Xcode (usually the latest version)
10+
* The contents of this repository
11+
12+
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.)
13+
14+
If you'd like to create a production build, choose "Any Mac" as the target and select Product > Archive.
15+
16+
## 🐛 Symbolication of crashes
17+
18+
If you have an archived build of the app and exported the DSYM, it is possible to symbolicate .ips crash logs.
19+
20+
For example, given the following crash (from an .ips file):
21+
22+
```
23+
Thread 2 Crashed:: Dispatch queue: com.apple.root.user-initiated-qos
24+
0 libswiftDispatch.dylib 0x7ff82aa3ab8c static OS_dispatch_source.makeProcessSource(identifier:eventMask:queue:) + 28
25+
1 PHP Monitor 0x1096907d8 0x10965e000 + 206808
26+
| |
27+
address load address
28+
2 PHP Monitor 0x1096903ac 0x10965e000 + 205740
29+
3 PHP Monitor 0x10968f88b 0x10965e000 + 202891
30+
```
31+
32+
You must use the correct order for the the address and load address in the command below:
33+
34+
```
35+
$ atos -arch x86_64 -o '/path/to/PHP Monitor.app.dSYM/Contents/Resources/DWARF/PHP Monitor' -l 0x10965e000 0x1096907d8
36+
| | | |
37+
architecture path to DSYM load address address
38+
```
39+
40+
This will return the relevant information, for example:
41+
42+
```
43+
FSWatcher.startMonitoring(_:behaviour:) (in PHP Monitor) (PhpConfigWatcher.swift:95)
44+
```
45+
46+
For more information, see [Apple's documentation](https://developer.apple.com/documentation/xcode/adding-identifiable-symbol-names-to-a-crash-report).

PHP Monitor.xcodeproj/project.pbxproj

Lines changed: 78 additions & 162 deletions
Large diffs are not rendered by default.

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

Lines changed: 0 additions & 84 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ You can always still ask Valet using the command line, should it be necessary. I
320320
<details>
321321
<summary><strong>After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade` or `brew cleanup`!</strong></summary>
322322

323-
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).
323+
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.
324324

325-
If you would like to know more, consult [this issue](https://github.com/nicoverbruggen/phpmon/issues/85) for more information.
325+
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.
326326

327327
</details>
328328

@@ -399,15 +399,4 @@ I have done my best to annotate as much as humanly possible, and have avoided us
399399

400400
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.
401401

402-
## 🔧 Build instructions
403-
404-
<img src="./docs/build.png" width="404px" alt="build button in Xcode"/>
405-
406-
If you'd like to build PHP Monitor yourself, you need:
407-
408-
* Xcode (usually the latest version)
409-
* The contents of this repository
410-
411-
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.)
412-
413-
If you'd like to create a production build, choose "Any Mac" as the target and select Product > Archive.
402+
For more detailed information for developers, please see [the documentation file for developers](./DEVS.md).

assets/icons.afdesign

124 KB
Binary file not shown.

phpmon-cli/AllowedArguments.swift

Lines changed: 0 additions & 26 deletions
This file was deleted.

phpmon-cli/main.swift

Lines changed: 0 additions & 103 deletions
This file was deleted.

phpmon-tests/PhpVersionNumberTest.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ import XCTest
1111
class PhpVersionNumberTest: XCTestCase {
1212

1313
func testCanDeconstructPhpVersion() throws {
14+
XCTAssertEqual(
15+
try! PhpVersionNumber.parse("PHP 8.1.0RC5-dev"),
16+
PhpVersionNumber(major: 8, minor: 1, patch: 0)
17+
)
1418
XCTAssertEqual(
1519
PhpVersionNumber.make(from: "8.0.11"),
1620
PhpVersionNumber(major: 8, minor: 0, patch: 11)
@@ -29,6 +33,12 @@ class PhpVersionNumberTest: XCTestCase {
2933
)
3034
}
3135

36+
func testPhpVersionNumberParse() throws {
37+
XCTAssertThrowsError(try PhpVersionNumber.parse("OOF")) { error in
38+
XCTAssertTrue(error is VersionParseError)
39+
}
40+
}
41+
3242
func testCanCheckFixedConstraints() throws {
3343
XCTAssertEqual(
3444
PhpVersionNumberCollection

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"images" : [
33
{
4+
"filename" : "Linked.png",
45
"idiom" : "universal",
56
"scale" : "1x"
67
},
78
{
8-
"filename" : "link.svg",
9+
"filename" : "Linked@2x.png",
910
"idiom" : "universal",
1011
"scale" : "2x"
1112
},
978 Bytes
Loading

0 commit comments

Comments
 (0)