phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-11-06 21:00:07 +01:00
Code Releases Activity

🐛 Fix initialization of Site objects (#74)

Browse Source
This commit is contained in:
Nico Verbruggen
2021-12-23 12:29:12 +01:00
parent 8cb2074d76
commit 0b05bb44a2
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PHP Monitor.xcodeproj/project.pbxproj
View File

@@ -825,7 +825,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 135; CURRENT_PROJECT_VERSION = 136;
DEVELOPMENT_TEAM = 8M54J5J787; DEVELOPMENT_TEAM = 8M54J5J787;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = phpmon/Info.plist; INFOPLIST_FILE = phpmon/Info.plist;
@@ -834,7 +834,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 11.0; MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 4.1; MARKETING_VERSION = 4.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@@ -850,7 +850,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 135; CURRENT_PROJECT_VERSION = 136;
DEVELOPMENT_TEAM = 8M54J5J787; DEVELOPMENT_TEAM = 8M54J5J787;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = phpmon/Info.plist; INFOPLIST_FILE = phpmon/Info.plist;
@@ -859,7 +859,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 11.0; MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 4.1; MARKETING_VERSION = 4.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

2
phpmon/Constants.swift
View File

@@ -50,7 +50,5 @@ class Constants {
// dev release. In this case, that means that the version below is detected. // dev release. In this case, that means that the version below is detected.
"8.2" "8.2"
] ]
} }

10
phpmon/Domain/Integrations/Valet/Valet.swift
View File

@@ -84,6 +84,12 @@ class Valet {
// We can also determine whether the thing at the path is a directory, too // We can also determine whether the thing at the path is a directory, too
let type = attrs[FileAttributeKey.type] as! FileAttributeType let type = attrs[FileAttributeKey.type] as! FileAttributeType
// We should also check that we can interpret the path correctly
if URL(fileURLWithPath: siteDir).lastPathComponent == "" {
print("Warning: could not parse the site: \(siteDir), skipping!")
return
}
if type == FileAttributeType.typeSymbolicLink { if type == FileAttributeType.typeSymbolicLink {
sites.append(Site(aliasPath: siteDir, tld: tld)) sites.append(Site(aliasPath: siteDir, tld: tld))
} else if type == FileAttributeType.typeDirectory { } else if type == FileAttributeType.typeDirectory {
@@ -114,7 +120,7 @@ class Valet {
convenience init(absolutePath: String, tld: String) { convenience init(absolutePath: String, tld: String) {
self.init() self.init()
self.absolutePath = absolutePath self.absolutePath = absolutePath
self.name = URL(string: absolutePath)!.lastPathComponent self.name = URL(fileURLWithPath: absolutePath).lastPathComponent
self.aliasPath = nil self.aliasPath = nil
determineSecured(tld) determineSecured(tld)
determineDriver() determineDriver()
@@ -123,7 +129,7 @@ class Valet {
convenience init(aliasPath: String, tld: String) { convenience init(aliasPath: String, tld: String) {
self.init() self.init()
self.absolutePath = try! FileManager.default.destinationOfSymbolicLink(atPath: aliasPath) self.absolutePath = try! FileManager.default.destinationOfSymbolicLink(atPath: aliasPath)
self.name = URL(string: aliasPath)!.lastPathComponent self.name = URL(fileURLWithPath: aliasPath).lastPathComponent
self.aliasPath = aliasPath self.aliasPath = aliasPath
determineSecured(tld) determineSecured(tld)
determineDriver() determineDriver()