🚀 Version 5.7.4

nicoverbruggen · Feb 14, 2023 · b0de0c0 · b0de0c0
2 parents 03fdf23 + f27e07f
commit b0de0c0
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 77 deletions.
diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj
@@ -2831,7 +2831,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1037;
+				CURRENT_PROJECT_VERSION = 1040;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -2843,7 +2843,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 5.7.3;
+				MARKETING_VERSION = 5.7.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2860,7 +2860,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1037;
+				CURRENT_PROJECT_VERSION = 1040;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -2872,7 +2872,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 5.7.3;
+				MARKETING_VERSION = 5.7.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3088,7 +3088,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1037;
+				CURRENT_PROJECT_VERSION = 1040;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -3099,7 +3099,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 5.7.3;
+				MARKETING_VERSION = 5.7.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev;
 				PRODUCT_NAME = "$(TARGET_NAME) DEV";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3198,7 +3198,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1037;
+				CURRENT_PROJECT_VERSION = 1040;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -3209,7 +3209,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 5.7.3;
+				MARKETING_VERSION = 5.7.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/phpmon/Common/PHP/Homebrew/HomebrewPackage.swift b/phpmon/Common/PHP/Homebrew/HomebrewPackage.swift
@@ -8,8 +8,6 @@
 import Foundation
 
 struct HomebrewPackage: Decodable {
-
-    let name: String
     let full_name: String
     let aliases: [String]
     let installed: [HomebrewInstalled]

diff --git a/phpmon/Domain/App/EnvironmentManager.swift b/phpmon/Domain/App/EnvironmentManager.swift
@@ -17,15 +17,14 @@ public class EnvironmentManager {
 
             // Failure condition #1: does not contain Laravel Valet
             if !output.contains("Laravel Valet") {
-                return true
+                return false
             }
 
             // Extract the version number
             Valet.shared.version = try! VersionNumber.parse(VersionExtractor.from(output)!)
 
             // Get the actual version
             return Valet.shared.version == nil
-
         }() // returns true if none of the failure conditions are met
     }
 }

diff --git a/phpmon/Domain/DomainList/Cells/DomainListPhpCell.swift b/phpmon/Domain/DomainList/Cells/DomainListPhpCell.swift
@@ -37,7 +37,8 @@ class DomainListPhpCell: NSTableCellView, DomainListCellProtocol {
             imageViewPhpVersionOK.image = NSImage(named: "Isolated")
             imageViewPhpVersionOK.toolTip = "domain_list.tooltips.isolated".localized(site.servingPhpVersion)
         } else {
-            imageViewPhpVersionOK.isHidden = (site.preferredPhpVersion == "???" || !site.isCompatibleWithPreferredPhpVersion)
+            imageViewPhpVersionOK.isHidden = (site.preferredPhpVersion == "???"
+                                              || !site.isCompatibleWithPreferredPhpVersion)
             imageViewPhpVersionOK.image = NSImage(named: "Checkmark")
             imageViewPhpVersionOK.toolTip = "domain_list.tooltips.checkmark".localized(site.preferredPhpVersion)
 

diff --git a/tests/unit/Parsers/HomebrewPackageTest.swift b/tests/unit/Parsers/HomebrewPackageTest.swift
@@ -23,11 +23,10 @@ class HomebrewPackageTest: XCTestCase {
             [HomebrewPackage].self, from: json.data(using: .utf8)!
         ).first!
 
-        XCTAssertEqual(package.name, "php")
         XCTAssertEqual(package.full_name, "php")
-        XCTAssertEqual(package.aliases.first!, "php@8.1")
+        XCTAssertEqual(package.aliases.first!, "php@8.2")
         XCTAssertEqual(package.installed.contains(where: { installed in
-            installed.version.starts(with: "8.1")
+            installed.version.starts(with: "8.2")
         }), true)
     }