Skip to content

Commit 3f332ed

Browse files
loloslolos
committed
Fix various Teams' URIs
- \Github\Api\Organization\Teams::show - \Github\Api\Organization\Teams::update - \Github\Api\Organization\Teams::remove - \Github\Api\Organization\Teams::members - \Github\Api\Organization\Teams::check - \Github\Api\Organization\Teams::addMember - \Github\Api\Organization\Teams::removeMember
1 parent 624da98 commit 3f332ed

File tree

2 files changed

+52
-31
lines changed

2 files changed

+52
-31
lines changed

‎lib/Github/Api/Organization/Teams.php

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,18 @@ public function create($organization, array $params)
3232
return $this->post('/orgs/'.rawurlencode($organization).'/teams', $params);
3333
}
3434

35-
public function show($team)
35+
/**
36+
* @link https://developer.github.com/v3/teams/#list-teams
37+
*/
38+
public function show($team, $organization)
3639
{
37-
return $this->get('/teams/'.rawurlencode($team));
40+
return $this->get('/orgs/'.rawurlencode($organization).'/teams/'.rawurlencode($team));
3841
}
3942

40-
public function update($team, array $params)
43+
/**
44+
* @link https://developer.github.com/v3/teams/#edit-team
45+
*/
46+
public function update($team, array $params, $organization)
4147
{
4248
if (!isset($params['name'])) {
4349
throw new MissingArgumentException('name');
@@ -46,32 +52,47 @@ public function update($team, array $params)
4652
$params['permission'] = 'pull';
4753
}
4854

49-
return $this->patch('/teams/'.rawurlencode($team), $params);
55+
return $this->patch('/orgs/'.rawurlencode($organization).'/teams/'.rawurlencode($team), $params);
5056
}
5157

52-
public function remove($team)
58+
/**
59+
* @link https://developer.github.com/v3/teams/#delete-team
60+
*/
61+
public function remove($team, $organization)
5362
{
54-
return $this->delete('/teams/'.rawurlencode($team));
63+
return $this->delete('/orgs/'.rawurlencode($organization).'/teams/'.rawurlencode($team));
5564
}
5665

57-
public function members($team)
66+
/**
67+
* @link https://developer.github.com/v3/teams/members/#list-team-members
68+
*/
69+
public function members($team, $organization)
5870
{
59-
return $this->get('/teams/'.rawurlencode($team).'/members');
71+
return $this->get('/orgs/'.rawurlencode($organization).'/teams/'.rawurlencode($team).'/members');
6072
}
6173

62-
public function check($team, $username)
74+
/**
75+
* @link https://developer.github.com/v3/teams/members/#get-team-membership
76+
*/
77+
public function check($team, $username, $organization)
6378
{
64-
return $this->get('/teams/'.rawurlencode($team).'/memberships/'.rawurlencode($username));
79+
return $this->get('/orgs/'.rawurlencode($organization).'/teams/'.rawurlencode($team).'/memberships/'.rawurlencode($username));
6580
}
6681

67-
public function addMember($team, $username)
82+
/**
83+
* @link https://developer.github.com/v3/teams/members/#add-or-update-team-membership
84+
*/
85+
public function addMember($team, $username, $organization)
6886
{
69-
return $this->put('/teams/'.rawurlencode($team).'/memberships/'.rawurlencode($username));
87+
return $this->put('/orgs/'.rawurlencode($organization).'/teams/'.rawurlencode($team).'/memberships/'.rawurlencode($username));
7088
}
7189

72-
public function removeMember($team, $username)
90+
/**
91+
* @link https://developer.github.com/v3/teams/members/#remove-team-membership
92+
*/
93+
public function removeMember($team, $username, $organization)
7394
{
74-
return $this->delete('/teams/'.rawurlencode($team).'/memberships/'.rawurlencode($username));
95+
return $this->delete('/orgs/'.rawurlencode($organization).'/teams/'.rawurlencode($team).'/memberships/'.rawurlencode($username));
7596
}
7697

7798
public function repositories($team)

‎test/Github/Tests/Api/Organization/TeamsTest.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ public function shouldCheckIfMemberIsInOrganizationTeam()
3333
$api = $this->getApiMock();
3434
$api->expects($this->once())
3535
->method('get')
36-
->with('/teams/KnpWorld/memberships/l3l0')
36+
->with('/orgs/KnpLabs/teams/KnpWorld/memberships/l3l0')
3737
->will($this->returnValue($expectedValue));
3838

39-
$this->assertEquals($expectedValue, $api->check('KnpWorld', 'l3l0'));
39+
$this->assertEquals($expectedValue, $api->check('KnpWorld', 'l3l0', 'KnpLabs'));
4040
}
4141

4242
/**
@@ -49,10 +49,10 @@ public function shouldRemoveOrganizationTeam()
4949
$api = $this->getApiMock();
5050
$api->expects($this->once())
5151
->method('delete')
52-
->with('/teams/KnpWorld')
52+
->with('/orgs/KnpLabs/teams/KnpWorld')
5353
->will($this->returnValue($expectedValue));
5454

55-
$this->assertEquals($expectedValue, $api->remove('KnpWorld'));
55+
$this->assertEquals($expectedValue, $api->remove('KnpWorld', 'KnpLabs'));
5656
}
5757

5858
/**
@@ -65,10 +65,10 @@ public function shouldShowOrganizationTeam()
6565
$api = $this->getApiMock();
6666
$api->expects($this->once())
6767
->method('get')
68-
->with('/teams/KnpWorld')
68+
->with('/orgs/KnpLabs/teams/KnpWorld')
6969
->will($this->returnValue($expectedValue));
7070

71-
$this->assertEquals($expectedValue, $api->show('KnpWorld'));
71+
$this->assertEquals($expectedValue, $api->show('KnpWorld', 'KnpLabs'));
7272
}
7373

7474
/**
@@ -81,10 +81,10 @@ public function shouldGetTeamMembers()
8181
$api = $this->getApiMock();
8282
$api->expects($this->once())
8383
->method('get')
84-
->with('/teams/KnpWorld/members')
84+
->with('/orgs/KnpLabs/teams/KnpWorld/members')
8585
->will($this->returnValue($expectedValue));
8686

87-
$this->assertEquals($expectedValue, $api->members('KnpWorld'));
87+
$this->assertEquals($expectedValue, $api->members('KnpWorld', 'KnpLabs'));
8888
}
8989

9090
/**
@@ -97,10 +97,10 @@ public function shouldAddTeamMembers()
9797
$api = $this->getApiMock();
9898
$api->expects($this->once())
9999
->method('put')
100-
->with('/teams/KnpWorld/memberships/l3l0')
100+
->with('/orgs/KnpLabs/teams/KnpWorld/memberships/l3l0')
101101
->will($this->returnValue($expectedValue));
102102

103-
$this->assertEquals($expectedValue, $api->addMember('KnpWorld', 'l3l0'));
103+
$this->assertEquals($expectedValue, $api->addMember('KnpWorld', 'l3l0', 'KnpLabs'));
104104
}
105105

106106
/**
@@ -113,10 +113,10 @@ public function shouldRemoveTeamMembers()
113113
$api = $this->getApiMock();
114114
$api->expects($this->once())
115115
->method('delete')
116-
->with('/teams/KnpWorld/memberships/l3l0')
116+
->with('/orgs/KnpLabs/teams/KnpWorld/memberships/l3l0')
117117
->will($this->returnValue($expectedValue));
118118

119-
$this->assertEquals($expectedValue, $api->removeMember('KnpWorld', 'l3l0'));
119+
$this->assertEquals($expectedValue, $api->removeMember('KnpWorld', 'l3l0', 'KnpLabs'));
120120
}
121121

122122
/**
@@ -261,7 +261,7 @@ public function shouldNotUpdateTeamWithoutName()
261261
$api->expects($this->never())
262262
->method('patch');
263263

264-
$api->update('KnpWorld', $data);
264+
$api->update('KnpWorld', $data, 'KnpLabs');
265265
}
266266

267267
/**
@@ -275,10 +275,10 @@ public function shouldUpdateOrganizationTeam()
275275
$api = $this->getApiMock();
276276
$api->expects($this->once())
277277
->method('patch')
278-
->with('/teams/KnpWorld', $data)
278+
->with('/orgs/KnpLabs/teams/KnpWorld', $data)
279279
->will($this->returnValue($expectedValue));
280280

281-
$this->assertEquals($expectedValue, $api->update('KnpWorld', $data));
281+
$this->assertEquals($expectedValue, $api->update('KnpWorld', $data, 'KnpLabs'));
282282
}
283283

284284
/**
@@ -292,10 +292,10 @@ public function shouldUpdateWithPullPermissionWhenPermissionParamNotRecognized()
292292
$api = $this->getApiMock();
293293
$api->expects($this->once())
294294
->method('patch')
295-
->with('/teams/KnpWorld', ['name' => 'KnpWorld', 'permission' => 'pull'])
295+
->with('/orgs/KnpLabs/teams/KnpWorld', ['name' => 'KnpWorld', 'permission' => 'pull'])
296296
->will($this->returnValue($expectedValue));
297297

298-
$this->assertEquals($expectedValue, $api->update('KnpWorld', $data));
298+
$this->assertEquals($expectedValue, $api->update('KnpWorld', $data, 'KnpLabs'));
299299
}
300300

301301
/**

0 commit comments

Comments
 (0)