From 656ee8397adae4b81ad04eef515a148fa1bed1ee Mon Sep 17 00:00:00 2001
From: Dominik Grothaus <dg@mc-kg.de>
Date: Wed, 4 Oct 2023 10:21:24 +0200
Subject: [PATCH] Parse attributes from class traits

This allows the usage of traits in Entities to configure settings with
attributes.
---
 CHANGELOG.md                           |  2 ++
 src/Mapping/Driver/AttributeReader.php | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea079941e..3c041f35c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@ a release.
 ---
 
 ## [Unreleased]
+### Added
+- AttributeReader reads attributes from class traits
 
 ## [3.16.1]
 ### Fixed
diff --git a/src/Mapping/Driver/AttributeReader.php b/src/Mapping/Driver/AttributeReader.php
index 7e5739649..d67370494 100644
--- a/src/Mapping/Driver/AttributeReader.php
+++ b/src/Mapping/Driver/AttributeReader.php
@@ -26,7 +26,7 @@ final class AttributeReader
      */
     public function getClassAnnotations(\ReflectionClass $class): array
     {
-        return $this->convertToAttributeInstances($class->getAttributes());
+        return $this->convertToAttributeInstances($this->getClassAndTraitsAttributes($class));
     }
 
     /**
@@ -94,6 +94,24 @@ private function convertToAttributeInstances(iterable $attributes): array
         return $instances;
     }
 
+    /**
+     * Get attributes from a class including those from traits.
+     *
+     * @phpstan-param \ReflectionClass<object> $class
+     *
+     * @return \ReflectionAttribute<object>[]
+     */
+    private function getClassAndTraitsAttributes(\ReflectionClass $class): array
+    {
+        $traitAttributes = array_reduce(
+            $class->getTraits(),
+            static fn (array $carry, \ReflectionClass $trait) => array_merge($trait->getAttributes(), $carry),
+            []
+        );
+
+        return array_merge($class->getAttributes(), $traitAttributes);
+    }
+
     private function isRepeatable(string $attributeClassName): bool
     {
         if (isset($this->isRepeatableAttribute[$attributeClassName])) {