mirror of
https://github.com/nicoverbruggen/phpmon.git
synced 2026-03-30 00:20:08 +02:00
👌 Add support for <= and < version constraints
I am entirely unsure why one would need these, but I figured I'd get these in the app before I start the work on PHP Monitor 6.0. This ensures all common version constraints can now be parsed correctly.
This commit is contained in:
@@ -1741,7 +1741,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 = 965;
|
CURRENT_PROJECT_VERSION = 970;
|
||||||
DEAD_CODE_STRIPPING = YES;
|
DEAD_CODE_STRIPPING = YES;
|
||||||
DEBUG = YES;
|
DEBUG = YES;
|
||||||
DEVELOPMENT_TEAM = 8M54J5J787;
|
DEVELOPMENT_TEAM = 8M54J5J787;
|
||||||
@@ -1752,7 +1752,7 @@
|
|||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 11.0;
|
MACOSX_DEPLOYMENT_TARGET = 11.0;
|
||||||
MARKETING_VERSION = 5.6.0;
|
MARKETING_VERSION = 5.6.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 = "";
|
||||||
@@ -1769,7 +1769,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 = 965;
|
CURRENT_PROJECT_VERSION = 970;
|
||||||
DEAD_CODE_STRIPPING = YES;
|
DEAD_CODE_STRIPPING = YES;
|
||||||
DEBUG = NO;
|
DEBUG = NO;
|
||||||
DEVELOPMENT_TEAM = 8M54J5J787;
|
DEVELOPMENT_TEAM = 8M54J5J787;
|
||||||
@@ -1780,7 +1780,7 @@
|
|||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 11.0;
|
MACOSX_DEPLOYMENT_TARGET = 11.0;
|
||||||
MARKETING_VERSION = 5.6.0;
|
MARKETING_VERSION = 5.6.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 = "";
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
import XCTest
|
import XCTest
|
||||||
|
|
||||||
|
// swiftlint:disable type_body_length
|
||||||
class PhpVersionNumberTest: XCTestCase {
|
class PhpVersionNumberTest: XCTestCase {
|
||||||
|
|
||||||
func testCanDeconstructPhpVersion() throws {
|
func testCanDeconstructPhpVersion() throws {
|
||||||
@@ -287,4 +288,76 @@ class PhpVersionNumberTest: XCTestCase {
|
|||||||
.make(from: ["7.3.1", "7.2.9"]).all
|
.make(from: ["7.3.1", "7.2.9"]).all
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func testCanCheckLessThanOrEqualConstraints() throws {
|
||||||
|
XCTAssertEqual(
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
|
||||||
|
.matching(constraint: "<=7.2", strict: true),
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.2", "7.1", "7.0"]).all
|
||||||
|
)
|
||||||
|
|
||||||
|
XCTAssertEqual(
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
|
||||||
|
.matching(constraint: "<=7.2.0", strict: true),
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.2", "7.1", "7.0"]).all
|
||||||
|
)
|
||||||
|
|
||||||
|
// Strict check (>7.2.5 is too new for 7.2 which resolves to 7.2.0)
|
||||||
|
XCTAssertEqual(
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
|
||||||
|
.matching(constraint: "<=7.2.5", strict: true),
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.2", "7.1", "7.0"]).all
|
||||||
|
)
|
||||||
|
|
||||||
|
// Non-strict check (ignoring patch has no effect)
|
||||||
|
XCTAssertEqual(
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
|
||||||
|
.matching(constraint: "<=7.2.5", strict: false),
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.2", "7.1", "7.0"]).all
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func testCanCheckLessThanConstraints() throws {
|
||||||
|
XCTAssertEqual(
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
|
||||||
|
.matching(constraint: "<7.2", strict: true),
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.1", "7.0"]).all
|
||||||
|
)
|
||||||
|
|
||||||
|
XCTAssertEqual(
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
|
||||||
|
.matching(constraint: "<7.2.0", strict: true),
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.1", "7.0"]).all
|
||||||
|
)
|
||||||
|
|
||||||
|
// Strict check (>7.2.5 is too new for 7.2 which resolves to 7.2.0)
|
||||||
|
XCTAssertEqual(
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
|
||||||
|
.matching(constraint: "<7.2.5", strict: true),
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.2", "7.1", "7.0"]).all
|
||||||
|
)
|
||||||
|
|
||||||
|
// Non-strict check (patch resolves to 7.2.999, which is bigger than 7.2.5)
|
||||||
|
XCTAssertEqual(
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"])
|
||||||
|
.matching(constraint: "<7.2.5", strict: false),
|
||||||
|
PhpVersionNumberCollection
|
||||||
|
.make(from: ["7.1", "7.0"]).all
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,6 +87,14 @@ public struct PhpVersionNumberCollection: Equatable {
|
|||||||
return self.versions.filter { $0.isNewerThan(version, strict) }
|
return self.versions.filter { $0.isNewerThan(version, strict) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if let version = PhpVersionNumber.make(from: constraint, type: .smallerThanOrEqual) {
|
||||||
|
return self.versions.filter { $0.isSameAs(version, strict) || $0.isOlderThan(version, strict)}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let version = PhpVersionNumber.make(from: constraint, type: .smallerThan) {
|
||||||
|
return self.versions.filter { $0.isOlderThan(version, strict)}
|
||||||
|
}
|
||||||
|
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -116,12 +124,8 @@ public struct PhpVersionNumber: Equatable, Hashable {
|
|||||||
case tildeVersionRange = #"^~(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
|
case tildeVersionRange = #"^~(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
|
||||||
case greaterThanOrEqual = #"^>=(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
|
case greaterThanOrEqual = #"^>=(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
|
||||||
case greaterThan = #"^>(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
|
case greaterThan = #"^>(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
|
||||||
|
|
||||||
// TODO: (6.0) Handle these cases (even though I suspect these are uncommon)
|
|
||||||
/*
|
|
||||||
case smallerThanOrEqual = #"^<=(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
|
case smallerThanOrEqual = #"^<=(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
|
||||||
case smallerThan = #"^<(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
|
case smallerThan = #"^<(?<major>\d+).(?<minor>\d+).?(?<patch>\d+)?\z"#
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static func parse(_ text: String) throws -> Self {
|
public static func parse(_ text: String) throws -> Self {
|
||||||
@@ -175,6 +179,15 @@ public struct PhpVersionNumber: Equatable, Hashable {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal func isOlderThan(_ version: PhpVersionNumber, _ strict: Bool) -> Bool {
|
||||||
|
return (
|
||||||
|
self.major < version.major ||
|
||||||
|
self.major == version.major && self.minor < version.minor ||
|
||||||
|
self.major == version.major && self.minor == version.minor
|
||||||
|
&& self.patch(strict) < version.patch(strict)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
internal func hasNewerMinorVersionOrPatch(_ version: PhpVersionNumber, _ strict: Bool) -> Bool {
|
internal func hasNewerMinorVersionOrPatch(_ version: PhpVersionNumber, _ strict: Bool) -> Bool {
|
||||||
return self.major == version.major &&
|
return self.major == version.major &&
|
||||||
(
|
(
|
||||||
|
|||||||
Reference in New Issue
Block a user