From 0436f25acd294c4f8982c2879048e73fd5d4eeaf Mon Sep 17 00:00:00 2001 From: Chris Lloyd Date: Sat, 23 Mar 2024 13:18:04 +0000 Subject: [PATCH] WIP --- src/PathSegment/OpenAPI.php | 5 ++--- .../EloquentTest__test_generated_property__4.json | 11 ----------- .../Entity/SQLTest__test_generated_property__4.json | 8 -------- .../EntitySet/EloquentTest__test_metadata__4.json | 11 ----------- .../EntitySet/SQLTest__test_metadata__4.json | 8 -------- .../Operation/DiscoveryTest__test_metadata__4.json | 2 -- .../Operation/MultiModelTest__test_multi__4.json | 2 -- .../RelationshipDiscoveryTest__test_discovery__4.json | 2 -- 8 files changed, 2 insertions(+), 47 deletions(-) diff --git a/src/PathSegment/OpenAPI.php b/src/PathSegment/OpenAPI.php index 2fb618ee8..f37c9adb1 100644 --- a/src/PathSegment/OpenAPI.php +++ b/src/PathSegment/OpenAPI.php @@ -826,15 +826,14 @@ protected function generateQueryRoutes( $pathItemObject->{'get'} = $queryObject; $annotations = $entitySet->getAnnotations(); - $tags = [ - $entitySet->getName(), - ]; + $tags = []; if ($relatedSet) { $queryObject->summary = __('lodata::Get entities from related :name', ['name' => $entitySet->getName()]); $tags[] = $relatedSet->getName(); } else { $queryObject->summary = __('lodata::Get entities from :name', ['name' => $entitySet->getName()]); + $tags[] = $entitySet->getName(); } $queryObject->tags = $this->uniqueTags($tags); diff --git a/tests/__snapshots__/Entity/EloquentTest__test_generated_property__4.json b/tests/__snapshots__/Entity/EloquentTest__test_generated_property__4.json index 081ad01c8..0ad165567 100644 --- a/tests/__snapshots__/Entity/EloquentTest__test_generated_property__4.json +++ b/tests/__snapshots__/Entity/EloquentTest__test_generated_property__4.json @@ -340,7 +340,6 @@ "get": { "summary": "Get entities from related Flights", "tags": [ - "Flights", "Airports" ], "parameters": [ @@ -508,7 +507,6 @@ "get": { "summary": "Get entities from related Countries", "tags": [ - "Countries", "Airports" ], "parameters": [ @@ -944,7 +942,6 @@ "get": { "summary": "Get entities from related Passengers", "tags": [ - "Passengers", "Flights" ], "parameters": [ @@ -1133,7 +1130,6 @@ "get": { "summary": "Get entities from related Airports", "tags": [ - "Airports", "Flights" ], "parameters": [ @@ -1312,7 +1308,6 @@ "get": { "summary": "Get entities from related Airports", "tags": [ - "Airports", "Flights" ], "parameters": [ @@ -1754,7 +1749,6 @@ "get": { "summary": "Get entities from related Airports", "tags": [ - "Airports", "Countries" ], "parameters": [ @@ -2243,7 +2237,6 @@ "get": { "summary": "Get entities from related Pets", "tags": [ - "Pets", "Passengers" ], "parameters": [ @@ -2406,7 +2399,6 @@ "get": { "summary": "Get entities from related Flights", "tags": [ - "Flights", "Passengers" ], "parameters": [ @@ -2574,7 +2566,6 @@ "get": { "summary": "Get entities from related Airports", "tags": [ - "Airports", "Passengers" ], "parameters": [ @@ -2753,7 +2744,6 @@ "get": { "summary": "Get entities from related Airports", "tags": [ - "Airports", "Passengers" ], "parameters": [ @@ -3203,7 +3193,6 @@ "get": { "summary": "Get entities from related Passengers", "tags": [ - "Passengers", "Pets" ], "parameters": [ diff --git a/tests/__snapshots__/Entity/SQLTest__test_generated_property__4.json b/tests/__snapshots__/Entity/SQLTest__test_generated_property__4.json index 9db910b66..e5a12451e 100644 --- a/tests/__snapshots__/Entity/SQLTest__test_generated_property__4.json +++ b/tests/__snapshots__/Entity/SQLTest__test_generated_property__4.json @@ -352,7 +352,6 @@ "get": { "summary": "Get entities from related flights", "tags": [ - "flights", "passengers" ], "parameters": [ @@ -522,7 +521,6 @@ "get": { "summary": "Get entities from related pets", "tags": [ - "pets", "passengers" ], "parameters": [ @@ -950,7 +948,6 @@ "get": { "summary": "Get entities from related airports", "tags": [ - "airports", "flights" ], "parameters": [ @@ -1129,7 +1126,6 @@ "get": { "summary": "Get entities from related airports", "tags": [ - "airports", "flights" ], "parameters": [ @@ -1308,7 +1304,6 @@ "get": { "summary": "Get entities from related airports", "tags": [ - "airports", "flights" ], "parameters": [ @@ -1487,7 +1482,6 @@ "get": { "summary": "Get entities from related passengers", "tags": [ - "passengers", "flights" ], "parameters": [ @@ -1967,7 +1961,6 @@ "get": { "summary": "Get entities from related countries", "tags": [ - "countries", "airports" ], "parameters": [ @@ -2108,7 +2101,6 @@ "get": { "summary": "Get entities from related flights", "tags": [ - "flights", "airports" ], "parameters": [ diff --git a/tests/__snapshots__/EntitySet/EloquentTest__test_metadata__4.json b/tests/__snapshots__/EntitySet/EloquentTest__test_metadata__4.json index 681013010..7f55dc909 100644 --- a/tests/__snapshots__/EntitySet/EloquentTest__test_metadata__4.json +++ b/tests/__snapshots__/EntitySet/EloquentTest__test_metadata__4.json @@ -340,7 +340,6 @@ "get": { "summary": "Get entities from related Flights", "tags": [ - "Flights", "Airports" ], "parameters": [ @@ -508,7 +507,6 @@ "get": { "summary": "Get entities from related Countries", "tags": [ - "Countries", "Airports" ], "parameters": [ @@ -944,7 +942,6 @@ "get": { "summary": "Get entities from related Passengers", "tags": [ - "Passengers", "Flights" ], "parameters": [ @@ -1132,7 +1129,6 @@ "get": { "summary": "Get entities from related Airports", "tags": [ - "Airports", "Flights" ], "parameters": [ @@ -1311,7 +1307,6 @@ "get": { "summary": "Get entities from related Airports", "tags": [ - "Airports", "Flights" ], "parameters": [ @@ -1753,7 +1748,6 @@ "get": { "summary": "Get entities from related Airports", "tags": [ - "Airports", "Countries" ], "parameters": [ @@ -2240,7 +2234,6 @@ "get": { "summary": "Get entities from related Pets", "tags": [ - "Pets", "Passengers" ], "parameters": [ @@ -2403,7 +2396,6 @@ "get": { "summary": "Get entities from related Flights", "tags": [ - "Flights", "Passengers" ], "parameters": [ @@ -2571,7 +2563,6 @@ "get": { "summary": "Get entities from related Airports", "tags": [ - "Airports", "Passengers" ], "parameters": [ @@ -2750,7 +2741,6 @@ "get": { "summary": "Get entities from related Airports", "tags": [ - "Airports", "Passengers" ], "parameters": [ @@ -3200,7 +3190,6 @@ "get": { "summary": "Get entities from related Passengers", "tags": [ - "Passengers", "Pets" ], "parameters": [ diff --git a/tests/__snapshots__/EntitySet/SQLTest__test_metadata__4.json b/tests/__snapshots__/EntitySet/SQLTest__test_metadata__4.json index 9639148d7..c30e08098 100644 --- a/tests/__snapshots__/EntitySet/SQLTest__test_metadata__4.json +++ b/tests/__snapshots__/EntitySet/SQLTest__test_metadata__4.json @@ -350,7 +350,6 @@ "get": { "summary": "Get entities from related flights", "tags": [ - "flights", "passengers" ], "parameters": [ @@ -520,7 +519,6 @@ "get": { "summary": "Get entities from related pets", "tags": [ - "pets", "passengers" ], "parameters": [ @@ -948,7 +946,6 @@ "get": { "summary": "Get entities from related airports", "tags": [ - "airports", "flights" ], "parameters": [ @@ -1127,7 +1124,6 @@ "get": { "summary": "Get entities from related airports", "tags": [ - "airports", "flights" ], "parameters": [ @@ -1306,7 +1302,6 @@ "get": { "summary": "Get entities from related airports", "tags": [ - "airports", "flights" ], "parameters": [ @@ -1485,7 +1480,6 @@ "get": { "summary": "Get entities from related passengers", "tags": [ - "passengers", "flights" ], "parameters": [ @@ -1964,7 +1958,6 @@ "get": { "summary": "Get entities from related countries", "tags": [ - "countries", "airports" ], "parameters": [ @@ -2105,7 +2098,6 @@ "get": { "summary": "Get entities from related flights", "tags": [ - "flights", "airports" ], "parameters": [ diff --git a/tests/__snapshots__/Operation/DiscoveryTest__test_metadata__4.json b/tests/__snapshots__/Operation/DiscoveryTest__test_metadata__4.json index d6a43bad0..65bd9b8f6 100644 --- a/tests/__snapshots__/Operation/DiscoveryTest__test_metadata__4.json +++ b/tests/__snapshots__/Operation/DiscoveryTest__test_metadata__4.json @@ -586,7 +586,6 @@ "get": { "summary": "Get entities from related Pets", "tags": [ - "Pets", "Passengers" ], "parameters": [ @@ -1020,7 +1019,6 @@ "get": { "summary": "Get entities from related Passengers", "tags": [ - "Passengers", "Pets" ], "parameters": [ diff --git a/tests/__snapshots__/Operation/MultiModelTest__test_multi__4.json b/tests/__snapshots__/Operation/MultiModelTest__test_multi__4.json index e6c56df92..05164f819 100644 --- a/tests/__snapshots__/Operation/MultiModelTest__test_multi__4.json +++ b/tests/__snapshots__/Operation/MultiModelTest__test_multi__4.json @@ -297,7 +297,6 @@ "get": { "summary": "Get entities from related Orders", "tags": [ - "Orders", "Users" ], "parameters": [ @@ -710,7 +709,6 @@ "get": { "summary": "Get entities from related Users", "tags": [ - "Users", "Orders" ], "parameters": [ diff --git a/tests/__snapshots__/Setup/RelationshipDiscoveryTest__test_discovery__4.json b/tests/__snapshots__/Setup/RelationshipDiscoveryTest__test_discovery__4.json index 14817a5b5..8e90d4d4c 100644 --- a/tests/__snapshots__/Setup/RelationshipDiscoveryTest__test_discovery__4.json +++ b/tests/__snapshots__/Setup/RelationshipDiscoveryTest__test_discovery__4.json @@ -301,7 +301,6 @@ "get": { "summary": "Get entities from related Pets", "tags": [ - "Pets", "People" ], "parameters": [ @@ -728,7 +727,6 @@ "get": { "summary": "Get entities from related People", "tags": [ - "People", "Pets" ], "parameters": [