Skip to content

Commit f5aee4f

Browse files
committed
renaming Body attribute with Payload
1 parent b188ae5 commit f5aee4f

24 files changed

Lines changed: 48 additions & 48 deletions

File tree

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ Define your OpenAPI spec and endpoint at the same time:
2727
namespace Api\Catalog\Controller\Post;
2828

2929
use Api\Catalog\Model\Product;
30-
use OpenSolid\OpenApiBundle\Attribute\Body;
30+
use OpenSolid\OpenApiBundle\Attribute\Payload;
3131
use OpenSolid\OpenApiBundle\Routing\Attribute\Post;
3232

3333
class PostProductAction
3434
{
3535
#[Post('/products')]
36-
public function __invoke(#[Body] PostProductBody $body): Product
36+
public function __invoke(#[Payload] PostProductPayload $Payload): Product
3737
{
38-
return new Product($body->name, $body->price);
38+
return new Product($body->name, $Payload->price);
3939
}
4040
}
4141
```
@@ -52,7 +52,7 @@ class PostProductAction
5252
- [x] Conditional OpenAPI Path/Route definition:
5353
- Example: `#[Get('/me', when: 'service("toggle_me").isEnabled()')]`
5454
- [x] Symfony attributes abbreviations:
55-
- `#[Body]` instead of `#[MapRequestPayload]`
55+
- `#[Payload]` instead of `#[MapRequestPayload]`
5656
- `#[Query]` instead of `#[MapQueryString]`
5757
- [x] OpenAPI attributes abbreviations:
5858
- `#[Path]` instead of `#[PathParameter]`

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"authors": [
88
{
99
"name": "Yonel Ceruto",
10-
"email": "yonelceruto@gmail.com"
10+
"email": "open@yceruto.dev"
1111
}
1212
],
1313
"require": {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Symfony\Component\Validator\Constraints\GroupSequence;
99

1010
#[\Attribute(\Attribute::TARGET_PARAMETER)]
11-
class Body extends MapRequestPayload
11+
class Payload extends MapRequestPayload
1212
{
1313
public function __construct(
1414
array|string|null $acceptFormat = null,

src/HttpKernel/Controller/ArgumentResolver/RequestPayloadArrayResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace OpenSolid\OpenApiBundle\HttpKernel\Controller\ArgumentResolver;
44

5-
use OpenSolid\OpenApiBundle\Attribute\Body;
5+
use OpenSolid\OpenApiBundle\Attribute\Payload;
66
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
77
use Symfony\Component\HttpFoundation\Request;
88
use Symfony\Component\HttpFoundation\Response;
@@ -69,7 +69,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
6969
return [$attribute];
7070
}
7171

72-
if ($attribute instanceof Body && null !== $attribute->itemsType) {
72+
if ($attribute instanceof Payload && null !== $attribute->itemsType) {
7373
$attribute->metadata = new ArgumentMetadata(
7474
$argument->getName(),
7575
$attribute->itemsType.'[]',

src/OpenApi/Analyser/Guesser/Operation/OperationRequestBodyGuesser.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use OpenApi\Attributes as OA;
88
use OpenApi\Context;
99
use OpenApi\Generator;
10-
use OpenSolid\OpenApiBundle\Attribute\Body;
10+
use OpenSolid\OpenApiBundle\Attribute\Payload;
1111
use OpenSolid\OpenApiBundle\OpenApi\Analyser\Guesser\AnalyserGuesserInterface;
1212

1313
class OperationRequestBodyGuesser implements AnalyserGuesserInterface
@@ -27,7 +27,7 @@ public function guess(\Reflector $reflector, AbstractAnnotation $annotation, Con
2727
}
2828

2929
foreach ($reflector->getParameters() as $rp) {
30-
foreach ($rp->getAttributes(Body::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
30+
foreach ($rp->getAttributes(Payload::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
3131
$type = (($rnt = $rp->getType()) && $rnt instanceof \ReflectionNamedType) ? $rnt->getName() : null;
3232

3333
if (null === $type) {

tests/Functional/App/CustomResponseSpec/Controller/PostResourceAction.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
namespace OpenSolid\Tests\OpenApiBundle\Functional\App\CustomResponseSpec\Controller;
44

5-
use OpenSolid\OpenApiBundle\Attribute\Body;
5+
use OpenSolid\OpenApiBundle\Attribute\Payload;
66
use OpenSolid\OpenApiBundle\Routing\Attribute\Post;
77

88
class PostResourceAction
99
{
1010
#[Post('/resources')]
11-
public function __invoke(#[Body] PostResourceBody $body): void
11+
public function __invoke(#[Payload] PostResourcePayload $payload): void
1212
{
1313
}
1414
}

tests/Functional/App/CustomResponseSpec/Controller/PostResourceBody.php renamed to tests/Functional/App/CustomResponseSpec/Controller/PostResourcePayload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use OpenSolid\OpenApiBundle\Attribute\Property;
77

88
#[Schema(writeOnly: true)]
9-
class PostResourceBody
9+
class PostResourcePayload
1010
{
1111
#[Property(minLength: 3)]
1212
public string $name;

tests/Functional/App/CustomResponseSpec/Output/doc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"content": {
1919
"application/json": {
2020
"schema": {
21-
"$ref": "#/components/schemas/PostResourceBody"
21+
"$ref": "#/components/schemas/PostResourcePayload"
2222
}
2323
}
2424
}
@@ -39,7 +39,7 @@
3939
},
4040
"components": {
4141
"schemas": {
42-
"PostResourceBody": {
42+
"PostResourcePayload": {
4343
"required": [
4444
"name"
4545
],
@@ -149,4 +149,4 @@
149149
}
150150
}
151151
}
152-
}
152+
}

tests/Functional/App/PatchResourceAction/Controller/PatchResourceAction.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace OpenSolid\Tests\OpenApiBundle\Functional\App\PatchResourceAction\Controller;
44

5-
use OpenSolid\OpenApiBundle\Attribute\Body;
5+
use OpenSolid\OpenApiBundle\Attribute\Payload;
66
use OpenSolid\OpenApiBundle\Routing\Attribute\Patch;
77
use OpenSolid\Tests\OpenApiBundle\Functional\App\PatchResourceAction\Model\ResourceView;
88

99
class PatchResourceAction
1010
{
1111
#[Patch('/resources')]
12-
public function __invoke(#[Body] PatchResourceBody $body): ResourceView
12+
public function __invoke(#[Payload] PatchResourcePayload $payload): ResourceView
1313
{
14-
return ResourceView::from('4f09d694-446a-4769-9929-dad96a071cad', $body->name);
14+
return ResourceView::from('4f09d694-446a-4769-9929-dad96a071cad', $payload->name);
1515
}
1616
}

tests/Functional/App/PatchResourceAction/Controller/PatchResourceBody.php renamed to tests/Functional/App/PatchResourceAction/Controller/PatchResourcePayload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use OpenSolid\OpenApiBundle\Attribute\Property;
77

88
#[Schema(writeOnly: true)]
9-
class PatchResourceBody
9+
class PatchResourcePayload
1010
{
1111
#[Property]
1212
public ?string $name = null;

0 commit comments

Comments
 (0)