Рефакторинг

src/Annotation/PropertyPath.php

@@ -3,9 +3,9 @@
 namespace Rinsvent\RequestBundle\Annotation;
 
 #[\Attribute]
-class HeaderKey
+class PropertyPath
 {
     public function __construct(
-        public string $key
+        public string $path
     ) {}
 }

src/EventListener/RequestListener.php

@@ -5,8 +5,8 @@ namespace Rinsvent\RequestBundle\EventListener;
 use JMS\Serializer\SerializerBuilder;
 use ReflectionObject;
 use Rinsvent\AttributeExtractor\PropertyExtractor;
+use Rinsvent\RequestBundle\Annotation\PropertyPath;
 use Rinsvent\RequestBundle\Annotation\RequestDTO;
-use Rinsvent\RequestBundle\Annotation\HeaderKey;
 use Rinsvent\RequestBundle\DTO\Error;
 use Rinsvent\RequestBundle\DTO\ErrorCollection;
 use Rinsvent\AttributeExtractor\MethodExtractor;
@@ -90,9 +90,9 @@ class RequestListener
         $properties = $reflectionObject->getProperties();
         foreach ($properties as $property) {
             $propertyExtractor = new PropertyExtractor($object::class, $property->getName());
-            /** @var HeaderKey $headerKey */
-            if ($headerKey = $propertyExtractor->fetch(HeaderKey::class)) {
-                $value = $data[strtolower($headerKey->key)][0] ?? null;
+            /** @var PropertyPath $propertyPath */
+            if ($propertyPath = $propertyExtractor->fetch(PropertyPath::class)) {
+                $value = $data[strtolower($propertyPath->path)][0] ?? null;
             } else {
                 $value = $data[$property->getName()] ?? null;
             }

tests/_support/Helper/Unit.php

@@ -4,21 +4,43 @@ namespace Rinsvent\RequestBundle\Tests\Helper;
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I
 
-use Rinsvent\ApiSDKGenerator\DTO\Writer\Config;
-use Rinsvent\ApiSDKGenerator\Service\Writer;
+use Rinsvent\RequestBundle\EventListener\RequestListener;
+use Rinsvent\RequestBundle\Tests\unit\Listener\fixtures\FillTest\Controller;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+use Symfony\Component\HttpKernel\Controller\ControllerResolver;
+use Symfony\Component\HttpKernel\EventListener\RouterListener;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\Routing\Matcher\UrlMatcher;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 class Unit extends \Codeception\Module
 {
-    public function getWriter(string $lang = 'php'): Writer
+    public function send(Request $request): Response
     {
-        return new Writer(
-            new Config(
-                dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'templates',
-                dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'var/tests/cache',
-                $lang,
-                    dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'var/tests/result',
-                'Rinsvent\\AuthSDK'
-            )
-        );
+        $routes = new RouteCollection();
+        $controller = new Controller();
+        $routes->add('hello', new Route('/hello/{name}', [
+                '_controller' => [$controller, 'hello']
+            ]
+        ));
+
+        $matcher = new UrlMatcher($routes, new RequestContext());
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addSubscriber(new RouterListener($matcher, new RequestStack()));
+        $listener = new RequestListener();
+        $dispatcher->addListener('kernel.request', [$listener, 'onKernelRequest']);
+
+        $controllerResolver = new ControllerResolver();
+        $argumentResolver = new ArgumentResolver();
+        $kernel = new HttpKernel($dispatcher, $controllerResolver, new RequestStack(), $argumentResolver);
+        $response = $kernel->handle($request);
+        $response->send();
+        return $response;
     }
 }

tests/unit/Listener/FillTest.php

@@ -40,31 +40,8 @@ class FillTest extends \Codeception\Test\Unit
         $request = Request::create('/hello/igor', 'GET', [
             'surname' => 'Surname'
         ]);
-        $response = $this->send($request);
+        $response = $this->tester->send($request);
 
         $this->assertEquals('Surname', $request->get(RequestListener::REQUEST_DATA)->surname);
     }
-
-    private function send(Request $request): Response
-    {
-        $routes = new RouteCollection();
-        $controller = new Controller();
-        $routes->add('hello', new Route('/hello/{name}', [
-                '_controller' => [$controller, 'hello']
-            ]
-        ));
-
-        $matcher = new UrlMatcher($routes, new RequestContext());
-        $dispatcher = new EventDispatcher();
-        $dispatcher->addSubscriber(new RouterListener($matcher, new RequestStack()));
-        $listener = new RequestListener();
-        $dispatcher->addListener('kernel.request', [$listener, 'onKernelRequest']);
-
-        $controllerResolver = new ControllerResolver();
-        $argumentResolver = new ArgumentResolver();
-        $kernel = new HttpKernel($dispatcher, $controllerResolver, new RequestStack(), $argumentResolver);
-        $response = $kernel->handle($request);
-        $response->send();
-        return $response;
-    }
 }