Skip to content

Commit fadfc23

Browse files
committed
Update code for new implementation in RR
1 parent cfd3dcb commit fadfc23

File tree

2 files changed

+7
-20
lines changed

2 files changed

+7
-20
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"psr/http-message": "^1.0.1 || ^2.0",
4444
"spiral/roadrunner": "^2023.3 || ^2024.1",
4545
"spiral/roadrunner-worker": "^3.1",
46-
"roadrunner-php/roadrunner-api-dto": "^1.4",
46+
"roadrunner-php/roadrunner-api-dto": "dev-http-beta as 1.6.0",
4747
"symfony/polyfill-php83": "^1.29"
4848
},
4949
"require-dev": {

src/HttpWorker.php

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
namespace Spiral\RoadRunner\Http;
66

77
use Generator;
8-
use RoadRunner\HTTP\DTO\V1BETA1\FileUpload;
9-
use RoadRunner\HTTP\DTO\V1BETA1\HeaderValue;
10-
use RoadRunner\HTTP\DTO\V1BETA1\Request as RequestProto;
11-
use RoadRunner\HTTP\DTO\V1BETA1\Response;
8+
use RoadRunner\HTTP\DTO\V1\HeaderValue;
9+
use RoadRunner\HTTP\DTO\V1\Request as RequestProto;
10+
use RoadRunner\HTTP\DTO\V1\Response;
1211
use Spiral\Goridge\Frame;
1312
use Spiral\RoadRunner\Http\Exception\StreamStoppedException;
1413
use Spiral\RoadRunner\Message\Command\StreamStop;
@@ -175,21 +174,9 @@ private function arrayToRequest(string $body, array $context): Request
175174

176175
private function requestFromProto(string $body, RequestProto $message): Request
177176
{
177+
/** @var UploadedFilesList $uploads */
178+
$uploads = \json_decode($message->getUploads(), true) ?? [];
178179
$headers = $this->headerValueToArray($message->getHeader());
179-
$uploadedFiles = [];
180-
181-
/**
182-
* @var FileUpload $uploads
183-
*/
184-
foreach ($message->getUploads()?->getList() ?? [] as $uploads) {
185-
$uploadedFiles[$uploads->getName()] = [
186-
'name' => $uploads->getName(),
187-
'mime' => $uploads->getMime(),
188-
'size' => (int) $uploads->getSize(),
189-
'error' => (int) $uploads->getError(),
190-
'tmpName' => $uploads->getTempFilename(),
191-
];
192-
}
193180

194181
\parse_str($message->getRawQuery(), $query);
195182
/** @psalm-suppress ArgumentTypeCoercion, MixedArgumentTypeCoercion */
@@ -203,7 +190,7 @@ private function requestFromProto(string $body, RequestProto $message): Request
203190
static fn(array $values) => \implode(',', $values),
204191
$this->headerValueToArray($message->getCookies()),
205192
),
206-
uploads: $uploadedFiles,
193+
uploads: $uploads,
207194
attributes: [
208195
Request::PARSED_BODY_ATTRIBUTE_NAME => $message->getParsed(),
209196
] + \iterator_to_array($message->getAttributes()),

0 commit comments

Comments
 (0)