rinsvent/request-bundle
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Проинтегрировал свежую версию библиотеки

Browse Source
This commit is contained in:
Rinsvent 2021-08-16 23:39:52 +07:00
parent e3a2e933f1
commit 0d805314f1
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.lock generated
View File

@ -346,16 +346,16 @@
}, },
{ {
"name": "rinsvent/data2dto", "name": "rinsvent/data2dto",
"version": "v0.0.4", "version": "v0.0.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Rinsvent/data2dto.git", "url": "https://github.com/Rinsvent/data2dto.git",
"reference": "10f1937434ff8e38b21ad54963488e40a4ad2a7d" "reference": "44ef3f1143fe812578e0231ac5c77d837902d0f5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Rinsvent/data2dto/zipball/10f1937434ff8e38b21ad54963488e40a4ad2a7d", "url": "https://api.github.com/repos/Rinsvent/data2dto/zipball/44ef3f1143fe812578e0231ac5c77d837902d0f5",
"reference": "10f1937434ff8e38b21ad54963488e40a4ad2a7d", "reference": "44ef3f1143fe812578e0231ac5c77d837902d0f5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -385,9 +385,9 @@
"description": "Convert data to dto object", "description": "Convert data to dto object",
"support": { "support": {
"issues": "https://github.com/Rinsvent/data2dto/issues", "issues": "https://github.com/Rinsvent/data2dto/issues",
"source": "https://github.com/Rinsvent/data2dto/tree/v0.0.4" "source": "https://github.com/Rinsvent/data2dto/tree/v0.0.6"
}, },
"time": "2021-08-15T08:40:09+00:00" "time": "2021-08-16T15:56:23+00:00"
}, },
{ {
"name": "symfony/cache", "name": "symfony/cache",

30
src/EventListener/RequestListener.php
View File

@ -12,7 +12,6 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\Validator\Validation; use Symfony\Component\Validator\Validation;
// todo базовая заготовка. Требуется рефакторинг
class RequestListener class RequestListener
{ {
public function onKernelRequest(RequestEvent $event) public function onKernelRequest(RequestEvent $event)
@ -39,9 +38,7 @@ class RequestListener
$request->get('_route'), $request->get('_route'),
$request->getContent(), $request->getContent(),
$request->query->all(), $request->query->all(),
$request->request->all(), $request->request->all()
$request->headers->all(),
$request->server->all(),
); );
$errorCollection = $this->validate($requestDTOInstance); $errorCollection = $this->validate($requestDTOInstance);
@ -84,12 +81,10 @@ class RequestListener
protected function grabRequestDTO( protected function grabRequestDTO(
RequestDTO $requestDTO, RequestDTO $requestDTO,
string $routeName, string $routeName,
string $content, string $content,
array $queryParameters = [], array $queryParameters = [],
array $parameters = [], array $parameters = []
array $headers = [],
array $server = [],
) { ) {
$data = []; $data = [];
try { try {
@ -103,9 +98,18 @@ class RequestListener
$data = $this->grabDataByJsonPath($data, $requestDTO->jsonPath); $data = $this->grabDataByJsonPath($data, $requestDTO->jsonPath);
$data2dtoConverter = new Data2DtoConverter(); $data2dtoConverter = new Data2DtoConverter();
$result = $data2dtoConverter->convert($data, $requestDTO->className, ['default', 'request', 'source_body', 'route_' . $routeName]); $result = $data2dtoConverter->convert(
$result = $data2dtoConverter->convert($headers, $requestDTO->className, ['default', 'request', 'source_headers', 'route_' . $routeName], $result); $data,
$result = $data2dtoConverter->convert($server, $requestDTO->className, ['default', 'request', 'source_server', 'route_' . $routeName], $result); new $requestDTO->className,
[
'default',
'request',
'request_body',
'request_headers',
'request_server',
'route_' . $routeName
]
);
return $result; return $result;
} }