Skip to content

Commit e9eef3c

Browse files
Simplify refactored OpenApiFactory collectPaths()
1 parent 0b7daef commit e9eef3c

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/OpenApi/Factory/OpenApiFactory.php

+4-9
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,10 @@ public function __invoke(array $context = []): OpenApi
9393
$resourceShortName = $resourceMetadata->getShortName();
9494

9595
// Items needs to be parsed first to be able to reference the lines from the collection operation
96-
[$itemOperationLinks, $itemOperationSchemas] = $this->collectPaths($resourceMetadata, $resourceClass, OperationType::ITEM, $context, $paths, $links, $schemas);
97-
$this->appendSchemaDefinitions($schemas, $itemOperationSchemas);
98-
[$collectionOperationLinks, $collectionOperationSchemas] = $this->collectPaths($resourceMetadata, $resourceClass, OperationType::COLLECTION, $context, $paths, $links, $schemas);
96+
$this->collectPaths($resourceMetadata, $resourceClass, OperationType::ITEM, $context, $paths, $links, $schemas);
97+
$this->collectPaths($resourceMetadata, $resourceClass, OperationType::COLLECTION, $context, $paths, $links, $schemas);
9998

100-
[$subresourceOperationLinks, $subresourceOperationSchemas] = $this->collectPaths($resourceMetadata, $resourceClass, OperationType::SUBRESOURCE, $context, $paths, $links, $schemas);
101-
$this->appendSchemaDefinitions($schemas, $collectionOperationSchemas);
99+
$this->collectPaths($resourceMetadata, $resourceClass, OperationType::SUBRESOURCE, $context, $paths, $links, $schemas);
102100
}
103101

104102
$securitySchemes = $this->getSecuritySchemes();
@@ -125,10 +123,7 @@ public function __invoke(array $context = []): OpenApi
125123
);
126124
}
127125

128-
/**
129-
* @return array | array
130-
*/
131-
private function collectPaths(ResourceMetadata $resourceMetadata, string $resourceClass, string $operationType, array $context, Model\Paths $paths, array &$links, \ArrayObject $schemas): array
126+
private function collectPaths(ResourceMetadata $resourceMetadata, string $resourceClass, string $operationType, array $context, Model\Paths $paths, array &$links, \ArrayObject $schemas): void
132127
{
133128
$resourceShortName = $resourceMetadata->getShortName();
134129
$operations = OperationType::COLLECTION === $operationType ? $resourceMetadata->getCollectionOperations() : (OperationType::ITEM === $operationType ? $resourceMetadata->getItemOperations() : $this->subresourceOperationFactory->create($resourceClass));

0 commit comments

Comments
 (0)