Skip to content

Added API methods. Added DELETE support for curl. #36

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

Closed
wants to merge 6 commits into from
Closed

Added API methods. Added DELETE support for curl. #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5956d70
Initial commit.
dumconstantin Jan 18, 2015
390964e
Changed date to the one provided by the arguments function.
dumconstantin Jan 18, 2015
8445c07
Changed const name for TRANSITION_DELIMITER text that will appear in …
dumconstantin Jan 18, 2015
37b1c37
Abstracted the createWorkload method.
dumconstantin Jan 19, 2015
ac763e1
Add removeWorkflow method. Refactor api call using sprintf.
dumconstantin Jan 29, 2015
05b3c07
Add DELETE request method.
dumconstantin Jan 29, 2015
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
50 changes: 49 additions & 1 deletion src/Jira/Api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ class Api
const REQUEST_POST = "POST";
const REQUEST_PUT = "PUT";
const REQUEST_DELETE = "DELETE";


const TRANSITION_DELIMITER = 'transition:';
Copy link
Member

@aik099 aik099 Feb 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed? I see no usage of this constant in added code.


const AUTOMAP_FIELDS = 0x01;

Expand Down Expand Up @@ -574,4 +575,51 @@ public function closeIssue($issueKey)
}
return $result;
}

/**
* create JIRA Worklog
*
* @param $issue
* @param $filename
* @param array $options
* @return mixed
*/
public function createWorklog($issueKey, $time, $options = array())
{

Copy link
Member

@aik099 aik099 Feb 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this empty line.

$options = array_merge(
array(
"timeSpent" => $time,
),
$options
);

return $this->api(self::REQUEST_POST, sprintf("/rest/api/2/issue/%s/worklog", $issueKey), $options);
}

/**
* get JIRA Worklogs for a given issue key
*
* @param $issueKey
* @return mixed
*/
public function getWorklogs($issueKey)
Copy link
Member

@aik099 aik099 Feb 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase, because this function was already added as part of #37 and now there is branch conflict that prevents your PR merging.

{
return $this->api(self::REQUEST_GET, sprintf("/rest/api/2/issue/%s/worklog", $issueKey));
}

/**
* remove a JIRA Worklog
*
* @param $issueKey
* @return mixed
*/
public function removeWorklog($issueKey, $worklogId)
{
$options = array(
"adjustEstimate" => "auto"
);

return $this->api(self::REQUEST_DELETE, sprintf("/rest/api/2/issue/%s/worklog/%s", $issueKey, $worklogId), $options);
}
}
4 changes: 2 additions & 2 deletions src/Jira/Api/Client/CurlClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ public function sendRequest($method, $url, $data = array(), $endpoint, Authentic
curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data));
}
} else {
if ($method == "PUT") {
curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
if ($method == "PUT" || $method == "DELETE") {
Copy link
Member

@aik099 aik099 Feb 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead please do like here: https://github.com/chobie/jira-api-restclient/pull/53/files#diff-bac9579c3d575193a096385b414bc909

2016-02-27_1035

Copy link
Member

@aik099 aik099 Jun 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already addressed in #76.

curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data));
}
}
Expand Down