Don't throw an exception when a Trait is found in the same directory (#794)

* Don't throw an exception when traits are used (#793)

* Fix phpcs warning

Author: kategray

Mapping/DocumentParser.php

@@ -86,13 +86,17 @@ public function __construct(Reader $reader, DocumentFinder $finder)
      *
      * @param \ReflectionClass $class
      *
-     * @return array
+     * @return array|null
      * @throws MissingDocumentAnnotationException
      */
     public function parse(\ReflectionClass $class)
     {
         $className = $class->getName();
 
+        if ($class->isTrait()) {
+            return false;
+        }
+
         if (!isset($this->documents[$className])) {
             /** @var Document $document */
             $document = $this->reader->getClassAnnotation($class, self::DOCUMENT_ANNOTATION);
@@ -439,7 +443,7 @@ private function getDocumentPropertiesReflection(\ReflectionClass $reflectionCla
         $properties = [];
 
         foreach ($reflectionClass->getProperties() as $property) {
-            if (!array_key_exists($property->getName(), $properties)) {
+            if (!in_array($property->getName(), $properties)) {
                 $properties[$property->getName()] = $property;
             }
         }

Mapping/MetadataCollector.php

@@ -147,6 +147,9 @@ public function getBundleMapping($name, $config = [])
 
             try {
                 $documentMapping = $this->getDocumentReflectionMapping($documentReflection);
+                if (!$documentMapping) {
+                    continue;
+                }
             } catch (MissingDocumentAnnotationException $exception) {
                 // Not a document, just ignore
                 continue;

Tests/Unit/Mapping/DocumentParserTest.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\ElasticsearchBundle\Tests\Unit\Mapping;
+
+use ONGR\ElasticsearchBundle\Mapping\DocumentParser;
+use ONGR\ElasticsearchBundle\Tests\app\fixture\TestBundle\Document\LongDescriptionTrait;
+
+class DocumentParserTest extends \PHPUnit_Framework_TestCase
+{
+    /*
+     * @var \Doctrine\Common\Annotations\Reader
+     */
+    private $reader;
+
+    /*
+     * @var \ONGR\ElasticsearchBundle\Mapping\DocumentFinder
+     */
+    private $finder;
+
+    public function setUp()
+    {
+        $this->reader = $this->getMockBuilder('Doctrine\Common\Annotations\Reader')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->finder = $this->getMockBuilder('ONGR\ElasticsearchBundle\Mapping\DocumentFinder')
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    public function testReturnFalseOnTrait()
+    {
+        $traitReflection = new \ReflectionClass(
+            '\\ONGR\\ElasticsearchBundle\\Tests\\app\\fixture\\TestBundle\\Document\\LongDescriptionTrait'
+        );
+
+        $parser = new DocumentParser($this->reader, $this->finder);
+        $this->assertFalse($parser->parse($traitReflection));
+    }
+}

Tests/app/fixture/TestBundle/Document/CategoryObject.php

@@ -34,6 +34,11 @@ class CategoryObject
      */
     public $description;
 
+    /*
+     * Test the use of traits
+     */
+    use LongDescriptionTrait;
+
     /**
      * @return string
      */

Tests/app/fixture/TestBundle/Document/LongDescriptionTrait.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\ElasticsearchBundle\Tests\app\fixture\TestBundle\Document;
+
+use ONGR\ElasticsearchBundle\Annotation as ES;
+
+trait LongDescriptionTrait
+{
+    /**
+     * @ES\Property(type="text", name="long_description")
+     * @var string
+     */
+    private $long_description;
+
+    /**
+     * @param string $long_description
+     */
+    public function setLongDescription($long_description)
+    {
+        $this->long_description = $long_description;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLongDescription()
+    {
+        return $this->long_description;
+    }
+}