Skip to content

Change DeployKeys::update method to match GitHub API #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 10, 2019
Merged

Change DeployKeys::update method to match GitHub API #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
938b569
Change DeployKeys::update method to first remove the existing key and…
Jun 10, 2019
40e65c1
Change DeployKeys::update method to first remove the existing key and…
Jun 10, 2019
427fe0c
Merge branch 'fix-deploy-keys-update'
Jun 10, 2019
6ddd583
Convert tabs to spaces
Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/Github/Api/Repository/DeployKeys.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ public function update($username, $repository, $id, array $params)
throw new MissingArgumentException(['title', 'key']);
}

return $this->patch('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/keys/'.rawurlencode($id), $params);
$this->remove($username, $repository, $id);

return $this->create($username, $repository, $params);
}

public function remove($username, $repository, $id)
Expand Down
16 changes: 12 additions & 4 deletions test/Github/Tests/Api/Repository/DeployKeysTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ public function shouldNotUpdateDeployKeyWithoutTitle()

$api = $this->getApiMock();
$api->expects($this->never())
->method('patch');
->method('delete');
$api->expects($this->never())
->method('post');

$api->update('KnpLabs', 'php-github-api', 123, $data);
}
Expand All @@ -126,7 +128,9 @@ public function shouldNotUpdateDeployKeyWithoutKey()

$api = $this->getApiMock();
$api->expects($this->never())
->method('patch');
->method('delete');
$api->expects($this->never())
->method('post');

$api->update('KnpLabs', 'php-github-api', 123, $data);
}
Expand All @@ -141,8 +145,12 @@ public function shouldUpdateDeployKey()

$api = $this->getApiMock();
$api->expects($this->once())
->method('patch')
->with('/repos/KnpLabs/php-github-api/keys/123', $data)
->method('delete')
->with('/repos/KnpLabs/php-github-api/keys/123')
->will($this->returnValue($expectedValue));
$api->expects($this->once())
->method('post')
->with('/repos/KnpLabs/php-github-api/keys', $data)
->will($this->returnValue($expectedValue));

$this->assertEquals($expectedValue, $api->update('KnpLabs', 'php-github-api', 123, $data));
Expand Down