Merge pull request #239 from xcodeswift/fix-isequal

Fix PBXObject.isEqual(to:) Implementations
tuist · Mar 2, 2018 · ee94af8 · ee94af8
2 parents 557e1d8 + b85b86f
commit ee94af8
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 ### Changed
 - Support for `XCConfig` project-relative includes https://github.com/xcodeswift/xcproj/pull/238 by @briantkelley
 
+### Fixed
+- `PBXObject.isEqual(to:)` overrides correctly call super https://github.com/xcodeswift/xcproj/pull/239 by @briantkelley
+
 ## 4.1.0
 
 ### Added

diff --git a/Sources/xcproj/PBXBuildFile.swift b/Sources/xcproj/PBXBuildFile.swift
@@ -42,8 +42,8 @@ final public class PBXBuildFile: PBXObject {
     // MARK: - Hashable
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXBuildFile else {
+        guard let rhs = object as? PBXBuildFile,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXBuildPhase.swift b/Sources/xcproj/PBXBuildPhase.swift
@@ -46,9 +46,9 @@ public class PBXBuildPhase: PBXObject {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXBuildPhase else {
-            return false
+        guard let rhs = object as? PBXBuildPhase,
+            super.isEqual(to: rhs) else {
+                return false
         }
         let lhs = self
         return lhs.files == rhs.files &&

diff --git a/Sources/xcproj/PBXBuildRule.swift b/Sources/xcproj/PBXBuildRule.swift
@@ -79,8 +79,8 @@ final public class PBXBuildRule: PBXObject {
     // MARK: - Equatable
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXBuildRule else {
+        guard let rhs = object as? PBXBuildRule,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXContainerItemProxy.swift b/Sources/xcproj/PBXContainerItemProxy.swift
@@ -40,8 +40,8 @@ final public class PBXContainerItemProxy: PBXObject {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXContainerItemProxy else {
+        guard let rhs = object as? PBXContainerItemProxy,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXCopyFilesBuildPhase.swift b/Sources/xcproj/PBXCopyFilesBuildPhase.swift
@@ -58,8 +58,8 @@ final public class PBXCopyFilesBuildPhase: PBXBuildPhase {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXCopyFilesBuildPhase else {
+        guard let rhs = object as? PBXCopyFilesBuildPhase,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXFileElement.swift b/Sources/xcproj/PBXFileElement.swift
@@ -31,8 +31,8 @@ public class PBXFileElement: PBXObject, PlistSerializable {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXFileElement else {
+        guard let rhs = object as? PBXFileElement,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXFileReference.swift b/Sources/xcproj/PBXFileReference.swift
@@ -51,8 +51,8 @@ final public class PBXFileReference: PBXFileElement {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXFileReference else {
+        guard let rhs = object as? PBXFileReference,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXFrameworksBuildPhase.swift b/Sources/xcproj/PBXFrameworksBuildPhase.swift
@@ -8,8 +8,8 @@ final public class PBXFrameworksBuildPhase: PBXBuildPhase {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXFrameworksBuildPhase else {
+        guard let rhs = object as? PBXFrameworksBuildPhase,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXGroup.swift b/Sources/xcproj/PBXGroup.swift
@@ -41,8 +41,8 @@ final public class PBXGroup: PBXFileElement {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXGroup else {
+        guard let rhs = object as? PBXGroup,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXHeadersBuildPhase.swift b/Sources/xcproj/PBXHeadersBuildPhase.swift
@@ -9,8 +9,8 @@ final public class PBXHeadersBuildPhase: PBXBuildPhase {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXHeadersBuildPhase else {
+        guard let rhs = object as? PBXHeadersBuildPhase,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXLegacyTarget.swift b/Sources/xcproj/PBXLegacyTarget.swift
@@ -59,8 +59,8 @@ final public class PBXLegacyTarget: PBXTarget {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXLegacyTarget else {
+        guard let rhs = object as? PBXLegacyTarget,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXProject.swift b/Sources/xcproj/PBXProject.swift
@@ -130,8 +130,8 @@ final public class PBXProject: PBXObject {
     // MARK: - Hashable
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXProject else {
+        guard let rhs = object as? PBXProject,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXReferenceProxy.swift b/Sources/xcproj/PBXReferenceProxy.swift
@@ -53,8 +53,8 @@ final public class PBXReferenceProxy: PBXObject {
     // MARK: - Hashable
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXReferenceProxy else {
+        guard let rhs = object as? PBXReferenceProxy,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXResourcesBuildPhase.swift b/Sources/xcproj/PBXResourcesBuildPhase.swift
@@ -8,8 +8,8 @@ final public class PBXResourcesBuildPhase: PBXBuildPhase {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXResourcesBuildPhase else {
+        guard let rhs = object as? PBXResourcesBuildPhase,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXRezBuildPhase.swift b/Sources/xcproj/PBXRezBuildPhase.swift
@@ -9,8 +9,8 @@ final public class PBXRezBuildPhase: PBXBuildPhase {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXRezBuildPhase else {
+        guard let rhs = object as? PBXRezBuildPhase,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXShellScriptBuildPhase.swift b/Sources/xcproj/PBXShellScriptBuildPhase.swift
@@ -81,8 +81,8 @@ final public class PBXShellScriptBuildPhase: PBXBuildPhase {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXShellScriptBuildPhase else {
+        guard let rhs = object as? PBXShellScriptBuildPhase,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXSourcesBuildPhase.swift b/Sources/xcproj/PBXSourcesBuildPhase.swift
@@ -10,8 +10,8 @@ final public class PBXSourcesBuildPhase: PBXBuildPhase {
     // MARK: - Hashable
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXSourcesBuildPhase else {
+        guard let rhs = object as? PBXSourcesBuildPhase,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXTarget.swift b/Sources/xcproj/PBXTarget.swift
@@ -73,8 +73,8 @@ public class PBXTarget: PBXObject {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXTarget else {
+        guard let rhs = object as? PBXTarget,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXTargetDependency.swift b/Sources/xcproj/PBXTargetDependency.swift
@@ -28,8 +28,8 @@ final public class PBXTargetDependency: PBXObject {
     // MARK: - Hashable
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXTargetDependency else {
+        guard let rhs = object as? PBXTargetDependency,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/PBXVariantGroup.swift b/Sources/xcproj/PBXVariantGroup.swift
@@ -41,8 +41,8 @@ final public class PBXVariantGroup: PBXFileElement {
     // MARK: - Hashable
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? PBXVariantGroup else {
+        guard let rhs = object as? PBXVariantGroup,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/XCBuildConfiguration.swift b/Sources/xcproj/XCBuildConfiguration.swift
@@ -32,8 +32,8 @@ final public class XCBuildConfiguration: PBXObject {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? XCBuildConfiguration else {
+        guard let rhs = object as? XCBuildConfiguration,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/XCConfigurationList.swift b/Sources/xcproj/XCConfigurationList.swift
@@ -32,8 +32,8 @@ final public class XCConfigurationList: PBXObject {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? XCConfigurationList else {
+        guard let rhs = object as? XCConfigurationList,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self

diff --git a/Sources/xcproj/XCVersionGroup.swift b/Sources/xcproj/XCVersionGroup.swift
@@ -31,8 +31,8 @@ final public class XCVersionGroup: PBXFileElement {
     }
 
     public override func isEqual(to object: PBXObject) -> Bool {
-        guard super.isEqual(to: self),
-            let rhs = object as? XCVersionGroup else {
+        guard let rhs = object as? XCVersionGroup,
+            super.isEqual(to: rhs) else {
                 return false
         }
         let lhs = self