From 778c8bbee0b9336ac9d755052316298247ca635f Mon Sep 17 00:00:00 2001
From: Rinsvent <rinsvent007@gmail.com>
Date: Wed, 28 Jul 2021 23:16:31 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B?=
 =?UTF-8?q?=20=D1=81=20=D0=B0=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/EventListener/RequestListener.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/EventListener/RequestListener.php b/src/EventListener/RequestListener.php
index 22d4b18..5e500e4 100644
--- a/src/EventListener/RequestListener.php
+++ b/src/EventListener/RequestListener.php
@@ -4,6 +4,7 @@ namespace Rinsvent\RequestBundle\EventListener;
 
 use JMS\Serializer\SerializerBuilder;
 use ReflectionObject;
+use Rinsvent\AttributeExtractor\PropertyExtractor;
 use Rinsvent\RequestBundle\Annotation\RequestDTO;
 use Rinsvent\RequestBundle\Annotation\HeaderKey;
 use Rinsvent\RequestBundle\DTO\Error;
@@ -88,11 +89,9 @@ class RequestListener
         $reflectionObject = new ReflectionObject($object);
         $properties = $reflectionObject->getProperties();
         foreach ($properties as $property) {
-            $attributes = $property->getAttributes(HeaderKey::class);
-            $attribute = $attributes[0] ?? null;
-            if ($attribute) {
-                /** @var HeaderKey $headerKey */
-                $headerKey = $attribute->newInstance();
+            $propertyExtractor = new PropertyExtractor($object::class, $property->getName());
+            /** @var HeaderKey $headerKey */
+            if ($headerKey = $propertyExtractor->fetch(HeaderKey::class)) {
                 $value = $data[strtolower($headerKey->key)][0] ?? null;
             } else {
                 $value = $data[$property->getName()] ?? null;