Skip to content

Commit 013738c

Browse files
GrahamCampbellGrahamCampbell
committed
Merge branch '9.19' into 10.0
2 parents 964682b + 14e003d commit 013738c

File tree

15 files changed

+145
-130
lines changed

15 files changed

+145
-130
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ First, install the dependencies:
2121
$ make install
2222
```
2323

24-
Then run the test suite and static analyzer:
24+
Then run the test suite and static analyzers:
2525

2626
```bash
2727
$ make test

‎psalm-baseline.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<<<<<<< HEAD
23
<files psalm-version="3.13.1@afd8874a9e4562eac42a02de90e42e430c3a1db1">
34
<file src="src/Api/AbstractApi.php">
45
<InvalidArgument occurrences="1"/>
@@ -7,5 +8,15 @@
78
<UndefinedFunction occurrences="1">
89
<code>\get_debug_type($data)</code>
910
</UndefinedFunction>
11+
=======
12+
<files psalm-version="4.0.1@b1e2e30026936ef8d5bf6a354d1c3959b6231f44">
13+
<file src="lib/Gitlab/HttpClient/Plugin/HistoryTrait.php">
14+
<UnrecognizedStatement occurrences="1"/>
15+
>>>>>>> 9.19
16+
</file>
17+
<file src="vendor/php-http/client-common/src/Plugin/VersionBridgePlugin.php">
18+
<InternalMethod occurrences="1">
19+
<code>doHandleRequest</code>
20+
</InternalMethod>
1021
</file>
1122
</files>

‎src/Api/Groups.php

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ public function all(array $parameters = [])
3131
}
3232

3333
/**
34-
* @param int $id
34+
* @param int|string $id
3535
*
3636
* @return mixed
3737
*/
38-
public function show(int $id)
38+
public function show($id)
3939
{
4040
return $this->get('groups/'.self::encodePath($id));
4141
}
@@ -71,44 +71,44 @@ public function create(string $name, string $path, string $description = null, s
7171
}
7272

7373
/**
74-
* @param int $id
75-
* @param array $params
74+
* @param int|string $id
75+
* @param array $params
7676
*
7777
* @return mixed
7878
*/
79-
public function update(int $id, array $params)
79+
public function update($id, array $params)
8080
{
8181
return $this->put('groups/'.self::encodePath($id), $params);
8282
}
8383

8484
/**
85-
* @param int $group_id
85+
* @param int|string $group_id
8686
*
8787
* @return mixed
8888
*/
89-
public function remove(int $group_id)
89+
public function remove($group_id)
9090
{
9191
return $this->delete('groups/'.self::encodePath($group_id));
9292
}
9393

9494
/**
95-
* @param int $group_id
95+
* @param int|string $group_id
9696
* @param int|string $project_id
9797
*
9898
* @return mixed
9999
*/
100-
public function transfer(int $group_id, $project_id)
100+
public function transfer($group_id, $project_id)
101101
{
102102
return $this->post('groups/'.self::encodePath($group_id).'/projects/'.self::encodePath($project_id));
103103
}
104104

105105
/**
106-
* @param int $group_id
107-
* @param array $parameters
106+
* @param int|string $group_id
107+
* @param array $parameters
108108
*
109109
* @return mixed
110110
*/
111-
public function allMembers(int $group_id, array $parameters = [])
111+
public function allMembers($group_id, array $parameters = [])
112112
{
113113
$resolver = $this->createOptionsResolver();
114114
$resolver->setDefined('query');
@@ -117,15 +117,15 @@ public function allMembers(int $group_id, array $parameters = [])
117117
}
118118

119119
/**
120-
* @param int $group_id
121-
* @param array $parameters {
120+
* @param int|string $group_id
121+
* @param array $parameters {
122122
*
123123
* @var string $query A query string to search for members.
124124
* }
125125
*
126126
* @return mixed
127127
*/
128-
public function members(int $group_id, array $parameters = [])
128+
public function members($group_id, array $parameters = [])
129129
{
130130
$resolver = $this->createOptionsResolver();
131131
$resolver->setDefined('query');
@@ -134,24 +134,24 @@ public function members(int $group_id, array $parameters = [])
134134
}
135135

136136
/**
137-
* @param int $group_id
138-
* @param int $user_id
137+
* @param int|string $group_id
138+
* @param int $user_id
139139
*
140140
* @return mixed
141141
*/
142-
public function member(int $group_id, int $user_id)
142+
public function member($group_id, int $user_id)
143143
{
144144
return $this->get('groups/'.self::encodePath($group_id).'/members/'.self::encodePath($user_id));
145145
}
146146

147147
/**
148-
* @param int $group_id
149-
* @param int $user_id
150-
* @param int $access_level
148+
* @param int|string $group_id
149+
* @param int $user_id
150+
* @param int $access_level
151151
*
152152
* @return mixed
153153
*/
154-
public function addMember(int $group_id, int $user_id, int $access_level)
154+
public function addMember($group_id, int $user_id, int $access_level)
155155
{
156156
return $this->post('groups/'.self::encodePath($group_id).'/members', [
157157
'user_id' => $user_id,
@@ -160,33 +160,33 @@ public function addMember(int $group_id, int $user_id, int $access_level)
160160
}
161161

162162
/**
163-
* @param int $group_id
164-
* @param int $user_id
165-
* @param int $access_level
163+
* @param int|string $group_id
164+
* @param int $user_id
165+
* @param int $access_level
166166
*
167167
* @return mixed
168168
*/
169-
public function saveMember(int $group_id, int $user_id, int $access_level)
169+
public function saveMember($group_id, int $user_id, int $access_level)
170170
{
171171
return $this->put('groups/'.self::encodePath($group_id).'/members/'.self::encodePath($user_id), [
172172
'access_level' => $access_level,
173173
]);
174174
}
175175

176176
/**
177-
* @param int $group_id
178-
* @param int $user_id
177+
* @param int|string $group_id
178+
* @param int $user_id
179179
*
180180
* @return mixed
181181
*/
182-
public function removeMember(int $group_id, int $user_id)
182+
public function removeMember($group_id, int $user_id)
183183
{
184184
return $this->delete('groups/'.self::encodePath($group_id).'/members/'.self::encodePath($user_id));
185185
}
186186

187187
/**
188-
* @param int $id
189-
* @param array $parameters {
188+
* @param int|string $id
189+
* @param array $parameters {
190190
*
191191
* @var bool $archived limit by archived status
192192
* @var string $visibility limit by visibility public, internal, or private
@@ -206,7 +206,7 @@ public function removeMember(int $group_id, int $user_id)
206206
*
207207
* @return mixed
208208
*/
209-
public function projects(int $id, array $parameters = [])
209+
public function projects($id, array $parameters = [])
210210
{
211211
$resolver = $this->createOptionsResolver();
212212
$booleanNormalizer = function (Options $resolver, $value) {
@@ -264,8 +264,8 @@ public function projects(int $id, array $parameters = [])
264264
}
265265

266266
/**
267-
* @param int $group_id
268-
* @param array $parameters {
267+
* @param int|string $group_id
268+
* @param array $parameters {
269269
*
270270
* @var int[] $skip_groups skip the group IDs passes
271271
* @var bool $all_available show all the groups you have access to
@@ -278,94 +278,94 @@ public function projects(int $id, array $parameters = [])
278278
*
279279
* @return mixed
280280
*/
281-
public function subgroups(int $group_id, array $parameters = [])
281+
public function subgroups($group_id, array $parameters = [])
282282
{
283283
$resolver = $this->getGroupSearchResolver();
284284

285285
return $this->get('groups/'.self::encodePath($group_id).'/subgroups', $resolver->resolve($parameters));
286286
}
287287

288288
/**
289-
* @param int $group_id
290-
* @param array $parameters
289+
* @param int|string $group_id
290+
* @param array $parameters
291291
*
292292
* @return mixed
293293
*/
294-
public function labels(int $group_id, array $parameters = [])
294+
public function labels($group_id, array $parameters = [])
295295
{
296296
$resolver = $this->createOptionsResolver();
297297

298298
return $this->get('groups/'.self::encodePath($group_id).'/labels', $resolver->resolve($parameters));
299299
}
300300

301301
/**
302-
* @param int $group_id
303-
* @param array $params
302+
* @param int|string $group_id
303+
* @param array $params
304304
*
305305
* @return mixed
306306
*/
307-
public function addLabel(int $group_id, array $params)
307+
public function addLabel($group_id, array $params)
308308
{
309309
return $this->post('groups/'.self::encodePath($group_id).'/labels', $params);
310310
}
311311

312312
/**
313-
* @param int $group_id
314-
* @param array $params
313+
* @param int|string $group_id
314+
* @param array $params
315315
*
316316
* @return mixed
317317
*/
318-
public function updateLabel(int $group_id, array $params)
318+
public function updateLabel($group_id, array $params)
319319
{
320320
return $this->put('groups/'.self::encodePath($group_id).'/labels', $params);
321321
}
322322

323323
/**
324-
* @param int $group_id
325-
* @param string $name
324+
* @param int|string $group_id
325+
* @param string $name
326326
*
327327
* @return mixed
328328
*/
329-
public function removeLabel(int $group_id, string $name)
329+
public function removeLabel($group_id, string $name)
330330
{
331331
return $this->delete('groups/'.self::encodePath($group_id).'/labels', [
332332
'name' => $name,
333333
]);
334334
}
335335

336336
/**
337-
* @param int $group_id
338-
* @param array $parameters
337+
* @param int|string $group_id
338+
* @param array $parameters
339339
*
340340
* @return mixed
341341
*/
342-
public function variables(int $group_id, array $parameters = [])
342+
public function variables($group_id, array $parameters = [])
343343
{
344344
$resolver = $this->createOptionsResolver();
345345

346346
return $this->get('groups/'.self::encodePath($group_id).'/variables', $resolver->resolve($parameters));
347347
}
348348

349349
/**
350-
* @param int $group_id
351-
* @param string $key
350+
* @param int|string $group_id
351+
* @param string $key
352352
*
353353
* @return mixed
354354
*/
355-
public function variable(int $group_id, string $key)
355+
public function variable($group_id, string $key)
356356
{
357357
return $this->get('groups/'.self::encodePath($group_id).'/variables/'.self::encodePath($key));
358358
}
359359

360360
/**
361-
* @param int $group_id
362-
* @param string $key
363-
* @param string $value
364-
* @param bool|null $protected
361+
* @param int|string $group_id
362+
* @param string $key
363+
* @param string $value
364+
* @param bool|null $protected
365365
*
366366
* @return mixed
367367
*/
368-
public function addVariable(int $group_id, string $key, string $value, ?bool $protected = null)
368+
public function addVariable($group_id, string $key, string $value, ?bool $protected = null)
369369
{
370370
$payload = [
371371
'key' => $key,
@@ -380,14 +380,14 @@ public function addVariable(int $group_id, string $key, string $value, ?bool $pr
380380
}
381381

382382
/**
383-
* @param int $group_id
384-
* @param string $key
385-
* @param string $value
386-
* @param bool|null $protected
383+
* @param int|string $group_id
384+
* @param string $key
385+
* @param string $value
386+
* @param bool|null $protected
387387
*
388388
* @return mixed
389389
*/
390-
public function updateVariable(int $group_id, string $key, string $value, ?bool $protected = null)
390+
public function updateVariable($group_id, string $key, string $value, ?bool $protected = null)
391391
{
392392
$payload = [
393393
'value' => $value,
@@ -401,12 +401,12 @@ public function updateVariable(int $group_id, string $key, string $value, ?bool
401401
}
402402

403403
/**
404-
* @param int $group_id
405-
* @param string $key
404+
* @param int|string $group_id
405+
* @param string $key
406406
*
407407
* @return mixed
408408
*/
409-
public function removeVariable(int $group_id, string $key)
409+
public function removeVariable($group_id, string $key)
410410
{
411411
return $this->delete('groups/'.self::encodePath($group_id).'/variables/'.self::encodePath($key));
412412
}

0 commit comments

Comments
 (0)