Merge pull request #318 from namo-R/load_annotation_from_traits_in_en…

…tity

Loading annotation from traits too

src/Entity/Reflection/MetadataParser.php

@@ -105,12 +105,25 @@ protected function loadProperties(& $fileDependencies)
 
 		foreach (array_reverse($classTree) as $class) {
 			if (!isset($this->classPropertiesCache[$class])) {
+				foreach (class_uses($class) as $traitName) {
+					$reflectionTrait = new ReflectionClass($traitName);
+					$fileDependencies[] = $reflectionTrait->getFileName();
+					$this->currentReflection = $reflectionTrait;
+					$this->classPropertiesCache[$traitName] = $this->parseAnnotations($reflectionTrait, $methods);
+				}
+
 				$reflection = new ReflectionClass($class);
 				$fileDependencies[] = $reflection->getFileName();
 				$this->currentReflection = $reflection;
 				$this->classPropertiesCache[$class] = $this->parseAnnotations($reflection, $methods);
 			}
 
+			foreach (class_uses($class) as $traitName) {
+				foreach ($this->classPropertiesCache[$traitName] as $name => $property) {
+					$this->metadata->setProperty($name, $property);
+				}
+			}
+
 			foreach ($this->classPropertiesCache[$class] as $name => $property) {
 				$this->metadata->setProperty($name, $property);
 			}

tests/inc/model/CreatedColumnTrait.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace NextrasTests\Orm;
+
+use DateTimeImmutable;
+
+/**
+ * @property DateTimeImmutable    $createdAt             {default now}
+ * @property-read string          $createdAtFormatted    {virtual}
+ */
+trait CreatedColumnTrait {
+
+    /**
+     * Getter for column createdAtFormatted
+     * @return string
+     */
+    protected function getterCreatedAtFormatted() : string {
+        return $this->createdAt->format('d.m.Y H:i:s');
+    }
+}

tests/inc/model/tagFollower/TagFollower.php

@@ -2,16 +2,15 @@
 
 namespace NextrasTests\Orm;
 
-use DateTimeImmutable;
 use Nextras\Orm\Entity\Entity;
 
 
 /**
  * @property array             $id        {primary-proxy}
  * @property Author            $author    {m:1 Author::$tagFollowers} {primary}
  * @property Tag               $tag       {m:1 Tag::$tagFollowers} {primary}
- * @property DateTimeImmutable $createdAt {default now}
  */
 final class TagFollower extends Entity
 {
+    use CreatedColumnTrait;
 }