Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow unused tags to be kept #1647

Merged
merged 5 commits into from
Sep 22, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/Processors/AugmentTags.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@
*/
class AugmentTags implements ProcessorInterface
{

/** @var array<string> */
protected $unusedTagsToKeepWhitelist = [];
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
protected $unusedTagsToKeepWhitelist = [];
protected $unusedTagsToKeepWhitelist;

I think the other processors only intialize in the constructor and that should be enough.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

based it off CleanUnusedComponents, makes sense to only do it in one spot though.


public function __construct(array $unusedTagsToKeepWhitelist = [])
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public function __construct(array $unusedTagsToKeepWhitelist = [])
public function __construct(array $whitelist = [])

It think this should be meaningful enough? This class is all about tags, after all.

{
$this->unusedTagsToKeepWhitelist = $unusedTagsToKeepWhitelist;
}

public function setUnusedTagsToKeepWhitelist(array $unusedTagsToKeepWhitelist): AugmentTags
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public function setUnusedTagsToKeepWhitelist(array $unusedTagsToKeepWhitelist): AugmentTags
/**
* Whitelist tags to keep even if not used. <code>*</code> may be used to keep all unused.
*/
public function setUnusedTagsToKeepWhitelist(array $unusedTagsToKeepWhitelist): AugmentTags

The docblock on the setXXX() method is used to auto-generate the processor reference, so adding something here would be good.

{
$this->unusedTagsToKeepWhitelist = $unusedTagsToKeepWhitelist;

return $this;
}

public function __invoke(Analysis $analysis)
{
/** @var OA\Operation[] $operations */
Expand All @@ -39,6 +55,7 @@ public function __invoke(Analysis $analysis)
$analysis->openapi->tags = array_values($declaredTags);
}

// Add a tag for each tag that is used in operations but not declared in the global tags
if ($usedTagNames) {
$declatedTagNames = array_keys($declaredTags);
foreach ($usedTagNames as $tagName) {
Expand All @@ -48,8 +65,10 @@ public function __invoke(Analysis $analysis)
}
}

// remove tags that we don't want to keep (defaults to all unused tags)
$tagsToKeep = array_merge($usedTagNames, $this->unusedTagsToKeepWhitelist);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could there be a special case of '*' which would keep all tags?

foreach ($declaredTags as $tag) {
if (!in_array($tag->name, $usedTagNames)) {
if (!in_array($tag->name, $tagsToKeep)) {
if (false !== $index = array_search($tag, $analysis->openapi->tags, true)) {
$analysis->annotations->detach($tag);
unset($analysis->openapi->tags[$index]);
Expand Down
32 changes: 32 additions & 0 deletions tests/Fixtures/UnusedTags.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php declare(strict_types=1);

/**
* @license Apache 2.0
*/

namespace OpenApi\Tests\Fixtures;

use OpenApi\Attributes as OAT;

#[OAT\OpenApi(
info: new OAT\Info(
title: 'test',
description: 'test',
version: '2.0.0'
),
tags: [
// definding tag 'other' globally with nice description
new OAT\Tag('other', 'Other description'),
// making a tag that has no operations referencing it, but we wish to keep it
new OAT\Tag('fancy', 'Fancy description'),
// making a tag that it not used, but we do not wish to keep
new OAT\Tag('notused', 'remove this one'),
]
)]
class UnusedTags
{
#[OAT\Get(path: '/other/', tags: ['other'], responses: [new OAT\Response(response: '200', description: 'success')])]
public function hello(): void
{
}
}
19 changes: 19 additions & 0 deletions tests/Processors/AugmentTagsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,23 @@ public function testDedupedAugmentTags(): void

$this->assertCount(3, $analysis->openapi->tags, 'Expecting 3 unique tags');
}

/**
* @requires PHP 8.1
*/
public function testAllowUnusedTags(): void
{
$this->skipLegacy();

$analysis = $this->analysisFromFixtures(
['UnusedTags.php'],
static::processors(),
null,
[
'augmentTags' => ['unusedTagsToKeepWhitelist' => ['fancy']]
]
);

$this->assertCount(2, $analysis->openapi->tags, 'Expecting fancy tag to be preserved');
}
}
Loading