Merge pull request #1725 from TwanVermeulen/v2.4.x

Allow versioning for inherited fields

Author: l3pp4rd

lib/Gedmo/Loggable/Mapping/Driver/Annotation.php

@@ -60,16 +60,13 @@ public function readExtendedMetadata($meta, array &$config)
 
         // property annotations
         foreach ($class->getProperties() as $property) {
-            if ($meta->isMappedSuperclass && !$property->isPrivate() ||
-                $meta->isInheritedField($property->name) ||
-                isset($meta->associationMappings[$property->name]['inherited'])
-            ) {
+            $field = $property->getName();
+            if ($meta->isMappedSuperclass && !$property->isPrivate()) {
                 continue;
             }
 
             // versioned property
             if ($this->reader->getPropertyAnnotation($property, self::VERSIONED)) {
-                $field = $property->getName();
                 if (!$this->isMappingValid($meta, $field)) {
                     throw new InvalidMappingException("Cannot versioned [{$field}] as it is collection in object - {$meta->name}");
                 }
@@ -78,7 +75,9 @@ public function readExtendedMetadata($meta, array &$config)
                     continue;
                 }
                 // fields cannot be overrided and throws mapping exception
-                $config['versioned'][] = $field;
+                if (!(isset($config['versioned']) && in_array($field, $config['versioned']))) {
+                    $config['versioned'][] = $field;
+                }
             }
         }