Skip to content

Commit 61b8918

Browse files
GrahamCampbellGrahamCampbell
committed
Merge branch '9.19' of https://github.com/GitLabPHP/Client into 9.19
2 parents 834edc5 + b4752bf commit 61b8918

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎lib/Gitlab/Api/AbstractApi.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ protected function getProjectPath($id, $path)
203203
}
204204

205205
/**
206-
* @param int $id
207-
* @param string $path
206+
* @param int|string $id
207+
* @param string $path
208208
*
209209
* @return string
210210
*/

‎lib/Gitlab/Api/Groups.php‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function all(array $parameters = [])
2929
}
3030

3131
/**
32-
* @param int $id
32+
* @param int|string $id
3333
*
3434
* @return mixed
3535
*/
@@ -69,8 +69,8 @@ public function create($name, $path, $description = null, $visibility = 'private
6969
}
7070

7171
/**
72-
* @param int $id
73-
* @param array $params
72+
* @param int|string $id
73+
* @param array $params
7474
*
7575
* @return mixed
7676
*/
@@ -80,7 +80,7 @@ public function update($id, array $params)
8080
}
8181

8282
/**
83-
* @param int $group_id
83+
* @param int|string $group_id
8484
*
8585
* @return mixed
8686
*/
@@ -90,7 +90,7 @@ public function remove($group_id)
9090
}
9191

9292
/**
93-
* @param int $group_id
93+
* @param int|string $group_id
9494
* @param int|string $project_id
9595
*
9696
* @return mixed
@@ -101,8 +101,8 @@ public function transfer($group_id, $project_id)
101101
}
102102

103103
/**
104-
* @param int $group_id
105-
* @param array $parameters
104+
* @param int|string $group_id
105+
* @param array $parameters
106106
*
107107
* @return mixed
108108
*/
@@ -115,8 +115,8 @@ public function allMembers($group_id, array $parameters = [])
115115
}
116116

117117
/**
118-
* @param int $group_id
119-
* @param array $parameters {
118+
* @param int|string $group_id
119+
* @param array $parameters {
120120
*
121121
* @var string $query A query string to search for members.
122122
* }
@@ -132,8 +132,8 @@ public function members($group_id, array $parameters = [])
132132
}
133133

134134
/**
135-
* @param int $group_id
136-
* @param int $user_id
135+
* @param int|string $group_id
136+
* @param int $user_id
137137
*
138138
* @return mixed
139139
*/
@@ -143,9 +143,9 @@ public function member($group_id, $user_id)
143143
}
144144

145145
/**
146-
* @param int $group_id
147-
* @param int $user_id
148-
* @param int $access_level
146+
* @param int|string $group_id
147+
* @param int $user_id
148+
* @param int $access_level
149149
*
150150
* @return mixed
151151
*/
@@ -158,9 +158,9 @@ public function addMember($group_id, $user_id, $access_level)
158158
}
159159

160160
/**
161-
* @param int $group_id
162-
* @param int $user_id
163-
* @param int $access_level
161+
* @param int|string $group_id
162+
* @param int $user_id
163+
* @param int $access_level
164164
*
165165
* @return mixed
166166
*/
@@ -172,8 +172,8 @@ public function saveMember($group_id, $user_id, $access_level)
172172
}
173173

174174
/**
175-
* @param int $group_id
176-
* @param int $user_id
175+
* @param int|string $group_id
176+
* @param int $user_id
177177
*
178178
* @return mixed
179179
*/
@@ -183,8 +183,8 @@ public function removeMember($group_id, $user_id)
183183
}
184184

185185
/**
186-
* @param int $id
187-
* @param array $parameters {
186+
* @param int|string $id
187+
* @param array $parameters {
188188
*
189189
* @var bool $archived limit by archived status
190190
* @var string $visibility limit by visibility public, internal, or private
@@ -262,8 +262,8 @@ public function projects($id, array $parameters = [])
262262
}
263263

264264
/**
265-
* @param int $group_id
266-
* @param array $parameters {
265+
* @param int|string $group_id
266+
* @param array $parameters {
267267
*
268268
* @var int[] $skip_groups skip the group IDs passes
269269
* @var bool $all_available show all the groups you have access to
@@ -284,8 +284,8 @@ public function subgroups($group_id, array $parameters = [])
284284
}
285285

286286
/**
287-
* @param int $group_id
288-
* @param array $parameters
287+
* @param int|string $group_id
288+
* @param array $parameters
289289
*
290290
* @return mixed
291291
*/
@@ -297,8 +297,8 @@ public function labels($group_id, array $parameters = [])
297297
}
298298

299299
/**
300-
* @param int $group_id
301-
* @param array $params
300+
* @param int|string $group_id
301+
* @param array $params
302302
*
303303
* @return mixed
304304
*/
@@ -308,8 +308,8 @@ public function addLabel($group_id, array $params)
308308
}
309309

310310
/**
311-
* @param int $group_id
312-
* @param array $params
311+
* @param int|string $group_id
312+
* @param array $params
313313
*
314314
* @return mixed
315315
*/
@@ -319,8 +319,8 @@ public function updateLabel($group_id, array $params)
319319
}
320320

321321
/**
322-
* @param int $group_id
323-
* @param string $name
322+
* @param int|string $group_id
323+
* @param string $name
324324
*
325325
* @return mixed
326326
*/
@@ -332,8 +332,8 @@ public function removeLabel($group_id, $name)
332332
}
333333

334334
/**
335-
* @param int $group_id
336-
* @param array $parameters
335+
* @param int|string $group_id
336+
* @param array $parameters
337337
*
338338
* @return mixed
339339
*/
@@ -345,8 +345,8 @@ public function variables($group_id, array $parameters = [])
345345
}
346346

347347
/**
348-
* @param int $group_id
349-
* @param string $key
348+
* @param int|string $group_id
349+
* @param string $key
350350
*
351351
* @return mixed
352352
*/
@@ -356,10 +356,10 @@ public function variable($group_id, $key)
356356
}
357357

358358
/**
359-
* @param int $group_id
360-
* @param string $key
361-
* @param string $value
362-
* @param bool|null $protected
359+
* @param int|string $group_id
360+
* @param string $key
361+
* @param string $value
362+
* @param bool|null $protected
363363
*
364364
* @return mixed
365365
*/
@@ -378,10 +378,10 @@ public function addVariable($group_id, $key, $value, $protected = null)
378378
}
379379

380380
/**
381-
* @param int $group_id
382-
* @param string $key
383-
* @param string $value
384-
* @param bool|null $protected
381+
* @param int|string $group_id
382+
* @param string $key
383+
* @param string $value
384+
* @param bool|null $protected
385385
*
386386
* @return mixed
387387
*/
@@ -399,8 +399,8 @@ public function updateVariable($group_id, $key, $value, $protected = null)
399399
}
400400

401401
/**
402-
* @param int $group_id
403-
* @param string $key
402+
* @param int|string $group_id
403+
* @param string $key
404404
*
405405
* @return mixed
406406
*/

0 commit comments

Comments
 (0)