AndreTeros · September 27, 2019 13:44 · Sep 27, 2019 · Sep 27, 2019
diff --git a/RequestResolver.php b/RequestResolver.php
@@ -32,9 +32,6 @@ public function resolve(Request $request, ArgumentMetadata $argumentMetadata): \
 
         /** @var RequestData $mapped */
         $mapped = $requestData::create($request->request);
-        if ($request->attributes->has('companySubdomain')) {
-            $mapped->setCompanySubdomain($request->attributes->get('companySubdomain'));
-        }
 
         $errors = $this->validator->validate($mapped);
 

diff --git a/RequestResolver.php b/RequestResolver.php
@@ -0,0 +1,47 @@
+<?php declare(strict_types=1);
+
+namespace Common\ArgumentResolver;
+
+
+use Common\Exception\ValidationErrorException;
+use Common\Request\RequestData;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+
+class RequestResolver implements ArgumentValueResolverInterface
+{
+    private $validator;
+
+    public function __construct(ValidatorInterface $validator)
+    {
+        $this->validator = $validator;
+    }
+
+    public function supports(Request $request, ArgumentMetadata $argumentMetadata): bool
+    {
+        return is_subclass_of($argumentMetadata->getType(), RequestData::class);
+    }
+
+    public function resolve(Request $request, ArgumentMetadata $argumentMetadata): \Generator
+    {
+        /** @var RequestData $requestData */
+        $requestData = $argumentMetadata->getType();
+
+        /** @var RequestData $mapped */
+        $mapped = $requestData::create($request->request);
+        if ($request->attributes->has('companySubdomain')) {
+            $mapped->setCompanySubdomain($request->attributes->get('companySubdomain'));
+        }
+
+        $errors = $this->validator->validate($mapped);
+
+        if (count($errors)) {
+            throw new ValidationErrorException($errors);
+        }
+
+        yield $mapped;
+    }
+}