Merge pull request #112 from MindaugasR/master

Collecting parent class private properties annotations

Author: saimaz

Mapping/MetadataCollector.php

@@ -15,11 +15,11 @@
 use Doctrine\Common\Annotations\FileCacheReader;
 use Doctrine\Common\Util\Inflector;
 use ONGR\ElasticsearchBundle\Annotation\Document;
+use ONGR\ElasticsearchBundle\Annotation\Inherit;
 use ONGR\ElasticsearchBundle\Annotation\MultiField;
 use ONGR\ElasticsearchBundle\Annotation\Property;
+use ONGR\ElasticsearchBundle\Annotation\Skip;
 use ONGR\ElasticsearchBundle\Annotation\Suggester\AbstractSuggesterProperty;
-use ONGR\ElasticsearchBundle\Annotation\Suggester\CompletionSuggesterProperty;
-use ONGR\ElasticsearchBundle\Annotation\Suggester\ContextSuggesterProperty;
 use ONGR\ElasticsearchBundle\Document\DocumentInterface;
 
 /**
@@ -255,7 +255,7 @@ private function getDocumentReflectionMapping(\ReflectionClass $reflectionClass)
 
     /**
      * Returns information about accessing properties from document.
-     * 
+     *
      * @param \ReflectionClass $reflectionClass Document reflection class.
      * @param array            $properties      Document properties.
      *
@@ -373,7 +373,7 @@ private function getInfoAboutProperty($params, $alias, $reflectionClass)
      * @param \ReflectionClass $reflectionClass
      *
      * @return array
-     * 
+     *
      * @throws \LogicException
      */
     private function checkPropertyAccess($property, $methodPrefix, $reflectionClass)
@@ -477,7 +477,7 @@ private function getDocumentParentType($namespace)
      *
      * @param \ReflectionClass $reflectionClass Class to read properties from.
      * @param array            $properties      Properties to skip.
-     * @param array            $flag            If false exludes properties, true only includes properties.
+     * @param bool             $flag            If false exludes properties, true only includes properties.
      *
      * @return array
      */
@@ -522,6 +522,13 @@ private function getProperties(\ReflectionClass $reflectionClass, $properties =
             $mapping[$type->name] = $maps;
         }
 
+        if ($parentClass = $reflectionClass->getParentClass()) {
+            $parent_mapping = $this->getProperties(new \ReflectionClass($parentClass->getName()), $properties, $flag);
+            if (count($parent_mapping) > 0) {
+                $mapping = array_merge($parent_mapping, $mapping);
+            }
+        }
+
         return $mapping;
     }
 
@@ -595,7 +602,7 @@ private function getNamespace($namespace)
      * @param string $name
      *
      * @return string
-     * 
+     *
      * @throws \LogicException
      */
     private function getBundle($name)

Tests/app/fixture/Acme/TestBundle/Document/Item.php

@@ -36,12 +36,44 @@ class Item implements DocumentInterface
      *
      * @ES\Property(type="float", name="price")
      */
-    public $price;
+    protected $price;
 
     /**
      * @var \DateTime
      * 
      * @ES\Property(name="created_at", type="date")
      */
-    public $createdAt;
+    private $createdAt;
+
+    /**
+     * @return float
+     */
+    public function getPrice()
+    {
+        return $this->price;
+    }
+
+    /**
+     * @param float $price
+     */
+    public function setPrice($price)
+    {
+        $this->price = $price;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * @param \DateTime $createdAt
+     */
+    public function setCreatedAt($createdAt)
+    {
+        $this->createdAt = $createdAt;
+    }
 }