Make phpcs happy

doctrine · Nov 25, 2020 · 5238c88 · 5238c88
1 parent 81aa5a9
commit 5238c88
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -2193,12 +2193,12 @@ public function setAssociationOverride($fieldName, array $overrideMapping)
 
         $mapping = $this->associationMappings[$fieldName];
 
-        if (isset($mapping['inherited']) && (count($overrideMapping) !== 1 || ! isset($overrideMapping['fetch']))) {
+        //if (isset($mapping['inherited']) && (count($overrideMapping) !== 1 || ! isset($overrideMapping['fetch']))) {
             // TODO: Deprecate overriding the fetch mode via association override for 3.0,
             // users should do this with a listener and a custom attribute/annotation
             // TODO: Enable this exception in 2.8
             //throw MappingException::illegalOverrideOfInheritedProperty($this->name, $fieldName);
-        }
+        //}
 
         if (isset($overrideMapping['joinColumns'])) {
             $mapping['joinColumns'] = $overrideMapping['joinColumns'];
@@ -2258,10 +2258,10 @@ public function setAttributeOverride($fieldName, array $overrideMapping)
 
         $mapping = $this->fieldMappings[$fieldName];
 
-        if (isset($mapping['inherited'])) {
+        //if (isset($mapping['inherited'])) {
             // TODO: Enable this exception in 2.8
             //throw MappingException::illegalOverrideOfInheritedProperty($this->name, $fieldName);
-        }
+        //}
 
         if (isset($mapping['id'])) {
             $overrideMapping['id'] = $mapping['id'];