phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2026-03-30 08:20:09 +02:00
Code Issues Activity

♻️ Use replacing(with:) instead of .replacingOccurrences(of:with:)

Browse Source 
The newer Swift native method is broadly supported and can properly
handle complex UTF-8 characters like emoji, whereas the old API does
not work correctly with emoji.

In most cases, this likely wouldn't have caused any issues but it does
make things a little cleaner now, and ensures we won't encounter emoji
trouble in the future.
This commit is contained in:
Nico Verbruggen
2025-11-11 12:55:23 +01:00
parent ae26c74029
commit 38b3c108bf
27 changed files with 60 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PHP Monitor.xcodeproj/project.pbxproj
View File

@@ -3920,7 +3920,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 = 1695; CURRENT_PROJECT_VERSION = 1697;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEBUG = YES; DEBUG = YES;
ENABLE_APP_SANDBOX = NO; ENABLE_APP_SANDBOX = NO;
@@ -3939,7 +3939,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 13.5; MACOSX_DEPLOYMENT_TARGET = 13.5;
MARKETING_VERSION = 25.10.2; MARKETING_VERSION = 25.10.3;
PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_MODULE_NAME = PHP_Monitor;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3964,7 +3964,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 = 1695; CURRENT_PROJECT_VERSION = 1697;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEBUG = NO; DEBUG = NO;
ENABLE_APP_SANDBOX = NO; ENABLE_APP_SANDBOX = NO;
@@ -3983,7 +3983,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 13.5; MACOSX_DEPLOYMENT_TARGET = 13.5;
MARKETING_VERSION = 25.10.2; MARKETING_VERSION = 25.10.3;
PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_MODULE_NAME = PHP_Monitor;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4146,7 +4146,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 = 1695; CURRENT_PROJECT_VERSION = 1697;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEBUG = YES; DEBUG = YES;
ENABLE_APP_SANDBOX = NO; ENABLE_APP_SANDBOX = NO;
@@ -4165,7 +4165,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 13.5; MACOSX_DEPLOYMENT_TARGET = 13.5;
MARKETING_VERSION = 25.10.2; MARKETING_VERSION = 25.10.3;
PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap;
PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_MODULE_NAME = PHP_Monitor;
PRODUCT_NAME = "$(TARGET_NAME) EAP"; PRODUCT_NAME = "$(TARGET_NAME) EAP";
@@ -4339,7 +4339,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 = 1695; CURRENT_PROJECT_VERSION = 1697;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEBUG = NO; DEBUG = NO;
ENABLE_APP_SANDBOX = NO; ENABLE_APP_SANDBOX = NO;
@@ -4358,7 +4358,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 13.5; MACOSX_DEPLOYMENT_TARGET = 13.5;
MARKETING_VERSION = 25.10.2; MARKETING_VERSION = 25.10.3;
PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.eap;
PRODUCT_MODULE_NAME = PHP_Monitor; PRODUCT_MODULE_NAME = PHP_Monitor;
PRODUCT_NAME = "$(TARGET_NAME) EAP"; PRODUCT_NAME = "$(TARGET_NAME) EAP";

4
phpmon/Common/Core/Helpers.swift
View File

@@ -31,8 +31,8 @@ func sed(
replacement: String replacement: String
) async { ) async {
// Escape slashes (or `sed` won't work) // Escape slashes (or `sed` won't work)
let e_original = original.replacingOccurrences(of: "/", with: "\\/") let e_original = original.replacing("/", with: "\\/")
let e_replacement = replacement.replacingOccurrences(of: "/", with: "\\/") let e_replacement = replacement.replacing("/", with: "\\/")
// Check if gsed exists; it is able to follow symlinks, // Check if gsed exists; it is able to follow symlinks,
// which we want to do to toggle the extension // which we want to do to toggle the extension

2
phpmon/Common/Extensions/StringExtension.swift
View File

@@ -65,7 +65,7 @@ extension String {
return NSLocalizedString(self, bundle: bundle, comment: "") return NSLocalizedString(self, bundle: bundle, comment: "")
} }
return string.replacingOccurrences(of: "Preferences", with: "Settings") return string.replacing("Preferences", with: "Settings")
} }
var localizedForSwiftUI: LocalizedStringKey { var localizedForSwiftUI: LocalizedStringKey {

10
phpmon/Common/Filesystem/RealFileSystem.swift
View File

@@ -12,11 +12,15 @@ extension String {
var replacingTildeWithHomeDirectory: String { var replacingTildeWithHomeDirectory: String {
// Try and check if there's a shared container // Try and check if there's a shared container
if let paths = App.shared.container.paths { if let paths = App.shared.container.paths {
return self.replacingOccurrences(of: "~", with: paths.homePath) return self.replacing("~", with: paths.homePath)
} }
// TODO: Come up with some other way to handle this when the app container is not available, especially for tests // It's also okay if we're running tests
return self if isRunningTests {
return self
}
fatalError("The app container is not available, the home directory could not be inferred.")
} }
} }

2
phpmon/Common/PHP/Homebrew/HomebrewDecodable.swift
View File

@@ -15,7 +15,7 @@ struct HomebrewPackage: Decodable {
public var version: String { public var version: String {
return aliases.first! return aliases.first!
.replacingOccurrences(of: "php@", with: "") .replacing("php@", with: "")
} }
} }

2
phpmon/Common/PHP/PHP Version/PhpHelper.swift
View File

@@ -16,7 +16,7 @@ class PhpHelper {
for version: String for version: String
) async { ) async {
// Take the PHP version (e.g. "7.2") and generate a dotless version // Take the PHP version (e.g. "7.2") and generate a dotless version
let dotless = version.replacingOccurrences(of: ".", with: "") let dotless = version.replacing(".", with: "")
// Determine the dotless name for this PHP version // Determine the dotless name for this PHP version
let destination = "\(container.paths.homePath)/.config/phpmon/bin/pm\(dotless)" let destination = "\(container.paths.homePath)/.config/phpmon/bin/pm\(dotless)"

4
phpmon/Common/PHP/PhpConfigurationFile.swift
View File

@@ -36,7 +36,7 @@ class PhpConfigurationFile: CreatedFromFile {
_ container: Container, _ container: Container,
filePath: String filePath: String
) -> Self? { ) -> Self? {
let path = filePath.replacingOccurrences(of: "~", with: container.paths.homePath) let path = filePath.replacing("~", with: container.paths.homePath)
do { do {
let fileContents = try container.filesystem.getStringFromFile(path) let fileContents = try container.filesystem.getStringFromFile(path)
@@ -96,7 +96,7 @@ class PhpConfigurationFile: CreatedFromFile {
// Replace the value with the new one // Replace the value with the new one
components[1] = components[1] components[1] = components[1]
.replacingOccurrences(of: item.value, with: value) .replacing(item.value, with: value)
// Replace the specific line // Replace the specific line
self.lines[item.lineIndex] = components.joined(separator: "=") self.lines[item.lineIndex] = components.joined(separator: "=")

6
phpmon/Common/PHP/PhpExtension.swift
View File

@@ -70,8 +70,8 @@ class PhpExtension {
self.line = line self.line = line
let fullPath = String(line[range]) let fullPath = String(line[range])
.replacingOccurrences(of: "\"", with: "") // replace excess " .replacing("\"", with: "") // replace excess "
.replacingOccurrences(of: ".so", with: "") // replace excess .so .replacing(".so", with: "") // replace excess .so
self.name = String(fullPath.split(separator: "/").last!) // take last segment self.name = String(fullPath.split(separator: "/").last!) // take last segment
@@ -88,7 +88,7 @@ class PhpExtension {
// DISABLED: Commented out line // DISABLED: Commented out line
? "; \(line)" ? "; \(line)"
// ENABLED: Line where the comment delimiter (;) is removed // ENABLED: Line where the comment delimiter (;) is removed
: line.replacingOccurrences(of: "; ", with: "") : line.replacing("; ", with: "")
await sed(container, file: file, original: line, replacement: newLine) await sed(container, file: file, original: line, replacement: newLine)

4
phpmon/Common/PHP/Switcher/InternalSwitcher+Valet.swift
View File

@@ -74,7 +74,7 @@ extension InternalSwitcher {
var contents = try container.filesystem.getStringFromFile("~/.composer/vendor/laravel/valet" + file.source) var contents = try container.filesystem.getStringFromFile("~/.composer/vendor/laravel/valet" + file.source)
for (original, replacement) in file.replacements { for (original, replacement) in file.replacements {
contents = contents.replacingOccurrences(of: original, with: replacement) contents = contents.replacing(original, with: replacement)
} }
try container.filesystem.writeAtomicallyToFile( try container.filesystem.writeAtomicallyToFile(
@@ -103,7 +103,7 @@ extension InternalSwitcher {
replacements: [ replacements: [
"VALET_USER": container.paths.whoami, "VALET_USER": container.paths.whoami,
"VALET_HOME_PATH": "~/.config/valet".replacingTildeWithHomeDirectory, "VALET_HOME_PATH": "~/.config/valet".replacingTildeWithHomeDirectory,
"valet.sock": "valet\(version.replacingOccurrences(of: ".", with: "")).sock" "valet.sock": "valet\(version.replacing(".", with: "")).sock"
], ],
applies: { Valet.shared.version!.major > 2 } applies: { Valet.shared.version!.major > 2 }
), ),

2
phpmon/Common/PHP/Switcher/InternalSwitcher.swift
View File

@@ -111,7 +111,7 @@ class InternalSwitcher: PhpSwitcher {
await brew(container, "services start \(formula)", sudo: true) await brew(container, "services start \(formula)", sudo: true)
if Valet.enabled(feature: .isolatedSites) && primary { if Valet.enabled(feature: .isolatedSites) && primary {
let socketVersion = version.replacingOccurrences(of: ".", with: "") let socketVersion = version.replacing(".", with: "")
await container.shell.quiet("ln -sF ~/.config/valet/valet\(socketVersion).sock ~/.config/valet/valet.sock") await container.shell.quiet("ln -sF ~/.config/valet/valet\(socketVersion).sock ~/.config/valet/valet.sock")
Log.info("Symlinked new socket version (valet\(socketVersion).sock → valet.sock).") Log.info("Symlinked new socket version (valet\(socketVersion).sock → valet.sock).")
} }

6
phpmon/Common/Testables/TestableFileSystem.swift
View File

@@ -20,7 +20,7 @@ class TestableFileSystem: FileSystemProtocol {
// Ensure that each of the ~ characters are replaced with the home directory path // Ensure that each of the ~ characters are replaced with the home directory path
accessQueue.sync { accessQueue.sync {
for (key, value) in files { for (key, value) in files {
let adjustedKey = key.contains("~") ? key.replacingOccurrences(of: "~", with: self.homeDirectory) : key let adjustedKey = key.contains("~") ? key.replacing("~", with: self.homeDirectory) : key
self.files[adjustedKey] = value self.files[adjustedKey] = value
} }
@@ -102,7 +102,7 @@ class TestableFileSystem: FileSystemProtocol {
return accessQueue.sync { return accessQueue.sync {
self.files.keys self.files.keys
.filter { $0.hasPrefix(seek) } .filter { $0.hasPrefix(seek) }
.map { $0.replacingOccurrences(of: seek, with: "") } .map { $0.replacing(seek, with: "") }
.filter { !$0.contains("/") } .filter { !$0.contains("/") }
} }
} }
@@ -142,7 +142,7 @@ class TestableFileSystem: FileSystemProtocol {
if key.hasPrefix(path) { if key.hasPrefix(path) {
self.files.renameKey( self.files.renameKey(
fromKey: key, fromKey: key,
toKey: key.replacingOccurrences(of: path, with: newPath) toKey: key.replacing(path, with: newPath)
) )
} }
} }

2
phpmon/Domain/App/AppDelegate+InterApp.swift
View File

@@ -29,7 +29,7 @@ extension AppDelegate {
guard let url = urls.first else { return } guard let url = urls.first else { return }
self.interpretCommand( self.interpretCommand(
url.absoluteString.replacingOccurrences(of: "phpmon://", with: ""), url.absoluteString.replacing("phpmon://", with: ""),
commands: InterApp.getCommands() commands: InterApp.getCommands()
) )
} }

2
phpmon/Domain/App/AppDelegate.swift
View File

@@ -54,7 +54,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
#if DEBUG #if DEBUG
logger.verbosity = .performance logger.verbosity = .performance
if let profile = CommandLine.arguments.first(where: { $0.matches(pattern: "--configuration:*") }) { if let profile = CommandLine.arguments.first(where: { $0.matches(pattern: "--configuration:*") }) {
AppDelegate.initializeTestingProfile(profile.replacingOccurrences(of: "--configuration:", with: "")) AppDelegate.initializeTestingProfile(profile.replacing("--configuration:", with: ""))
} }
#endif #endif

2
phpmon/Domain/App/AppUpdater.swift
View File

@@ -148,7 +148,7 @@ class AppUpdater {
system_quiet("mkdir -p ~/.config/phpmon/updater 2> /dev/null") system_quiet("mkdir -p ~/.config/phpmon/updater 2> /dev/null")
let updaterDirectory = "~/.config/phpmon/updater" let updaterDirectory = "~/.config/phpmon/updater"
.replacingOccurrences(of: "~", with: NSHomeDirectory()) .replacing("~", with: NSHomeDirectory())
system_quiet("cp -R \"\(updater)\" \"\(updaterDirectory)/PHP Monitor Self-Updater.app\"") system_quiet("cp -R \"\(updater)\" \"\(updaterDirectory)/PHP Monitor Self-Updater.app\"")

4
phpmon/Domain/App/Startup.swift
View File

@@ -97,8 +97,8 @@ class Startup {
subtitleText: "alert.homebrew_missing.subtitle".localized, subtitleText: "alert.homebrew_missing.subtitle".localized,
descriptionText: "alert.homebrew_missing.info".localized( descriptionText: "alert.homebrew_missing.info".localized(
App.architecture App.architecture
.replacingOccurrences(of: "x86_64", with: "Intel") .replacing("x86_64", with: "Intel")
.replacingOccurrences(of: "arm64", with: "Apple Silicon"), .replacing("arm64", with: "Apple Silicon"),
App.shared.container.paths.brew App.shared.container.paths.brew
), ),
buttonText: "alert.homebrew_missing.quit".localized, buttonText: "alert.homebrew_missing.quit".localized,

4
phpmon/Domain/Integrations/Common/RCFile.swift
View File

@@ -31,13 +31,13 @@ struct RCFile {
let content = line.split(separator: "=") let content = line.split(separator: "=")
let key = String(content[0]) let key = String(content[0])
.trimmingCharacters(in: .whitespaces) .trimmingCharacters(in: .whitespaces)
.replacingOccurrences(of: "\"", with: "") .replacing("\"", with: "")
if key.starts(with: "#") { if key.starts(with: "#") {
return return
} }
let value = String(content[1]) let value = String(content[1])
.trimmingCharacters(in: .whitespaces) .trimmingCharacters(in: .whitespaces)
.replacingOccurrences(of: "\"", with: "") .replacing("\"", with: "")
fields[key] = value fields[key] = value
} }
}) })

2
phpmon/Domain/Integrations/Homebrew/BrewDiagnostics.swift
View File

@@ -101,7 +101,7 @@ class BrewDiagnostics {
}) { }) {
for symlink in contents { for symlink in contents {
let version = symlink.replacingOccurrences(of: "php@", with: "") let version = symlink.replacing("php@", with: "")
if let destination = try? filesystem.getDestinationOfSymlink("\(container.paths.optPath)/\(symlink)") { if let destination = try? filesystem.getDestinationOfSymlink("\(container.paths.optPath)/\(symlink)") {
if !destination.contains("Cellar/php/\(version)") if !destination.contains("Cellar/php/\(version)")
&& !destination.contains("Cellar/php@\(version)") { && !destination.contains("Cellar/php@\(version)") {

4
phpmon/Domain/Integrations/Homebrew/BrewPhpExtension.swift
View File

@@ -21,8 +21,8 @@ struct BrewPhpExtension: Hashable, Comparable {
$0.contains("shivammathur/extensions/") && $0.contains("@\(phpVersion)") $0.contains("shivammathur/extensions/") && $0.contains("@\(phpVersion)")
} }
.map { .map {
$0.replacingOccurrences(of: "shivammathur/extensions/", with: "") $0.replacing("shivammathur/extensions/", with: "")
.replacingOccurrences(of: "@\(phpVersion)", with: "") .replacing("@\(phpVersion)", with: "")
} }
} }

8
phpmon/Domain/Integrations/Homebrew/BrewPhpFormula.swift
View File

@@ -80,8 +80,8 @@ struct BrewPhpFormula: Equatable {
/// The associated Homebrew folder with this PHP formula. /// The associated Homebrew folder with this PHP formula.
var homebrewFolder: String { var homebrewFolder: String {
let resolved = name let resolved = name
.replacingOccurrences(of: "shivammathur/php/", with: "") .replacing("shivammathur/php/", with: "")
.replacingOccurrences(of: "php@" + PhpEnvironments.brewPhpAlias, with: "php") .replacing("php@" + PhpEnvironments.brewPhpAlias, with: "php")
return "\(App.shared.container.paths.optPath)/\(resolved)/bin" return "\(App.shared.container.paths.optPath)/\(resolved)/bin"
} }
@@ -89,7 +89,7 @@ struct BrewPhpFormula: Equatable {
/// The short version associated with this formula, if installed. /// The short version associated with this formula, if installed.
var shortVersion: String? { var shortVersion: String? {
guard let version = self.installedVersion else { guard let version = self.installedVersion else {
return self.displayName.replacingOccurrences(of: "PHP ", with: "") return self.displayName.replacing("PHP ", with: "")
} }
return VersionNumber.make(from: version)?.short ?? nil return VersionNumber.make(from: version)?.short ?? nil
@@ -112,7 +112,7 @@ struct BrewPhpFormula: Equatable {
return container.filesystem.fileExists( return container.filesystem.fileExists(
"\(container.paths.tapPath)/shivammathur/homebrew-php/Formula/php@\(version).rb" "\(container.paths.tapPath)/shivammathur/homebrew-php/Formula/php@\(version).rb"
.replacingOccurrences(of: "php@" + PhpEnvironments.brewPhpAlias, with: "php") .replacing("php@" + PhpEnvironments.brewPhpAlias, with: "php")
) )
} }

4
phpmon/Domain/Integrations/Homebrew/BrewPhpFormulaeHandler.swift
View File

@@ -63,8 +63,8 @@ class BrewPhpFormulaeHandler: HandlesBrewPhpFormulae {
fullVersion = install.isPreRelease ? "\(fullVersion!)-dev" : fullVersion fullVersion = install.isPreRelease ? "\(fullVersion!)-dev" : fullVersion
upgradeVersion = outdated?.first(where: { formula in upgradeVersion = outdated?.first(where: { formula in
return formula.name.replacingOccurrences(of: "shivammathur/php/", with: "") return formula.name.replacing("shivammathur/php/", with: "")
== install.formulaName.replacingOccurrences(of: "shivammathur/php/", with: "") == install.formulaName.replacing("shivammathur/php/", with: "")
})?.current_version })?.current_version
isPrerelease = install.isPreRelease isPrerelease = install.isPreRelease

4
phpmon/Domain/Integrations/Homebrew/Commands/PHP Versions/RemovePhpVersionCommand.swift
View File

@@ -28,8 +28,8 @@ class RemovePhpVersionCommand: BrewCommand {
) { ) {
self.container = container self.container = container
self.version = formula self.version = formula
.replacingOccurrences(of: "php@", with: "") .replacing("php@", with: "")
.replacingOccurrences(of: "shivammathur/php/", with: "") .replacing("shivammathur/php/", with: "")
self.formula = formula self.formula = formula
self.phpGuard = PhpGuard() self.phpGuard = PhpGuard()
} }

4
phpmon/Domain/Integrations/Nginx/NginxConfigurationFile.swift
View File

@@ -23,7 +23,7 @@ class NginxConfigurationFile: CreatedFromFile {
_ container: Container, _ container: Container,
filePath: String, filePath: String,
) -> Self? { ) -> Self? {
let path = filePath.replacingOccurrences(of: "~", with: container.paths.homePath) let path = filePath.replacing("~", with: container.paths.homePath)
do { do {
let fileContents = try String(contentsOfFile: path) let fileContents = try String(contentsOfFile: path)
@@ -40,7 +40,7 @@ class NginxConfigurationFile: CreatedFromFile {
let tld = String(domain.split(separator: ".").last!) let tld = String(domain.split(separator: ".").last!)
self.contents = contents self.contents = contents
self.domain = domain.replacingOccurrences(of: ".\(tld)", with: "") self.domain = domain.replacing(".\(tld)", with: "")
self.tld = tld self.tld = tld
} }

8
phpmon/Domain/Integrations/Valet/Sites/CertificateValidator.swift
View File

@@ -48,10 +48,10 @@ class CertificateValidator {
// Remove PEM headers and footers, and whitespace // Remove PEM headers and footers, and whitespace
let cleanedCertificate = certificateString let cleanedCertificate = certificateString
.replacingOccurrences(of: "-----BEGIN CERTIFICATE-----", with: "") .replacing("-----BEGIN CERTIFICATE-----", with: "")
.replacingOccurrences(of: "-----END CERTIFICATE-----", with: "") .replacing("-----END CERTIFICATE-----", with: "")
.replacingOccurrences(of: "\n", with: "") .replacing("\n", with: "")
.replacingOccurrences(of: "\r", with: "") .replacing("\r", with: "")
.trimmingCharacters(in: .whitespacesAndNewlines) .trimmingCharacters(in: .whitespacesAndNewlines)
guard let certificateData = Data(base64Encoded: cleanedCertificate) else { guard let certificateData = Data(base64Encoded: cleanedCertificate) else {

2
phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift
View File

@@ -23,7 +23,7 @@ class ValetSite: ValetListable {
/// replacing the user's home folder with ~. /// replacing the user's home folder with ~.
lazy var absolutePathRelative: String = { lazy var absolutePathRelative: String = {
return self.absolutePath return self.absolutePath
.replacingOccurrences(of: container.paths.homePath, with: "~") .replacing(container.paths.homePath, with: "~")
}() }()
/// The TLD used to locate this site. /// The TLD used to locate this site.

4
phpmon/Modules/Domain List/UI/AddProxyVC.swift
View File

@@ -135,10 +135,10 @@ class AddProxyVC: NSViewController, NSTextFieldDelegate {
func updateTextField() { func updateTextField() {
inputDomainName.stringValue = inputDomainName.stringValue inputDomainName.stringValue = inputDomainName.stringValue
.replacingOccurrences(of: " ", with: "-") .replacing(" ", with: "-")
inputProxySubject.stringValue = inputProxySubject.stringValue inputProxySubject.stringValue = inputProxySubject.stringValue
.replacingOccurrences(of: " ", with: "-") .replacing(" ", with: "-")
buttonCreateProxy.isEnabled = validate( buttonCreateProxy.isEnabled = validate(
domain: inputDomainName.stringValue, domain: inputDomainName.stringValue,

2
phpmon/Modules/Domain List/UI/AddSiteVC.swift
View File

@@ -129,7 +129,7 @@ class AddSiteVC: NSViewController, NSTextFieldDelegate {
func updateTextField() { func updateTextField() {
inputDomainName.stringValue = inputDomainName.stringValue inputDomainName.stringValue = inputDomainName.stringValue
.replacingOccurrences(of: " ", with: "-") .replacing(" ", with: "-")
buttonCreateLink.isEnabled = isValidLinkName(inputDomainName.stringValue) buttonCreateLink.isEnabled = isValidLinkName(inputDomainName.stringValue)
updatePreview() updatePreview()

2
tests/unit/Testables/Filesystem/RealFileSystemTest.swift
View File

@@ -118,7 +118,7 @@ struct RealFileSystemTest {
#expect(filesystem.fileExists(executable)) #expect(filesystem.fileExists(executable))
let newExecutable = executable.replacingOccurrences(of: "/exec.sh", with: "/file.txt") let newExecutable = executable.replacing("/exec.sh", with: "/file.txt")
try! filesystem.move(from: executable, to: newExecutable) try! filesystem.move(from: executable, to: newExecutable)