Skip to content

Commit c0e4e7a

Browse files
committed
Merge branch 'develop' of github.com:lesstif/php-jira-rest-client into develop
2 parents 0085ccc + e7f5c4c commit c0e4e7a

File tree

7 files changed

+11
-13
lines changed

7 files changed

+11
-13
lines changed

src/Configuration/AbstractConfiguration.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,5 +290,4 @@ public function getUseV3RestApi()
290290
{
291291
return $this->useV3RestApi;
292292
}
293-
294293
}

src/Issue/ContentField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ public function jsonSerialize()
2222
{
2323
return array_filter(get_object_vars($this));
2424
}
25-
}
25+
}

src/Issue/DescriptionV3.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
* REST API V3 Issue description field.
77
*
88
* Class DescriptionV3
9-
* @package JiraRestApi\Issue
109
*/
1110
class DescriptionV3 implements \JsonSerializable
1211
{
1312
/* @var string */
1413
public $self;
1514

1615
/* @var string */
17-
public $type = 'doc';
16+
public $type = 'doc';
1817

1918
/* @var integer */
2019
public $version = 1;
@@ -33,7 +32,7 @@ public function addDescriptionContent($type, $text, $attrs = [])
3332

3433
$cf->type = $type;
3534

36-
if (!empty($attrs)){
35+
if (!empty($attrs)) {
3736
$cf->attrs = $attrs;
3837
}
3938

src/Issue/IssueFieldV3.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ public function addDescriptionParagraph($description)
7373
}
7474

7575
/**
76-
* @param integer $level heading level
77-
*
76+
* @param int $level heading level
7877
* @param string $description
7978
*
8079
* @return $this
@@ -92,6 +91,7 @@ public function addDescriptionHeading($level, $description)
9291

9392
/**
9493
* @param \JiraRestApi\Issue\DescriptionV3|null $environment
94+
*
9595
* @return $this
9696
*/
9797
public function setEnvironment($environment)

src/Issue/IssueService.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace JiraRestApi\Issue;
44

5-
use JiraRestApi\Dumper;
65
use JiraRestApi\JiraException;
76

87
class IssueService extends \JiraRestApi\JiraClient
@@ -367,10 +366,11 @@ public function changeAssignee($issueIdOrKey, $assigneeName)
367366
* Change a issue assignee for REST API V3.
368367
*
369368
* @param string|int $issueIdOrKey
370-
* @param string|null $accountId Assigns an issue to a user.
369+
* @param string|null $accountId Assigns an issue to a user.
371370
*
372-
* @return string
373371
* @throws JiraException
372+
*
373+
* @return string
374374
*/
375375
public function changeAssigneeByAccountId($issueIdOrKey, $accountId)
376376
{

src/JiraClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ public function download($url, $outDir, $file, $cookieFile = null)
562562
curl_setopt($ch, CURLOPT_VERBOSE, $this->getConfiguration()->isCurlOptVerbose());
563563

564564
if ($this->isRestApiV3()) {
565-
curl_setopt($ch, CURLOPT_HTTPHEADER, ['x-atlassian-force-account-id: true']);
565+
curl_setopt($ch, CURLOPT_HTTPHEADER, ['x-atlassian-force-account-id: true']);
566566
}
567567

568568
$this->log->debug('Curl exec='.$url);

src/User/UserService.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ public function deleteUser($paramArray)
144144
/**
145145
* get a user info details.
146146
*
147-
* @return Reporter user Object
148-
*
149147
* @throws \JiraRestApi\JiraException
148+
*
149+
* @return Reporter user Object
150150
*/
151151
public function getMyself()
152152
{

0 commit comments

Comments
 (0)