Skip to content
This repository was archived by the owner on Mar 12, 2025. It is now read-only.

Commit 7142338

Browse files
committed
fix link samples
1 parent 85dbbc4 commit 7142338

5 files changed

+229
-49
lines changed

tests/Encoder/AbstractTypeEncoderTest.php

+60-12
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,27 @@ public function dataProvider(): array
4343
'_links' => [
4444
'read' => [
4545
'href' => 'http://test.com/items/id1',
46-
'method' => 'GET',
46+
'templated' => false,
47+
'rels' => [],
48+
'attributes' => [
49+
'method' => 'GET',
50+
],
4751
],
4852
'update' => [
4953
'href' => 'http://test.com/items/id1',
50-
'method' => 'PUT',
54+
'templated' => false,
55+
'rels' => [],
56+
'attributes' => [
57+
'method' => 'PUT',
58+
],
5159
],
5260
'delete' => [
5361
'href' => 'http://test.com/items/id1',
54-
'method' => 'DELETE',
62+
'templated' => false,
63+
'rels' => [],
64+
'attributes' => [
65+
'method' => 'DELETE',
66+
],
5567
],
5668
],
5769
],
@@ -70,15 +82,27 @@ public function dataProvider(): array
7082
'_links' => [
7183
'read' => [
7284
'href' => 'http://test.com/items/id1',
73-
'method' => 'GET',
85+
'templated' => false,
86+
'rels' => [],
87+
'attributes' => [
88+
'method' => 'GET',
89+
],
7490
],
7591
'update' => [
7692
'href' => 'http://test.com/items/id1',
77-
'method' => 'PUT',
93+
'templated' => false,
94+
'rels' => [],
95+
'attributes' => [
96+
'method' => 'PUT',
97+
],
7898
],
7999
'delete' => [
80100
'href' => 'http://test.com/items/id1',
81-
'method' => 'DELETE',
101+
'templated' => false,
102+
'rels' => [],
103+
'attributes' => [
104+
'method' => 'DELETE',
105+
],
82106
],
83107
],
84108
],
@@ -97,15 +121,27 @@ public function dataProvider(): array
97121
'_links' => [
98122
'read' => [
99123
'href' => 'http://test.com/items/id2',
100-
'method' => 'GET',
124+
'templated' => false,
125+
'rels' => [],
126+
'attributes' => [
127+
'method' => 'GET',
128+
],
101129
],
102130
'update' => [
103131
'href' => 'http://test.com/items/id2',
104-
'method' => 'PUT',
132+
'templated' => false,
133+
'rels' => [],
134+
'attributes' => [
135+
'method' => 'PUT',
136+
],
105137
],
106138
'delete' => [
107139
'href' => 'http://test.com/items/id2',
108-
'method' => 'DELETE',
140+
'templated' => false,
141+
'rels' => [],
142+
'attributes' => [
143+
'method' => 'DELETE',
144+
],
109145
],
110146
],
111147
],
@@ -125,15 +161,27 @@ public function dataProvider(): array
125161
'_links' => [
126162
'read' => [
127163
'href' => 'http://test.com/items/id3',
128-
'method' => 'GET',
164+
'templated' => false,
165+
'rels' => [],
166+
'attributes' => [
167+
'method' => 'GET',
168+
],
129169
],
130170
'update' => [
131171
'href' => 'http://test.com/items/id3',
132-
'method' => 'PUT',
172+
'templated' => false,
173+
'rels' => [],
174+
'attributes' => [
175+
'method' => 'PUT',
176+
],
133177
],
134178
'delete' => [
135179
'href' => 'http://test.com/items/id3',
136-
'method' => 'DELETE',
180+
'templated' => false,
181+
'rels' => [],
182+
'attributes' => [
183+
'method' => 'DELETE',
184+
],
137185
],
138186
],
139187
],

tests/Encoder/JsonTypeDecoderTest.php

+60-12
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,27 @@ public function testFormat(array $data)
5151
"_links": {
5252
"read": {
5353
"href": "http://test.com/items/id1",
54-
"method": "GET"
54+
"templated": false,
55+
"rels": [],
56+
"attributes": {
57+
"method": "GET"
58+
}
5559
},
5660
"update": {
5761
"href": "http://test.com/items/id1",
58-
"method": "PUT"
62+
"templated": false,
63+
"rels": [],
64+
"attributes": {
65+
"method": "PUT"
66+
}
5967
},
6068
"delete": {
6169
"href": "http://test.com/items/id1",
62-
"method": "DELETE"
70+
"templated": false,
71+
"rels": [],
72+
"attributes": {
73+
"method": "DELETE"
74+
}
6375
}
6476
}
6577
},
@@ -78,15 +90,27 @@ public function testFormat(array $data)
7890
"_links": {
7991
"read": {
8092
"href": "http://test.com/items/id1",
81-
"method": "GET"
93+
"templated": false,
94+
"rels": [],
95+
"attributes": {
96+
"method": "GET"
97+
}
8298
},
8399
"update": {
84100
"href": "http://test.com/items/id1",
85-
"method": "PUT"
101+
"templated": false,
102+
"rels": [],
103+
"attributes": {
104+
"method": "PUT"
105+
}
86106
},
87107
"delete": {
88108
"href": "http://test.com/items/id1",
89-
"method": "DELETE"
109+
"templated": false,
110+
"rels": [],
111+
"attributes": {
112+
"method": "DELETE"
113+
}
90114
}
91115
}
92116
},
@@ -105,15 +129,27 @@ public function testFormat(array $data)
105129
"_links": {
106130
"read": {
107131
"href": "http://test.com/items/id2",
108-
"method": "GET"
132+
"templated": false,
133+
"rels": [],
134+
"attributes": {
135+
"method": "GET"
136+
}
109137
},
110138
"update": {
111139
"href": "http://test.com/items/id2",
112-
"method": "PUT"
140+
"templated": false,
141+
"rels": [],
142+
"attributes": {
143+
"method": "PUT"
144+
}
113145
},
114146
"delete": {
115147
"href": "http://test.com/items/id2",
116-
"method": "DELETE"
148+
"templated": false,
149+
"rels": [],
150+
"attributes": {
151+
"method": "DELETE"
152+
}
117153
}
118154
}
119155
},
@@ -133,15 +169,27 @@ public function testFormat(array $data)
133169
"_links": {
134170
"read": {
135171
"href": "http://test.com/items/id3",
136-
"method": "GET"
172+
"templated": false,
173+
"rels": [],
174+
"attributes": {
175+
"method": "GET"
176+
}
137177
},
138178
"update": {
139179
"href": "http://test.com/items/id3",
140-
"method": "PUT"
180+
"templated": false,
181+
"rels": [],
182+
"attributes": {
183+
"method": "PUT"
184+
}
141185
},
142186
"delete": {
143187
"href": "http://test.com/items/id3",
144-
"method": "DELETE"
188+
"templated": false,
189+
"rels": [],
190+
"attributes": {
191+
"method": "DELETE"
192+
}
145193
}
146194
}
147195
}

tests/Encoder/UrlEncodedTypeEncoderTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function testFormat(array $data)
2828
$urlEncodedTransformer = new UrlEncodedTypeEncoder();
2929
$urlEncoded = $urlEncodedTransformer->encode($data);
3030

31-
$expectedUrlEncoded = 'page=1&perPage=10&search=&sort=name&order=asc&_embedded[mainItem][id]=id1&_embedded[mainItem][name]=A+fancy+Name&_embedded[mainItem][treeValues][1][2]=3&_embedded[mainItem][progress]=76.8&_embedded[mainItem][active]=true&_embedded[mainItem][_type]=item&_embedded[mainItem][_links][read][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[mainItem][_links][read][method]=GET&_embedded[mainItem][_links][update][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[mainItem][_links][update][method]=PUT&_embedded[mainItem][_links][delete][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[mainItem][_links][delete][method]=DELETE&_embedded[items][0][id]=id1&_embedded[items][0][name]=A+fancy+Name&_embedded[items][0][treeValues][1][2]=3&_embedded[items][0][progress]=76.8&_embedded[items][0][active]=true&_embedded[items][0][_type]=item&_embedded[items][0][_links][read][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[items][0][_links][read][method]=GET&_embedded[items][0][_links][update][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[items][0][_links][update][method]=PUT&_embedded[items][0][_links][delete][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[items][0][_links][delete][method]=DELETE&_embedded[items][1][id]=id2&_embedded[items][1][name]=B+fancy+Name&_embedded[items][1][treeValues][1][2]=3&_embedded[items][1][treeValues][1][3]=4&_embedded[items][1][progress]=24.7&_embedded[items][1][active]=true&_embedded[items][1][_type]=item&_embedded[items][1][_links][read][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid2&_embedded[items][1][_links][read][method]=GET&_embedded[items][1][_links][update][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid2&_embedded[items][1][_links][update][method]=PUT&_embedded[items][1][_links][delete][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid2&_embedded[items][1][_links][delete][method]=DELETE&_embedded[items][2][id]=id3&_embedded[items][2][name]=C+fancy+Name&_embedded[items][2][treeValues][1][2]=3&_embedded[items][2][treeValues][1][3]=4&_embedded[items][2][treeValues][1][6]=7&_embedded[items][2][progress]=100&_embedded[items][2][active]=false&_embedded[items][2][_type]=item&_embedded[items][2][_links][read][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid3&_embedded[items][2][_links][read][method]=GET&_embedded[items][2][_links][update][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid3&_embedded[items][2][_links][update][method]=PUT&_embedded[items][2][_links][delete][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid3&_embedded[items][2][_links][delete][method]=DELETE&_links[self][href]=http%3A%2F%2Ftest.com%2Fitems%2F%3Fpage%3D1%26perPage%3D10%26sort%3Dname%26order%3Dasc&_links[self][method]=GET&_links[create][href]=http%3A%2F%2Ftest.com%2Fitems%2F&_links[create][method]=POST&_type=search';
31+
$expectedUrlEncoded = 'page=1&perPage=10&search=&sort=name&order=asc&_embedded[mainItem][id]=id1&_embedded[mainItem][name]=A+fancy+Name&_embedded[mainItem][treeValues][1][2]=3&_embedded[mainItem][progress]=76.8&_embedded[mainItem][active]=true&_embedded[mainItem][_type]=item&_embedded[mainItem][_links][read][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[mainItem][_links][read][templated]=false&&_embedded[mainItem][_links][read][attributes][method]=GET&_embedded[mainItem][_links][update][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[mainItem][_links][update][templated]=false&&_embedded[mainItem][_links][update][attributes][method]=PUT&_embedded[mainItem][_links][delete][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[mainItem][_links][delete][templated]=false&&_embedded[mainItem][_links][delete][attributes][method]=DELETE&_embedded[items][0][id]=id1&_embedded[items][0][name]=A+fancy+Name&_embedded[items][0][treeValues][1][2]=3&_embedded[items][0][progress]=76.8&_embedded[items][0][active]=true&_embedded[items][0][_type]=item&_embedded[items][0][_links][read][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[items][0][_links][read][templated]=false&&_embedded[items][0][_links][read][attributes][method]=GET&_embedded[items][0][_links][update][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[items][0][_links][update][templated]=false&&_embedded[items][0][_links][update][attributes][method]=PUT&_embedded[items][0][_links][delete][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid1&_embedded[items][0][_links][delete][templated]=false&&_embedded[items][0][_links][delete][attributes][method]=DELETE&_embedded[items][1][id]=id2&_embedded[items][1][name]=B+fancy+Name&_embedded[items][1][treeValues][1][2]=3&_embedded[items][1][treeValues][1][3]=4&_embedded[items][1][progress]=24.7&_embedded[items][1][active]=true&_embedded[items][1][_type]=item&_embedded[items][1][_links][read][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid2&_embedded[items][1][_links][read][templated]=false&&_embedded[items][1][_links][read][attributes][method]=GET&_embedded[items][1][_links][update][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid2&_embedded[items][1][_links][update][templated]=false&&_embedded[items][1][_links][update][attributes][method]=PUT&_embedded[items][1][_links][delete][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid2&_embedded[items][1][_links][delete][templated]=false&&_embedded[items][1][_links][delete][attributes][method]=DELETE&_embedded[items][2][id]=id3&_embedded[items][2][name]=C+fancy+Name&_embedded[items][2][treeValues][1][2]=3&_embedded[items][2][treeValues][1][3]=4&_embedded[items][2][treeValues][1][6]=7&_embedded[items][2][progress]=100&_embedded[items][2][active]=false&_embedded[items][2][_type]=item&_embedded[items][2][_links][read][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid3&_embedded[items][2][_links][read][templated]=false&&_embedded[items][2][_links][read][attributes][method]=GET&_embedded[items][2][_links][update][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid3&_embedded[items][2][_links][update][templated]=false&&_embedded[items][2][_links][update][attributes][method]=PUT&_embedded[items][2][_links][delete][href]=http%3A%2F%2Ftest.com%2Fitems%2Fid3&_embedded[items][2][_links][delete][templated]=false&&_embedded[items][2][_links][delete][attributes][method]=DELETE&_links[self][href]=http%3A%2F%2Ftest.com%2Fitems%2F%3Fpage%3D1%26perPage%3D10%26sort%3Dname%26order%3Dasc&_links[self][method]=GET&_links[create][href]=http%3A%2F%2Ftest.com%2Fitems%2F&_links[create][method]=POST&_type=search';
3232

3333
self::assertEquals($expectedUrlEncoded, $urlEncoded);
3434
}

0 commit comments

Comments
 (0)