-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add reference normalize to path parameters on top level
- Loading branch information
1 parent
dadf6b6
commit 7ddcb8f
Showing
5 changed files
with
64 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,27 +30,26 @@ public function normalizeInlineReferences( | |
): ReferenceResolverResult { | ||
$refFileCollection = []; | ||
foreach ($openApiDefinition->paths as $path) { | ||
foreach ($path->parameters as $parameterIndex => $parameter) { | ||
/** @var array<int, Parameter|Reference> $allParameters */ | ||
$allParameters = $path->parameters; | ||
if ($parameter instanceof Reference) { | ||
Check warning on line 36 in src/Merge/ReferenceNormalizer.php GitHub Actions / Tests with coverage and PR Comments (8.3)
Check warning on line 36 in src/Merge/ReferenceNormalizer.php GitHub Actions / Tests with coverage and PR Comments (8.3)
|
||
$allParameters[$parameterIndex] = $this->normalizeReference($parameter, $refFileCollection); | ||
} else if ($parameter instanceof Parameter) { | ||
$allParameters[$parameterIndex] = $this->normalizeParameters($parameter, $refFileCollection); | ||
} | ||
|
||
$path->parameters = $allParameters; | ||
} | ||
|
||
foreach ($path->getOperations() as $operation) { | ||
foreach (($operation->parameters ?? []) as $parameterIndex => $parameter) { | ||
if (! $parameter instanceof Parameter) { | ||
continue; | ||
} | ||
|
||
/** @var array<int, Parameter> $allParameters */ | ||
$allParameters = $operation->parameters; | ||
if ($parameter->schema instanceof Reference) { | ||
$allParameters[$parameterIndex]->schema = $this->normalizeReference( | ||
$parameter->schema, | ||
$refFileCollection, | ||
); | ||
} | ||
|
||
if ($parameter->schema instanceof Schema) { | ||
$allParameters[$parameterIndex]->schema = $this->normalizeProperties( | ||
$parameter->schema, | ||
$refFileCollection, | ||
); | ||
} | ||
$allParameters[$parameterIndex] = $this->normalizeParameters($parameter, $refFileCollection); | ||
|
||
$operation->parameters = $allParameters; | ||
} | ||
|
@@ -265,4 +264,25 @@ public function normalizeProperty(Reference|Schema $property, array &$refFileCol | |
|
||
return $property; | ||
} | ||
|
||
/** | ||
* @param array<string, string> $refFileCollection | ||
*/ | ||
public function normalizeParameters(Parameter $parameter,array &$refFileCollection): Parameter | ||
{ | ||
if ($parameter->schema instanceof Reference) { | ||
$parameter->schema = $this->normalizeReference( | ||
$parameter->schema, | ||
$refFileCollection, | ||
); | ||
} | ||
|
||
if ($parameter->schema instanceof Schema) { | ||
$parameter->schema = $this->normalizeProperties( | ||
$parameter->schema, | ||
$refFileCollection, | ||
); | ||
} | ||
return $parameter; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters