Skip to content

Commit 1860d6c

Browse files
committed
IBX-9266: Applied review remarks
1 parent d440500 commit 1860d6c

File tree

7 files changed

+10
-28
lines changed

7 files changed

+10
-28
lines changed

src/bundle/Resources/config/routing_rest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ ibexa.rest.image.download:
131131
# Site Access
132132
#
133133

134-
ibexa.rest.siteaccess.load_for_location:
135-
path: /siteaccess/load-non-admin-for-location/{locationId}
134+
ibexa.rest.site_access.load_for_location:
135+
path: /site-access/load-non-admin-for-location/{locationId}
136136
controller: 'Ibexa\Bundle\AdminUi\Controller\SiteAccess\SiteAccessController::loadNonAdminSiteAccessesForLocation'
137137
methods: [GET]
138138
options:

src/lib/REST/Output/ValueObjectVisitor/SiteAccess/SiteAccessesListVisitor.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ public function visit(Visitor $visitor, Generator $generator, $data): void
2929
$generator->startValueElement('name', $siteAccess->name);
3030
$generator->endValueElement('name');
3131

32-
$generator->startValueElement('provider', $siteAccess->provider);
33-
$generator->endValueElement('provider');
34-
3532
$generator->endObjectElement('SiteAccess');
3633
}
3734
$generator->endList('values');

tests/integration/REST/GetSiteAccessesListTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Ibexa\Contracts\Test\Rest\Request\Value\EndpointRequestDefinition;
1212

1313
/**
14-
* Coverage for /siteaccess/load-non-admin-for-location/{locationId} REST endpoint.
14+
* Coverage for /site-access/load-non-admin-for-location/{locationId} REST endpoint.
1515
*/
1616
final class GetSiteAccessesListTest extends BaseAdminUiRestWebTestCase
1717
{
@@ -44,7 +44,7 @@ protected static function getEndpointsToTest(): iterable
4444
foreach (self::REQUIRED_FORMATS as $format) {
4545
yield new EndpointRequestDefinition(
4646
'GET',
47-
'/api/ibexa/v2/siteaccess/load-non-admin-for-location/2',
47+
'/api/ibexa/v2/site-access/load-non-admin-for-location/2',
4848
'SiteAccessesList',
4949
"application/vnd.ibexa.api.SiteAccessesList+$format",
5050
['HTTP_X-SiteAccess' => 'admin'],

tests/integration/Resources/REST/Schemas/SiteAccessesList.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,11 @@
1919
},
2020
"name": {
2121
"type": "string"
22-
},
23-
"provider": {
24-
"type": "string"
2522
}
2623
},
2724
"required": [
2825
"_media-type",
29-
"name",
30-
"provider"
26+
"name"
3127
]
3228
}
3329
]

tests/integration/Resources/REST/Schemas/SiteAccessesList.xsd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<xs:complexType>
88
<xs:sequence>
99
<xs:element name="name" type="xs:string" />
10-
<xs:element name="provider" type="xs:string" />
1110
</xs:sequence>
1211
<xs:attribute name="media-type" type="xs:string" use="required" />
1312
</xs:complexType>

tests/integration/Resources/REST/Snapshots/SiteAccessesList.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,23 @@
44
"values": [
55
{
66
"_media-type": "application/vnd.ibexa.api.SiteAccess+json",
7-
"name": "__default_site_access__",
8-
"provider": "Ibexa\\Core\\MVC\\Symfony\\SiteAccess\\Provider\\StaticSiteAccessProvider"
7+
"name": "__default_site_access__"
98
},
109
{
1110
"_media-type": "application/vnd.ibexa.api.SiteAccess+json",
12-
"name": "__second_site_access__",
13-
"provider": "Ibexa\\Core\\MVC\\Symfony\\SiteAccess\\Provider\\StaticSiteAccessProvider"
11+
"name": "__second_site_access__"
1412
},
1513
{
1614
"_media-type": "application/vnd.ibexa.api.SiteAccess+json",
17-
"name": "ger",
18-
"provider": "Ibexa\\Core\\MVC\\Symfony\\SiteAccess\\Provider\\StaticSiteAccessProvider"
15+
"name": "ger"
1916
},
2017
{
2118
"_media-type": "application/vnd.ibexa.api.SiteAccess+json",
22-
"name": "eng",
23-
"provider": "Ibexa\\Core\\MVC\\Symfony\\SiteAccess\\Provider\\StaticSiteAccessProvider"
19+
"name": "eng"
2420
},
2521
{
2622
"_media-type": "application/vnd.ibexa.api.SiteAccess+json",
27-
"name": "ku6\"H",
28-
"provider": "Ibexa\\Core\\MVC\\Symfony\\SiteAccess\\Provider\\StaticSiteAccessProvider"
23+
"name": "ku6\"H"
2924
}
3025
]
3126
}

tests/integration/Resources/REST/Snapshots/SiteAccessesList.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,17 @@
22
<SiteAccessesList media-type="application/vnd.ibexa.api.SiteAccessesList+xml">
33
<SiteAccess media-type="application/vnd.ibexa.api.SiteAccess+xml">
44
<name>__default_site_access__</name>
5-
<provider>Ibexa\Core\MVC\Symfony\SiteAccess\Provider\StaticSiteAccessProvider</provider>
65
</SiteAccess>
76
<SiteAccess media-type="application/vnd.ibexa.api.SiteAccess+xml">
87
<name>__second_site_access__</name>
9-
<provider>Ibexa\Core\MVC\Symfony\SiteAccess\Provider\StaticSiteAccessProvider</provider>
108
</SiteAccess>
119
<SiteAccess media-type="application/vnd.ibexa.api.SiteAccess+xml">
1210
<name>ger</name>
13-
<provider>Ibexa\Core\MVC\Symfony\SiteAccess\Provider\StaticSiteAccessProvider</provider>
1411
</SiteAccess>
1512
<SiteAccess media-type="application/vnd.ibexa.api.SiteAccess+xml">
1613
<name>eng</name>
17-
<provider>Ibexa\Core\MVC\Symfony\SiteAccess\Provider\StaticSiteAccessProvider</provider>
1814
</SiteAccess>
1915
<SiteAccess media-type="application/vnd.ibexa.api.SiteAccess+xml">
2016
<name>ku6&quot;H</name>
21-
<provider>Ibexa\Core\MVC\Symfony\SiteAccess\Provider\StaticSiteAccessProvider</provider>
2217
</SiteAccess>
2318
</SiteAccessesList>

0 commit comments

Comments
 (0)