Skip to content

Commit 8f9bbec

Browse files
committed
Merge branch 'main' of github.com:lesstif/php-jira-rest-client
* 'main' of github.com:lesstif/php-jira-rest-client: Fix comment method not returning multiple comments (#432) Apply fixes from StyleCI (#443)
2 parents 30cc215 + fce4fdd commit 8f9bbec

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/Issue/IssueFieldV3.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class IssueFieldV3 extends IssueField
1919
*
2020
* @return $this|IssueField
2121
*/
22-
public function setDescriptionV3(?DescriptionV3 $description) : static
22+
public function setDescriptionV3(?DescriptionV3 $description): static
2323
{
2424
$this->descriptionV3 = $description;
2525

@@ -31,7 +31,7 @@ public function setDescriptionV3(?DescriptionV3 $description) : static
3131
*
3232
* @return $this
3333
*/
34-
public function addDescriptionParagraph(?DescriptionV3 $description) : static
34+
public function addDescriptionParagraph(?DescriptionV3 $description): static
3535
{
3636
if (empty($this->description)) {
3737
$this->descriptionV3 = new DescriptionV3();
@@ -48,7 +48,7 @@ public function addDescriptionParagraph(?DescriptionV3 $description) : static
4848
*
4949
* @return $this
5050
*/
51-
public function addDescriptionHeading($level, string $description) : static
51+
public function addDescriptionHeading($level, string $description): static
5252
{
5353
if (empty($this->descriptionV3)) {
5454
$this->descriptionV3 = new DescriptionV3();
@@ -64,7 +64,7 @@ public function addDescriptionHeading($level, string $description) : static
6464
*
6565
* @return $this
6666
*/
67-
public function setEnvironment(?DescriptionV3 $environment) : static
67+
public function setEnvironment(?DescriptionV3 $environment): static
6868
{
6969
if (!empty($this->environmentV3)) {
7070
$this->environmentV3 = $environment;

src/Issue/IssueService.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public function getComment($issueIdOrKey, $id, array $paramArray = []) : Comment
317317
* @throws JiraException
318318
* @throws \JsonMapper_Exception
319319
*
320-
* @return Comment Comment class
320+
* @return Comments Comments class
321321
*/
322322
public function getComments($issueIdOrKey, array $paramArray = []) : Comments
323323
{
@@ -326,12 +326,12 @@ public function getComments($issueIdOrKey, array $paramArray = []) : Comments
326326
$ret = $this->exec($this->uri.'/'.$issueIdOrKey.'/comment'.$this->toHttpQueryParameter($paramArray), null);
327327

328328
$this->log->debug('get comments result='.var_export($ret, true));
329-
$comment = $this->json_mapper->map(
329+
$comments = $this->json_mapper->map(
330330
json_decode($ret),
331-
new Comment()
331+
new Comments()
332332
);
333333

334-
return $comment;
334+
return $comments;
335335
}
336336

337337
/**

0 commit comments

Comments
 (0)