Skip to content

Commit eaffa5d

Browse files
GrahamCampbellGrahamCampbell
committed
Merge branch '9.19' into 10.0
2 parents b94eaea + 3699878 commit eaffa5d

File tree

6 files changed

+28
-57
lines changed

6 files changed

+28
-57
lines changed

‎src/Api/Issues.php

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -197,42 +197,28 @@ public function showDiscussion($project_id, $issue_iid, $discussion_id)
197197
}
198198

199199
/**
200-
* @param int|string $project_id
201-
* @param int $issue_iid
202-
* @param string|array $body
200+
* @param int|string $project_id
201+
* @param int $issue_iid
202+
* @param string $body
203203
*
204204
* @return mixed
205205
*/
206206
public function addDiscussion($project_id, $issue_iid, $body)
207207
{
208-
// backwards compatibility
209-
if (is_array($body)) {
210-
$params = $body;
211-
} else {
212-
$params = ['body' => $body];
213-
}
214-
215-
return $this->post($this->getProjectPath($project_id, 'issues/'.self::encodePath($issue_iid).'/discussions'), $params);
208+
return $this->post($this->getProjectPath($project_id, 'issues/'.self::encodePath($issue_iid).'/discussions'), ['body' => $body]);
216209
}
217210

218211
/**
219-
* @param int|string $project_id
220-
* @param int $issue_iid
221-
* @param string $discussion_id
222-
* @param string|array $body
212+
* @param int|string $project_id
213+
* @param int $issue_iid
214+
* @param string $discussion_id
215+
* @param string $body
223216
*
224217
* @return mixed
225218
*/
226219
public function addDiscussionNote($project_id, $issue_iid, $discussion_id, $body)
227220
{
228-
// backwards compatibility
229-
if (is_array($body)) {
230-
$params = $body;
231-
} else {
232-
$params = ['body' => $body];
233-
}
234-
235-
return $this->post($this->getProjectPath($project_id, 'issues/'.self::encodePath($issue_iid).'/discussions/'.self::encodePath($discussion_id).'/notes'), $params);
221+
return $this->post($this->getProjectPath($project_id, 'issues/'.self::encodePath($issue_iid).'/discussions/'.self::encodePath($discussion_id).'/notes'), ['body' => $body]);
236222
}
237223

238224
/**

‎src/Api/MergeRequests.php

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -173,19 +173,13 @@ public function update($project_id, $mr_iid, array $params)
173173
/**
174174
* @param int|string $project_id
175175
* @param int $mr_iid
176-
* @param string|array|null $message
176+
* @param array $parameters
177177
*
178178
* @return mixed
179179
*/
180-
public function merge($project_id, $mr_iid, $message = null)
180+
public function merge($project_id, $mr_iid, array $parameters = [])
181181
{
182-
if (is_array($message)) {
183-
$params = $message;
184-
} else {
185-
$params = ['merge_commit_message' => $message];
186-
}
187-
188-
return $this->put($this->getProjectPath($project_id, 'merge_requests/'.self::encodePath($mr_iid).'/merge'), $params);
182+
return $this->put($this->getProjectPath($project_id, 'merge_requests/'.self::encodePath($mr_iid).'/merge'), $parameters);
189183
}
190184

191185
/**
@@ -303,23 +297,16 @@ public function resolveDiscussion($project_id, $mr_iid, $discussion_id, $resolve
303297
}
304298

305299
/**
306-
* @param int|string $project_id
307-
* @param int $mr_iid
308-
* @param string $discussion_id
309-
* @param string|array $body
300+
* @param int|string $project_id
301+
* @param int $mr_iid
302+
* @param string $discussion_id
303+
* @param string $body
310304
*
311305
* @return mixed
312306
*/
313307
public function addDiscussionNote($project_id, $mr_iid, $discussion_id, $body)
314308
{
315-
// backwards compatibility
316-
if (is_array($body)) {
317-
$params = $body;
318-
} else {
319-
$params = ['body' => $body];
320-
}
321-
322-
return $this->post($this->getProjectPath($project_id, 'merge_requests/'.self::encodePath($mr_iid).'/discussions/'.self::encodePath($discussion_id).'/notes'), $params);
309+
return $this->post($this->getProjectPath($project_id, 'merge_requests/'.self::encodePath($mr_iid).'/discussions/'.self::encodePath($discussion_id).'/notes'), ['body' => $body]);
323310
}
324311

325312
/**

‎src/Model/Group.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,13 @@ public function transfer($project_id)
124124
}
125125

126126
/**
127+
* @param string|null $query
128+
*
127129
* @return User[]
128130
*/
129-
public function members()
131+
public function members($query = null)
130132
{
131-
$data = $this->client->groups()->members($this->id);
133+
$data = $this->client->groups()->members($this->id, null === $query ? [] : ['query' => $query]);
132134

133135
$members = [];
134136
foreach ($data as $member) {

‎src/Model/Project.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,13 @@ public function remove()
226226
}
227227

228228
/**
229-
* @param string|null $username_query
229+
* @param string|null $query
230230
*
231231
* @return User[]
232232
*/
233-
public function members($username_query = null)
233+
public function members($query = null)
234234
{
235-
$data = $this->client->projects()->members($this->id, ['query' => $username_query]);
235+
$data = $this->client->projects()->members($this->id, null === $query ? [] : ['query' => $query]);
236236

237237
$members = [];
238238
foreach ($data as $member) {

‎tests/Api/IssuesTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,13 +327,12 @@ public function shouldCreateDiscussion()
327327
$expectedArray = ['id' => 'abc', 'body' => 'A new discussion'];
328328

329329
$api = $this->getApiMock();
330-
$api->expects($this->exactly(2))
330+
$api->expects($this->once())
331331
->method('post')
332332
->with('projects/1/issues/2/discussions', ['body' => 'A new discussion'])
333333
->will($this->returnValue($expectedArray))
334334
;
335335

336-
$this->assertEquals($expectedArray, $api->addDiscussion(1, 2, ['body' => 'A new discussion']));
337336
$this->assertEquals($expectedArray, $api->addDiscussion(1, 2, 'A new discussion'));
338337
}
339338

@@ -345,13 +344,12 @@ public function shouldCreateDiscussionNote()
345344
$expectedArray = ['id' => 3, 'body' => 'A new discussion note'];
346345

347346
$api = $this->getApiMock();
348-
$api->expects($this->exactly(2))
347+
$api->expects($this->once())
349348
->method('post')
350349
->with('projects/1/issues/2/discussions/abc/notes', ['body' => 'A new discussion note'])
351350
->will($this->returnValue($expectedArray))
352351
;
353352

354-
$this->assertEquals($expectedArray, $api->addDiscussionNote(1, 2, 'abc', ['body' => 'A new discussion note']));
355353
$this->assertEquals($expectedArray, $api->addDiscussionNote(1, 2, 'abc', 'A new discussion note'));
356354
}
357355

‎tests/Api/MergeRequestsTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,12 @@ public function shouldMergeMergeRequest()
237237
$expectedArray = ['id' => 2, 'title' => 'Updated title'];
238238

239239
$api = $this->getApiMock();
240-
$api->expects($this->exactly(2))
240+
$api->expects($this->once())
241241
->method('put')
242242
->with('projects/1/merge_requests/2/merge', ['merge_commit_message' => 'Accepted'])
243243
->will($this->returnValue($expectedArray))
244244
;
245245

246-
$this->assertEquals($expectedArray, $api->merge(1, 2, 'Accepted'));
247246
$this->assertEquals($expectedArray, $api->merge(1, 2, ['merge_commit_message' => 'Accepted']));
248247
}
249248

@@ -448,13 +447,12 @@ public function shouldCreateDiscussionNote()
448447
$expectedArray = ['id' => 3, 'body' => 'A new discussion note'];
449448

450449
$api = $this->getApiMock();
451-
$api->expects($this->exactly(2))
450+
$api->expects($this->once())
452451
->method('post')
453452
->with('projects/1/merge_requests/2/discussions/abc/notes', ['body' => 'A new discussion note'])
454453
->will($this->returnValue($expectedArray))
455454
;
456455

457-
$this->assertEquals($expectedArray, $api->addDiscussionNote(1, 2, 'abc', ['body' => 'A new discussion note']));
458456
$this->assertEquals($expectedArray, $api->addDiscussionNote(1, 2, 'abc', 'A new discussion note'));
459457
}
460458

0 commit comments

Comments
 (0)