1
0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 03:50:08 +02:00

🔀 Merge branch 'dev/5.8' into dev/6.0

This commit is contained in:
2023-02-27 19:13:12 +01:00
7 changed files with 28 additions and 15 deletions

View File

@ -276,6 +276,8 @@ This problem is usually resolved by upgrading Valet and running `valet install`
composer global update composer global update
valet install valet install
If you are seeing a 502 (Bad Gateway) error after about 30 seconds or so, your request is likely timing out. You may need to solve a performance issue with your own code.
</details> </details>
<details> <details>

View File

@ -41,15 +41,11 @@ class RealFileSystem: FileSystemProtocol {
} }
func getShallowContentsOfDirectory(_ path: String) throws -> [String] { func getShallowContentsOfDirectory(_ path: String) throws -> [String] {
return try FileManager.default.contentsOfDirectory( return try FileManager.default.contentsOfDirectory(atPath: path.replacingTildeWithHomeDirectory)
atPath: path.replacingTildeWithHomeDirectory
)
} }
func getDestinationOfSymlink(_ path: String) throws -> String { func getDestinationOfSymlink(_ path: String) throws -> String {
return try FileManager.default.destinationOfSymbolicLink( return try FileManager.default.destinationOfSymbolicLink(atPath: path.replacingTildeWithHomeDirectory)
atPath: path.replacingTildeWithHomeDirectory
)
} }
// MARK: - Move & Delete Files // MARK: - Move & Delete Files
@ -62,9 +58,7 @@ class RealFileSystem: FileSystemProtocol {
} }
func remove(_ path: String) throws { func remove(_ path: String) throws {
try FileManager.default.removeItem( try FileManager.default.removeItem(atPath: path.replacingTildeWithHomeDirectory)
atPath: path.replacingTildeWithHomeDirectory
)
} }
// MARK: FS Attributes // MARK: FS Attributes

View File

@ -121,6 +121,9 @@ extension MainMenu {
// Check if the linked version has changed between launches of phpmon // Check if the linked version has changed between launches of phpmon
Stats.evaluateLastLinkedPhpVersion() Stats.evaluateLastLinkedPhpVersion()
// Check if an update was performed earlier
AppUpdater.checkIfUpdateWasPerformed()
// We are ready! // We are ready!
Log.info("PHP Monitor is ready to serve!") Log.info("PHP Monitor is ready to serve!")

View File

@ -10,6 +10,22 @@
<string>https://github.com/nicoverbruggen/phpmon</string> <string>https://github.com/nicoverbruggen/phpmon</string>
<key>Connections</key> <key>Connections</key>
<array> <array>
<dict>
<key>IsIncoming</key>
<false/>
<key>Host</key>
<string>github.com, api.github.com</string>
<key>NetworkProtocol</key>
<string>TCP</string>
<key>Port</key>
<string>443</string>
<key>Relevance</key>
<string>Essential</string>
<key>Purpose</key>
<string>PHP Monitor directly invokes Homebrew which contacts GitHub. This happens when PHP Monitor asks for more information about the PHP formula to determine which version of PHP you&apos;ve got running.</string>
<key>DenyConsequences</key>
<string>If you deny these connections, PHP Monitor might not be able to complete its preset set of instructions, causing version switching to fail.</string>
</dict>
<dict> <dict>
<key>IsIncoming</key> <key>IsIncoming</key>
<false/> <false/>
@ -46,15 +62,15 @@
<key>IsIncoming</key> <key>IsIncoming</key>
<false/> <false/>
<key>Host</key> <key>Host</key>
<string>github.com, api.github.com</string> <string>formulae.brew.sh</string>
<key>NetworkProtocol</key> <key>NetworkProtocol</key>
<string>TCP</string> <string>TCP</string>
<key>Port</key> <key>Port</key>
<string>443</string> <string>80, 443</string>
<key>Relevance</key> <key>Relevance</key>
<string>Essential</string> <string>Essential</string>
<key>Purpose</key> <key>Purpose</key>
<string>PHP Monitor directly invokes Homebrew which contacts GitHub. This happens when PHP Monitor asks for more information about the PHP formula to determine which version of PHP you&apos;ve got running.</string> <string>PHP Monitor directly invokes Homebrew which contacts the Homebrew API. This happens when PHP Monitor asks for more information about the PHP formula to determine which version of PHP you&apos;ve got running.</string>
<key>DenyConsequences</key> <key>DenyConsequences</key>
<string>If you deny these connections, PHP Monitor might not be able to complete its preset set of instructions, causing version switching to fail.</string> <string>If you deny these connections, PHP Monitor might not be able to complete its preset set of instructions, causing version switching to fail.</string>
</dict> </dict>

View File

@ -49,5 +49,4 @@ class CaskFileParserTest: XCTestCase {
XCTAssertTrue(caskFile.properties.keys.contains("url")) XCTAssertTrue(caskFile.properties.keys.contains("url"))
XCTAssertTrue(caskFile.properties.keys.contains("appcast")) XCTAssertTrue(caskFile.properties.keys.contains("appcast"))
} }
} }

View File

@ -72,5 +72,4 @@ class AppVersionTest: XCTestCase {
// Build is older // Build is older
XCTAssertFalse(AppVersion.from("5.0_101")! > AppVersion.from("5.0_102")!) XCTAssertFalse(AppVersion.from("5.0_101")! > AppVersion.from("5.0_102")!)
} }
} }