diff --git a/phpmon/Common/PHP/PHP Version/PhpVersionNumberCollection.swift b/phpmon/Common/PHP/PHP Version/PhpVersionNumberCollection.swift index 3a408c58..356ba6ef 100644 --- a/phpmon/Common/PHP/PHP Version/PhpVersionNumberCollection.swift +++ b/phpmon/Common/PHP/PHP Version/PhpVersionNumberCollection.swift @@ -92,7 +92,7 @@ public struct PhpVersionNumberCollection: Equatable { // If a patch is provided then the minor version cannot be bumped. ? $0.hasSameMajorAndMinorButNewerOrSamePatch(version, strict) // If a patch is not provided then the major version cannot be bumped. - : $0.hasSameMajorButNewerOrSameMinor(version, strict) + : $0.hasSameMajorButNewerOrSameMinor(version) } } diff --git a/phpmon/Common/PHP/PHP Version/VersionNumber.swift b/phpmon/Common/PHP/PHP Version/VersionNumber.swift index fc400ec3..dbbf4184 100644 --- a/phpmon/Common/PHP/PHP Version/VersionNumber.swift +++ b/phpmon/Common/PHP/PHP Version/VersionNumber.swift @@ -93,7 +93,7 @@ public struct VersionNumber: Equatable, Hashable { return self.major == version.major } - internal func isSameAs(_ version: VersionNumber, _ strict: Bool) -> Bool { + internal func isSameAs(_ version: VersionNumber, _ strict: Bool = true) -> Bool { return self.major == version.major && self.minor == version.minor && (strict ? self.patch(strict, version) == version.patch(strict) : true) @@ -103,7 +103,7 @@ public struct VersionNumber: Equatable, Hashable { return self.major == version.major && self.minor == version.minor } - internal func isNewerThan(_ version: VersionNumber, _ strict: Bool) -> Bool { + internal func isNewerThan(_ version: VersionNumber, _ strict: Bool = true) -> Bool { return ( self.major > version.major || self.major == version.major && self.minor > version.minor || @@ -112,7 +112,7 @@ public struct VersionNumber: Equatable, Hashable { ) } - internal func isOlderThan(_ version: VersionNumber, _ strict: Bool) -> Bool { + internal func isOlderThan(_ version: VersionNumber, _ strict: Bool = true) -> Bool { return ( self.major < version.major || self.major == version.major && self.minor < version.minor || @@ -121,7 +121,7 @@ public struct VersionNumber: Equatable, Hashable { ) } - internal func hasNewerMinorVersionOrPatch(_ version: VersionNumber, _ strict: Bool) -> Bool { + internal func hasNewerMinorVersionOrPatch(_ version: VersionNumber, _ strict: Bool = true) -> Bool { return self.major == version.major && ( (self.minor == version.minor && self.patch(strict) >= version.patch(strict, self)) @@ -129,12 +129,12 @@ public struct VersionNumber: Equatable, Hashable { ) } - internal func hasSameMajorAndMinorButNewerOrSamePatch(_ version: VersionNumber, _ strict: Bool) -> Bool { + internal func hasSameMajorAndMinorButNewerOrSamePatch(_ version: VersionNumber, _ strict: Bool = true) -> Bool { return self.major == version.major && self.minor == version.minor && self.patch(strict, version) >= version.patch(strict) } - internal func hasSameMajorButNewerOrSameMinor(_ version: VersionNumber, _ strict: Bool) -> Bool { + internal func hasSameMajorButNewerOrSameMinor(_ version: VersionNumber) -> Bool { return self.major == version.major && self.minor >= version.minor }