Skip to content

Commit ac61483

Browse files
committed
WIP
1 parent bb72178 commit ac61483

File tree

61 files changed

+138
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+138
-278
lines changed

src/PathSegment/OpenAPI.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,10 @@ public function emitJson(Transaction $transaction): void
311311
case $boundParameter instanceof Operation\EntitySetArgument:
312312
$paths->{"/{$boundParameterName}/{$operation->getName()}()"} = $pathItemObject;
313313
break;
314+
315+
case $boundParameter instanceof Operation\EntityArgument:
316+
$paths->{"/{$boundParameterName}/{{$boundParameter->getType()->getKey()->getName()}}/{$operation->getName()}()"} = $pathItemObject;
317+
break;
314318
}
315319

316320
$queryObject = (object) [];
@@ -330,10 +334,14 @@ public function emitJson(Transaction $transaction): void
330334

331335
/** @var Operation\Argument $argument */
332336
foreach ($operation->getMetadataArguments() as $argument) {
337+
if ($operation->getBindingParameterName() === $argument->getName()) {
338+
continue;
339+
}
340+
333341
$tags[] = $argument->getName();
334342

335343
$parameters[] = [
336-
'required' => $argument->isNullable(),
344+
'required' => !$argument->isNullable(),
337345
'in' => 'query',
338346
'name' => $argument->getName(),
339347
'schema' => $argument->getOpenAPISchema(),

tests/__snapshots__/Entity/EloquentTest__test_generated_property__4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3399,7 +3399,7 @@
33993399
],
34003400
"parameters": [
34013401
{
3402-
"required": false,
3402+
"required": true,
34033403
"in": "query",
34043404
"name": "prefix",
34053405
"schema": {

tests/__snapshots__/EntitySet/EloquentTest__test_metadata__4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3395,7 +3395,7 @@
33953395
],
33963396
"parameters": [
33973397
{
3398-
"required": false,
3398+
"required": true,
33993399
"in": "query",
34003400
"name": "prefix",
34013401
"schema": {

tests/__snapshots__/Operation/ActionTest__test_array_argument__4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
],
295295
"parameters": [
296296
{
297-
"required": false,
297+
"required": true,
298298
"in": "query",
299299
"name": "args",
300300
"schema": {

tests/__snapshots__/Operation/ActionTest__test_date_argument__4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
],
295295
"parameters": [
296296
{
297-
"required": false,
297+
"required": true,
298298
"in": "query",
299299
"name": "dt",
300300
"schema": {

tests/__snapshots__/Operation/ActionTest__test_odata_binary_argument__4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
],
295295
"parameters": [
296296
{
297-
"required": false,
297+
"required": true,
298298
"in": "query",
299299
"name": "arg",
300300
"schema": {

tests/__snapshots__/Operation/ActionTest__test_odata_boolean_argument__4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
],
295295
"parameters": [
296296
{
297-
"required": false,
297+
"required": true,
298298
"in": "query",
299299
"name": "arg",
300300
"schema": {

tests/__snapshots__/Operation/ActionTest__test_odata_byte_argument__4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
],
295295
"parameters": [
296296
{
297-
"required": false,
297+
"required": true,
298298
"in": "query",
299299
"name": "arg",
300300
"schema": {

tests/__snapshots__/Operation/ActionTest__test_odata_collection_argument__4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
],
295295
"parameters": [
296296
{
297-
"required": false,
297+
"required": true,
298298
"in": "query",
299299
"name": "args",
300300
"schema": {

tests/__snapshots__/Operation/ActionTest__test_odata_date_argument__4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
],
295295
"parameters": [
296296
{
297-
"required": false,
297+
"required": true,
298298
"in": "query",
299299
"name": "arg",
300300
"schema": {

0 commit comments

Comments
 (0)