read annotations from parent class, fixes #89

Author: floriansemm

Doctrine/Annotation/AnnotationReader.php

@@ -33,7 +33,7 @@ public function __construct()
     private function getPropertiesByType($entity, $type)
     {
         $reflectionClass = new \ReflectionClass($entity);
-        $properties = $reflectionClass->getProperties();
+        $properties = array_merge($reflectionClass->getProperties(), $this->getParentProperties($reflectionClass));
 
         $fields = array();
         foreach ($properties as $property) {
@@ -53,6 +53,21 @@ private function getPropertiesByType($entity, $type)
         return $fields;
     }
 
+    /**
+     * @param \ReflectionClass $reflectionClass
+     *
+     * @return \ReflectionProperty[]
+     */
+    private function getParentProperties(\ReflectionClass $reflectionClass)
+    {
+        $parent = $reflectionClass->getParentClass();
+        if ($parent == null) {
+            return array();
+        }
+
+        return $parent->getProperties();
+    }
+
     /**
      * @param object $entity
      *
@@ -65,9 +80,10 @@ public function getFields($entity)
 
     /**
      * @param object $entity
-     * @throws \InvalidArgumentException if the boost value is not numeric
      *
      * @return number
+     *
+     * @throws \InvalidArgumentException if the boost value is not numeric
      */
     public function getEntityBoost($entity)
     {
@@ -108,6 +124,7 @@ public function getDocumentIndex($entity)
 
     /**
      * @param object $entity
+     *
      * @return Type
      *
      * @throws \RuntimeException
@@ -165,6 +182,7 @@ public function getFieldMapping($entity)
 
     /**
      * @param object $entity
+     *
      * @return boolean
      */
     public function hasDocumentDeclaration($entity)
@@ -192,14 +210,20 @@ public function getSynchronizationCallback($entity)
 
     /**
      * @param string $entity
-     * @param string $annotation
+     * @param string $annotationName
      *
      * @return string
      */
-    private function getClassAnnotation($entity, $annotation)
+    private function getClassAnnotation($entity, $annotationName)
     {
         $reflectionClass = new \ReflectionClass($entity);
 
-        return $this->reader->getClassAnnotation($reflectionClass, $annotation);
+        $annotation = $this->reader->getClassAnnotation($reflectionClass, $annotationName);
+
+        if ($annotation === null && $reflectionClass->getParentClass()) {
+            $annotation = $this->reader->getClassAnnotation($reflectionClass->getParentClass(), $annotationName);
+        }
+
+        return $annotation;
     }
 }

Tests/Doctrine/Annotation/AnnotationReaderTest.php

@@ -200,5 +200,39 @@ public function getIndexFromIndexHandler()
 
         $this->assertEquals('my_core', $index);
     }
+
+    /**
+     * @test
+     */
+    public function readAnnotationsFromBaseClass()
+    {
+        $reader = new AnnotationReader();
+        $fields = $reader->getFields(new ChildEntity());
+
+        $this->assertEquals(2, count($fields));
+        $this->assertTrue($reader->hasDocumentDeclaration(new ChildEntity()));
+    }
+}
+
+use FS\SolrBundle\Doctrine\Annotation as Solr;
+
+/**
+ *
+ * @Solr\Document
+ */
+abstract class BaseEntity
+{
+    /**
+     *
+     * @Solr\Field(type="integer")
+     */
+    private $field;
 }
 
+class ChildEntity extends BaseEntity
+{
+    /**
+     * @Solr\Field(type="integer")
+     */
+    private $childField;
+}