Skip to content

Commit

Permalink
Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
shalvah committed Aug 27, 2022
1 parent aeb66bb commit 23a6583
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
3 changes: 1 addition & 2 deletions composer.dingo.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"homepage": "http://github.com/knuckleswtf/scribe",
"authors": [
{
"name": "Shalvah",
"email": "[email protected]"
"name": "Shalvah"
}
],
"require": {
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"homepage": "http://github.com/knuckleswtf/scribe",
"authors": [
{
"name": "Shalvah",
"email": "[email protected]"
"name": "Shalvah"
}
],
"require": {
Expand Down
10 changes: 5 additions & 5 deletions src/Extracting/Extractor.php
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ public static function nestArrayAndObjectFields(array $parameters, array $cleanP
protected function mergeInheritedMethodsData(string $stage, ExtractedEndpointData $endpointData, array $inheritedDocsOverrides = []): void
{
$overrides = $inheritedDocsOverrides[$stage] ?? [];
$normalizeparamData = fn($data, $key) => array_merge($data, ["name" => $key]);
$normalizeParamData = fn($data, $key) => array_merge($data, ["name" => $key]);
if (is_array($overrides)) {
foreach ($overrides as $key => $item) {
switch ($stage) {
Expand All @@ -500,10 +500,10 @@ protected function mergeInheritedMethodsData(string $stage, ExtractedEndpointDat
case "urlParameters":
case "bodyParameters":
case "queryParameters":
$endpointData->$stage[$key] = Parameter::make($normalizeparamData($item, $key));
$endpointData->$stage[$key] = Parameter::make($normalizeParamData($item, $key));
break;
case "responseFields":
$endpointData->$stage[$key] = ResponseField::make($normalizeparamData($item, $key));
$endpointData->$stage[$key] = ResponseField::make($normalizeParamData($item, $key));
break;
default:
$endpointData->$stage[$key] = $item;
Expand All @@ -514,8 +514,8 @@ protected function mergeInheritedMethodsData(string $stage, ExtractedEndpointDat

$endpointData->$stage = match ($stage) {
"responses" => ResponseCollection::make($results),
"urlParameters", "bodyParameters", "queryParameters" => collect($results)->map(fn($param, $name) => Parameter::make($normalizeparamData($param, $name)))->all(),
"responseFields" => collect($results)->map(fn($field, $name) => ResponseField::make($normalizeparamData($field, $name)))->all(),
"urlParameters", "bodyParameters", "queryParameters" => collect($results)->map(fn($param, $name) => Parameter::make($normalizeParamData($param, $name)))->all(),
"responseFields" => collect($results)->map(fn($field, $name) => ResponseField::make($normalizeParamData($field, $name)))->all(),
default => $results,
};
}
Expand Down

0 comments on commit 23a6583

Please sign in to comment.