🚀 Version 5.3

Merge branch 'dev/5.3'

.swiftlint.yml

@@ -0,0 +1,15 @@
+disabled_rules:
+  - todo
+  - identifier_name
+  - force_try
+  - force_cast
+
+opt_in_rules:
+  - empty_count
+
+included:
+  - phpmon
+  - phpmon-tests
+
+excluded:
+  - phpmon/Vendor

DEVELOPER.md

@@ -1,5 +1,19 @@
 # DEVELOPER README
 
+## ✅ Linting
+
+This project uses the [SwiftLint](https://github.com/realm/SwiftLint) linter. You must install it and can run it like so:
+
+```
+swiftlint
+```
+
+It also automatically runs when you try to build the project. You'll get a warning if `swiftlint` is not installed, though. You can attempt to automatically fix issues:
+
+```
+swiftlint --fix
+```
+
 ## 🔧 Build instructions
 
 <img src="./docs/build.png" width="404px" alt="build button in Xcode"/>

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

@@ -61,6 +61,12 @@
             ReferencedContainer = "container:PHP Monitor.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "--v"
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "PHPMON_MARKETING_MODE"

README.md

@@ -149,6 +149,15 @@ This should install `dnsmasq` and set up Valet. Great, almost there!
 Finally, run PHP Monitor. Since the app is notarized and signed with a developer ID, it should work.
 </details>
 
+<details>
+<summary><strong>How frequently does PHP Monitor check for updates?</strong></summary>
+
+PHP Monitor will check if an update is available every time you start the app.
+
+You can disable this behaviour by going to Preferences (via the PHP Monitor icon in the menu bar) and unchecking "Automatically check for updates". You can always check for updates manually.
+
+</details>
+
 <details>
 <summary><strong>I have PHP Monitor installed, and it works. I want to upgrade my PHP installations to the latest version, what's the best way to do this?</strong></summary>
 
@@ -278,9 +287,13 @@ PHP Monitor is a universal app and supports both architectures, so [find out her
 <details>
 <summary><strong>Why is the app doing network requests?</strong></summary>
 
-It's Homebrew. I can't prevent `brew` from doing things via the network when I invoke it.
+The app will automatically check for updates, which is the most likely culprit. 
+
+This happens at launch (unless disabled), and the app directly checks the Caskfile hosted on GitHub. This data is not, and will not be used for analytics (and, as far as I can tell, cannot).
+
+I also can't prevent `brew` from doing things via the network when PHP Monitor uses the binary.
 
-PHP Monitor itself doesn't do any network requests. Feel free to check the source code or intercept the traffic, if you don't believe me.
+The app includes an Internet Access Policy file, so if you're using something like Little Snitch there should be a description why these calls occur.
 
 </details>
 

phpmon-tests/Commands/CommandTest.swift

@@ -3,7 +3,7 @@
 //  phpmon-tests
 //
 //  Created by Nico Verbruggen on 13/02/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
@@ -15,11 +15,11 @@ class CommandTest: XCTestCase {
             path: Paths.php,
             arguments: ["-v"]
         )
-        
+
         XCTAssert(version.contains("(cli)"))
         XCTAssert(version.contains("NTS"))
         XCTAssert(version.contains("built"))
         XCTAssert(version.contains("Zend"))
     }
-    
+
 }

phpmon-tests/Parsers/BrewJsonParserTest.swift → phpmon-tests/Parsers/HomebrewPackageTest.swift

@@ -3,50 +3,50 @@
 //  phpmon-tests
 //
 //  Created by Nico Verbruggen on 14/02/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
 
-class BrewJsonParserTest: XCTestCase {
-    
+class HomebrewPackageTest: XCTestCase {
+
     // - MARK: SYNTHETIC TESTS
 
     static var jsonBrewFile: URL {
         return Bundle(for: Self.self)
-            .url(forResource: "brew", withExtension: "json")!
+            .url(forResource: "brew-formula", withExtension: "json")!
     }
 
     func testCanLoadExtensionJson() throws {
         let json = try! String(contentsOf: Self.jsonBrewFile, encoding: .utf8)
         let package = try! JSONDecoder().decode(
             [HomebrewPackage].self, from: json.data(using: .utf8)!
         ).first!
-        
+
         XCTAssertEqual(package.name, "php")
         XCTAssertEqual(package.full_name, "php")
         XCTAssertEqual(package.aliases.first!, "[email protected]")
         XCTAssertEqual(package.installed.contains(where: { installed in
             installed.version.starts(with: "8.0")
         }), true)
     }
-    
+
     static var jsonBrewServicesFile: URL {
         return Bundle(for: Self.self)
             .url(forResource: "brew-services", withExtension: "json")!
     }
-    
+
     func testCanParseServicesJson() throws {
         let json = try! String(contentsOf: Self.jsonBrewServicesFile, encoding: .utf8)
         let services = try! JSONDecoder().decode(
             [HomebrewService].self, from: json.data(using: .utf8)!
         )
-        
+
         XCTAssertGreaterThan(services.count, 0)
         XCTAssertEqual(services.first?.name, "dnsmasq")
         XCTAssertEqual(services.first?.service_name, "homebrew.mxcl.dnsmasq")
     }
-    
+
     // - MARK: LIVE TESTS
 
     /// This test requires that you have a valid Homebrew installation set up,
@@ -63,13 +63,13 @@ class BrewJsonParserTest: XCTestCase {
         ).filter({ service in
             return ["php", "nginx", "dnsmasq"].contains(service.name)
         })
-        
-        XCTAssertTrue(services.contains(where: {$0.name == "php"} ))
-        XCTAssertTrue(services.contains(where: {$0.name == "nginx"} ))
-        XCTAssertTrue(services.contains(where: {$0.name == "dnsmasq"} ))
+
+        XCTAssertTrue(services.contains(where: {$0.name == "php"}))
+        XCTAssertTrue(services.contains(where: {$0.name == "nginx"}))
+        XCTAssertTrue(services.contains(where: {$0.name == "dnsmasq"}))
         XCTAssertEqual(services.count, 3)
     }
-    
+
     /// This test requires that you have a valid Homebrew installation set up,
     /// and requires the `php` formula to be installed.
     /// If this test fails, there is an issue with your Homebrew installation
@@ -79,7 +79,7 @@ class BrewJsonParserTest: XCTestCase {
             [HomebrewPackage].self,
             from: Shell.pipe("\(Paths.brew) info php --json", requiresPath: true).data(using: .utf8)!
         ).first!
-        
+
         XCTAssertTrue(package.name == "php")
     }
 }

phpmon-tests/Parsers/NginxConfigurationTest.swift

@@ -0,0 +1,81 @@
+//
+//  NginxConfigurationTest.swift
+//  phpmon-tests
+//
+//  Created by Nico Verbruggen on 29/11/2021.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import XCTest
+
+class NginxConfigurationTest: XCTestCase {
+
+    // MARK: - Test Files
+
+    static var regularUrl: URL {
+        return Bundle(for: Self.self).url(forResource: "nginx-site", withExtension: "test")!
+    }
+
+    static var isolatedUrl: URL {
+        return Bundle(for: Self.self).url(forResource: "nginx-site-isolated", withExtension: "test")!
+    }
+
+    static var proxyUrl: URL {
+        return Bundle(for: Self.self).url(forResource: "nginx-proxy", withExtension: "test")!
+    }
+
+    static var secureProxyUrl: URL {
+        return Bundle(for: Self.self).url(forResource: "nginx-secure-proxy", withExtension: "test")!
+    }
+
+    static var customTldProxyUrl: URL {
+        return Bundle(for: Self.self).url(forResource: "nginx-secure-proxy-custom-tld", withExtension: "test")!
+    }
+
+    // MARK: - Tests
+
+    func testCanDetermineSiteNameAndTld() throws {
+        XCTAssertEqual(
+            "nginx-site",
+            NginxConfiguration.from(filePath: NginxConfigurationTest.regularUrl.path)?.domain
+        )
+        XCTAssertEqual(
+            "test",
+            NginxConfiguration.from(filePath: NginxConfigurationTest.regularUrl.path)?.tld
+        )
+    }
+
+    func testCanDetermineIsolation() throws {
+        XCTAssertNil(
+            NginxConfiguration.from(filePath: NginxConfigurationTest.regularUrl.path)?.isolatedVersion
+        )
+
+        XCTAssertEqual(
+            "8.1",
+            NginxConfiguration.from(filePath: NginxConfigurationTest.isolatedUrl.path)?.isolatedVersion
+        )
+    }
+
+    func testCanDetermineProxy() throws {
+        let proxied = NginxConfiguration.from(filePath: NginxConfigurationTest.proxyUrl.path)!
+        XCTAssertTrue(proxied.contents.contains("# valet stub: proxy.valet.conf"))
+        XCTAssertEqual("http://127.0.0.1:90", proxied.proxy)
+
+        let normal = NginxConfiguration.from(filePath: NginxConfigurationTest.regularUrl.path)!
+        XCTAssertFalse(normal.contents.contains("# valet stub: proxy.valet.conf"))
+        XCTAssertEqual(nil, normal.proxy)
+    }
+
+    func testCanDetermineSecuredProxy() throws {
+        let proxied = NginxConfiguration.from(filePath: NginxConfigurationTest.secureProxyUrl.path)!
+        XCTAssertTrue(proxied.contents.contains("# valet stub: secure.proxy.valet.conf"))
+        XCTAssertEqual("http://127.0.0.1:90", proxied.proxy)
+    }
+
+    func testCanDetermineProxyWithCustomTld() throws {
+        let proxied = NginxConfiguration.from(filePath: NginxConfigurationTest.customTldProxyUrl.path)!
+        XCTAssertTrue(proxied.contents.contains("# valet stub: secure.proxy.valet.conf"))
+        XCTAssertEqual("http://localhost:8080", proxied.proxy)
+    }
+
+}

phpmon-tests/Parsers/ExtensionParserTest.swift → phpmon-tests/Parsers/PhpExtensionTest.swift

@@ -3,70 +3,75 @@
 //  phpmon-tests
 //
 //  Created by Nico Verbruggen on 13/02/2021.
-//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
 //
 
 import XCTest
 
-class ExtensionParserTest: XCTestCase {
-    
+class PhpExtensionTest: XCTestCase {
+
     static var phpIniFileUrl: URL {
         return Bundle(for: Self.self).url(forResource: "php", withExtension: "ini")!
     }
 
     func testCanLoadExtension() throws {
         let extensions = PhpExtension.load(from: Self.phpIniFileUrl)
-        
+
         XCTAssertGreaterThan(extensions.count, 0)
     }
-    
+
     func testExtensionNameIsCorrect() throws {
         let extensions = PhpExtension.load(from: Self.phpIniFileUrl)
-        
+
         let extensionNames = extensions.map { (ext) -> String in
             return ext.name
         }
-        
+
         // These 6 should be found
         XCTAssertTrue(extensionNames.contains("xdebug"))
         XCTAssertTrue(extensionNames.contains("imagick"))
         XCTAssertTrue(extensionNames.contains("sodium-next"))
         XCTAssertTrue(extensionNames.contains("opcache"))
         XCTAssertTrue(extensionNames.contains("yaml"))
         XCTAssertTrue(extensionNames.contains("custom"))
-        
+
         XCTAssertFalse(extensionNames.contains("fake"))
         XCTAssertFalse(extensionNames.contains("nice"))
     }
-    
+
     func testExtensionStatusIsCorrect() throws {
         let extensions = PhpExtension.load(from: Self.phpIniFileUrl)
-        
+
         // xdebug should be enabled
         XCTAssertEqual(extensions[0].enabled, true)
-        
+
         // imagick should be disabled
         XCTAssertEqual(extensions[1].enabled, false)
     }
-    
+
     func testToggleWorksAsExpected() throws {
         let destination = Utility.copyToTemporaryFile(resourceName: "php", fileExtension: "ini")!
         let extensions = PhpExtension.load(from: destination)
         XCTAssertEqual(extensions.count, 6)
-        
+
         // Try to disable xdebug (should be detected first)!
         let xdebug = extensions.first!
         XCTAssertTrue(xdebug.name == "xdebug")
         XCTAssertEqual(xdebug.enabled, true)
         xdebug.toggle()
         XCTAssertEqual(xdebug.enabled, false)
-        
+
         // Check if the file contains the appropriate data
         let file = try! String(contentsOf: destination, encoding: .utf8)
         XCTAssertTrue(file.contains("; zend_extension=\"xdebug.so\""))
-        
+
         // Make sure if we load the data again, it's disabled
         XCTAssertEqual(PhpExtension.load(from: destination).first!.enabled, false)
     }
 
+    func testCanRetrieveXdebugMode() throws {
+        let value = Command.execute(path: Paths.php, arguments: ["-r", "echo ini_get('xdebug.mode');"])
+        XCTAssertEqual(value, "coverage")
+    }
+
 }