Merge branch 'develop' of github.com:lesstif/php-jira-rest-client int…

…o develop
lesstif · Mar 27, 2019 · c0e4e7a · c0e4e7a
2 parents 0085ccc + e7f5c4c
commit c0e4e7a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/src/Configuration/AbstractConfiguration.php b/src/Configuration/AbstractConfiguration.php
@@ -290,5 +290,4 @@ public function getUseV3RestApi()
     {
         return $this->useV3RestApi;
     }
-
 }
diff --git a/src/Issue/ContentField.php b/src/Issue/ContentField.php
@@ -22,4 +22,4 @@ public function jsonSerialize()
     {
         return array_filter(get_object_vars($this));
     }
-}
+}
diff --git a/src/Issue/DescriptionV3.php b/src/Issue/DescriptionV3.php
@@ -6,15 +6,14 @@
  * REST API V3 Issue description field.
  *
  * Class DescriptionV3
- * @package JiraRestApi\Issue
  */
 class DescriptionV3 implements \JsonSerializable
 {
     /* @var string */
     public $self;
 
     /* @var string */
-    public $type  = 'doc';
+    public $type = 'doc';
 
     /* @var integer */
     public $version = 1;
@@ -33,7 +32,7 @@ public function addDescriptionContent($type, $text, $attrs = [])
 
         $cf->type = $type;
 
-        if (!empty($attrs)){
+        if (!empty($attrs)) {
             $cf->attrs = $attrs;
         }
 

diff --git a/src/Issue/IssueFieldV3.php b/src/Issue/IssueFieldV3.php
@@ -73,8 +73,7 @@ public function addDescriptionParagraph($description)
     }
 
     /**
-     * @param integer $level heading level
-     *
+     * @param int    $level       heading level
      * @param string $description
      *
      * @return $this
@@ -92,6 +91,7 @@ public function addDescriptionHeading($level, $description)
 
     /**
      * @param \JiraRestApi\Issue\DescriptionV3|null $environment
+     *
      * @return $this
      */
     public function setEnvironment($environment)

diff --git a/src/Issue/IssueService.php b/src/Issue/IssueService.php
@@ -2,7 +2,6 @@
 
 namespace JiraRestApi\Issue;
 
-use JiraRestApi\Dumper;
 use JiraRestApi\JiraException;
 
 class IssueService extends \JiraRestApi\JiraClient
@@ -367,10 +366,11 @@ public function changeAssignee($issueIdOrKey, $assigneeName)
      * Change a issue assignee for REST API V3.
      *
      * @param string|int  $issueIdOrKey
-     * @param string|null $accountId Assigns an issue to a user.
+     * @param string|null $accountId    Assigns an issue to a user.
      *
-     * @return string
      * @throws JiraException
+     *
+     * @return string
      */
     public function changeAssigneeByAccountId($issueIdOrKey, $accountId)
     {

diff --git a/src/JiraClient.php b/src/JiraClient.php
@@ -562,7 +562,7 @@ public function download($url, $outDir, $file, $cookieFile = null)
         curl_setopt($ch, CURLOPT_VERBOSE, $this->getConfiguration()->isCurlOptVerbose());
 
         if ($this->isRestApiV3()) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER,  ['x-atlassian-force-account-id: true']);
+            curl_setopt($ch, CURLOPT_HTTPHEADER, ['x-atlassian-force-account-id: true']);
         }
 
         $this->log->debug('Curl exec='.$url);

diff --git a/src/User/UserService.php b/src/User/UserService.php
@@ -144,9 +144,9 @@ public function deleteUser($paramArray)
     /**
      * get a user info details.
      *
-     * @return Reporter user Object
-     *
      * @throws \JiraRestApi\JiraException
+     *
+     * @return Reporter user Object
      */
     public function getMyself()
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -290,5 +290,4 @@ public function getUseV3RestApi() @@
         {
             return $this->useV3RestApi;
         }
     }