Merge pull request #333 from lesstif/analysis-VrYy6D

lesstif · web-flow · commit 203e0b586896 · 2020-05-31T22:57:13.000+09:00
Apply fixes from StyleCI
diff --git a/src/Configuration/AbstractConfiguration.php b/src/Configuration/AbstractConfiguration.php
@@ -334,4 +334,4 @@ public function getUseV3RestApi()
     {
         return $this->useV3RestApi;
     }
-}
+}
diff --git a/src/Configuration/ArrayConfiguration.php b/src/Configuration/ArrayConfiguration.php
@@ -40,4 +40,4 @@ public function __construct(array $configuration)
             }
         }
     }
-}
+}
diff --git a/src/Configuration/ConfigurationInterface.php b/src/Configuration/ConfigurationInterface.php
@@ -158,4 +158,4 @@ public function getProxyPassword();
      * @return bool
      */
     public function getUseV3RestApi();
-}
+}
diff --git a/src/Configuration/DotEnvConfiguration.php b/src/Configuration/DotEnvConfiguration.php
@@ -160,4 +160,4 @@ private function loadDotEnv(string $path)
             throw new JiraException('can not load PHP dotenv class.!');
         }
     }
-}
+}
diff --git a/src/Issue/IssueService.php b/src/Issue/IssueService.php
@@ -825,9 +825,10 @@ public function getCustomFields($priorityId)
      *
      * @param string $issueIdOrKey
      *
-     * @return Reporter[]
      * @throws JiraException
      * @throws \JsonMapper_Exception
+     *
+     * @return Reporter[]
      */
     public function getWatchers(string $issueIdOrKey)
     {
diff --git a/src/Issue/RemoteIssueLink.php b/src/Issue/RemoteIssueLink.php
@@ -29,6 +29,7 @@ public function jsonSerialize()
 
     /**
      * @param string $url
+     *
      * @return $this
      */
     public function setUrl(string $url)
diff --git a/src/JiraClient.php b/src/JiraClient.php
@@ -239,16 +239,16 @@ public function exec($context, $post_data = null, $custom_request = null, $cooki
 
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $this->getConfiguration()->isCurlOptSslVerifyHost());
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $this->getConfiguration()->isCurlOptSslVerifyPeer());
-        if($this->getConfiguration()->isCurlOptSslCert()) {
+        if ($this->getConfiguration()->isCurlOptSslCert()) {
             curl_setopt($ch, CURLOPT_SSLCERT, $this->getConfiguration()->isCurlOptSslCert());
         }
-        if($this->getConfiguration()->isCurlOptSslCertPassword()) {
+        if ($this->getConfiguration()->isCurlOptSslCertPassword()) {
             curl_setopt($ch, CURLOPT_SSLCERTPASSWD, $this->getConfiguration()->isCurlOptSslCertPassword());
         }
-        if($this->getConfiguration()->isCurlOptSslKey()) {
+        if ($this->getConfiguration()->isCurlOptSslKey()) {
             curl_setopt($ch, CURLOPT_SSLKEY, $this->getConfiguration()->isCurlOptSslKey());
         }
-        if($this->getConfiguration()->isCurlOptSslKeyPassword()) {
+        if ($this->getConfiguration()->isCurlOptSslKeyPassword()) {
             curl_setopt($ch, CURLOPT_SSLKEYPASSWD, $this->getConfiguration()->isCurlOptSslKeyPassword());
         }
 
@@ -354,16 +354,16 @@ private function createUploadHandle($url, $upload_file, $ch)
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $this->getConfiguration()->isCurlOptSslVerifyHost());
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $this->getConfiguration()->isCurlOptSslVerifyPeer());
 
-        if($this->getConfiguration()->isCurlOptSslCert()) {
+        if ($this->getConfiguration()->isCurlOptSslCert()) {
             curl_setopt($ch, CURLOPT_SSLCERT, $this->getConfiguration()->isCurlOptSslCert());
         }
-        if($this->getConfiguration()->isCurlOptSslCertPassword()) {
+        if ($this->getConfiguration()->isCurlOptSslCertPassword()) {
             curl_setopt($ch, CURLOPT_SSLCERTPASSWD, $this->getConfiguration()->isCurlOptSslCertPassword());
         }
-        if($this->getConfiguration()->isCurlOptSslKey()) {
+        if ($this->getConfiguration()->isCurlOptSslKey()) {
             curl_setopt($ch, CURLOPT_SSLKEY, $this->getConfiguration()->isCurlOptSslKey());
         }
-        if($this->getConfiguration()->isCurlOptSslKeyPassword()) {
+        if ($this->getConfiguration()->isCurlOptSslKeyPassword()) {
             curl_setopt($ch, CURLOPT_SSLKEYPASSWD, $this->getConfiguration()->isCurlOptSslKeyPassword());
         }
 
@@ -437,10 +437,10 @@ public function upload($context, $filePathArray)
     }
 
     /**
-     * @param array $chArr
+     * @param array    $chArr
      * @param resource $mh
-     * @param string $body
-     * @param int $result_code
+     * @param string   $body
+     * @param int      $result_code
      *
      * @throws \JiraRestApi\JiraException
      */
@@ -549,9 +549,9 @@ public function toHttpQueryParameter(array $paramArray)
     /**
      * download and save into outDir.
      *
-     * @param string $url full url
-     * @param string $outDir save dir
-     * @param string $file save filename
+     * @param string $url        full url
+     * @param string $outDir     save dir
+     * @param string $file       save filename
      * @param string $cookieFile cookie filename
      *
      * @throws JiraException
@@ -575,16 +575,16 @@ public function download(string $url, string $outDir, string $file, string $cook
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $this->getConfiguration()->isCurlOptSslVerifyHost());
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $this->getConfiguration()->isCurlOptSslVerifyPeer());
 
-        if($this->getConfiguration()->isCurlOptSslCert()) {
+        if ($this->getConfiguration()->isCurlOptSslCert()) {
             curl_setopt($ch, CURLOPT_SSLCERT, $this->getConfiguration()->isCurlOptSslCert());
         }
-        if($this->getConfiguration()->isCurlOptSslCertPassword()) {
+        if ($this->getConfiguration()->isCurlOptSslCertPassword()) {
             curl_setopt($ch, CURLOPT_SSLCERTPASSWD, $this->getConfiguration()->isCurlOptSslCertPassword());
         }
-        if($this->getConfiguration()->isCurlOptSslKey()) {
+        if ($this->getConfiguration()->isCurlOptSslKey()) {
             curl_setopt($ch, CURLOPT_SSLKEY, $this->getConfiguration()->isCurlOptSslKey());
         }
-        if($this->getConfiguration()->isCurlOptSslKeyPassword()) {
+        if ($this->getConfiguration()->isCurlOptSslKeyPassword()) {
             curl_setopt($ch, CURLOPT_SSLKEYPASSWD, $this->getConfiguration()->isCurlOptSslKeyPassword());
         }
 
diff --git a/src/Project/ProjectService.php b/src/Project/ProjectService.php
@@ -101,10 +101,11 @@ public function getStatuses($projectIdOrKey)
      * make transition info array for project issue transition.
      *
      * @param string|int $projectIdOrKey
-     * @return array
+     *
      * @throws JiraException
      *
      * @return array
+     * @return array
      */
     public function getProjectTransitionsToArray($projectIdOrKey)
     {
diff --git a/src/Sprint/SprintService.php b/src/Sprint/SprintService.php
@@ -39,9 +39,11 @@ public function getSprintFromJSON($json)
      *  get all Sprint list.
      *
      * @param string $sprintId
-     * @return object
+     *
      * @throws JiraException
      * @throws \JsonMapper_Exception
+     *
+     * @return object
      */
     public function getSprint(string $sprintId)
     {
diff --git a/src/Version/VersionService.php b/src/Version/VersionService.php
@@ -56,10 +56,11 @@ public function move(Version $version)
      *
      * @param string $id version id
      *
-     * @return Version
-     *
      * @throws JiraException
      * @throws \JsonMapper_Exception
+     *
+     * @return Version
+     *
      * @see ProjectService::getVersions()
      */
     public function get(string $id)

Original file line number	Diff line number	Diff line change
`@@ -334,4 +334,4 @@ public function getUseV3RestApi()`
`334`	`334`	`{`
`335`	`335`	`return $this->useV3RestApi;`
`336`	`336`	`}`
`337`		`-}`
	`337`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,4 @@ public function __construct(array $configuration)`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
`43`		`-}`
	`43`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -160,4 +160,4 @@ private function loadDotEnv(string $path)`
`160`	`160`	`throw new JiraException('can not load PHP dotenv class.!');`
`161`	`161`	`}`
`162`	`162`	`}`
`163`		`-}`
	`163`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -825,9 +825,10 @@ public function getCustomFields($priorityId)`
`825`	`825`	`*`
`826`	`826`	`* @param string $issueIdOrKey`
`827`	`827`	`*`
`828`		`- * @return Reporter[]`
`829`	`828`	`* @throws JiraException`
`830`	`829`	`* @throws \JsonMapper_Exception`
	`830`	`+ *`
	`831`	`+ * @return Reporter[]`
`831`	`832`	`*/`
`832`	`833`	`public function getWatchers(string $issueIdOrKey)`
`833`	`834`	`{`
Original file line number	Diff line number	Diff line change
`@@ -239,16 +239,16 @@ public function exec($context, $post_data = null, $custom_request = null, $cooki`
`239`	`239`
`240`	`240`	`curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $this->getConfiguration()->isCurlOptSslVerifyHost());`
`241`	`241`	`curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $this->getConfiguration()->isCurlOptSslVerifyPeer());`
`242`		`- if($this->getConfiguration()->isCurlOptSslCert()) {`
	`242`	`+ if ($this->getConfiguration()->isCurlOptSslCert()) {`
`243`	`243`	`curl_setopt($ch, CURLOPT_SSLCERT, $this->getConfiguration()->isCurlOptSslCert());`
`244`	`244`	`}`
`245`		`- if($this->getConfiguration()->isCurlOptSslCertPassword()) {`
	`245`	`+ if ($this->getConfiguration()->isCurlOptSslCertPassword()) {`
`246`	`246`	`curl_setopt($ch, CURLOPT_SSLCERTPASSWD, $this->getConfiguration()->isCurlOptSslCertPassword());`
`247`	`247`	`}`
`248`		`- if($this->getConfiguration()->isCurlOptSslKey()) {`
	`248`	`+ if ($this->getConfiguration()->isCurlOptSslKey()) {`
`249`	`249`	`curl_setopt($ch, CURLOPT_SSLKEY, $this->getConfiguration()->isCurlOptSslKey());`
`250`	`250`	`}`
`251`		`- if($this->getConfiguration()->isCurlOptSslKeyPassword()) {`
	`251`	`+ if ($this->getConfiguration()->isCurlOptSslKeyPassword()) {`
`252`	`252`	`curl_setopt($ch, CURLOPT_SSLKEYPASSWD, $this->getConfiguration()->isCurlOptSslKeyPassword());`
`253`	`253`	`}`
`254`	`254`
`@@ -354,16 +354,16 @@ private function createUploadHandle($url, $upload_file, $ch)`
`354`	`354`	`curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $this->getConfiguration()->isCurlOptSslVerifyHost());`
`355`	`355`	`curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $this->getConfiguration()->isCurlOptSslVerifyPeer());`
`356`	`356`
`357`		`- if($this->getConfiguration()->isCurlOptSslCert()) {`
	`357`	`+ if ($this->getConfiguration()->isCurlOptSslCert()) {`
`358`	`358`	`curl_setopt($ch, CURLOPT_SSLCERT, $this->getConfiguration()->isCurlOptSslCert());`
`359`	`359`	`}`
`360`		`- if($this->getConfiguration()->isCurlOptSslCertPassword()) {`
	`360`	`+ if ($this->getConfiguration()->isCurlOptSslCertPassword()) {`
`361`	`361`	`curl_setopt($ch, CURLOPT_SSLCERTPASSWD, $this->getConfiguration()->isCurlOptSslCertPassword());`
`362`	`362`	`}`
`363`		`- if($this->getConfiguration()->isCurlOptSslKey()) {`
	`363`	`+ if ($this->getConfiguration()->isCurlOptSslKey()) {`
`364`	`364`	`curl_setopt($ch, CURLOPT_SSLKEY, $this->getConfiguration()->isCurlOptSslKey());`
`365`	`365`	`}`
`366`		`- if($this->getConfiguration()->isCurlOptSslKeyPassword()) {`
	`366`	`+ if ($this->getConfiguration()->isCurlOptSslKeyPassword()) {`
`367`	`367`	`curl_setopt($ch, CURLOPT_SSLKEYPASSWD, $this->getConfiguration()->isCurlOptSslKeyPassword());`
`368`	`368`	`}`
`369`	`369`
`@@ -437,10 +437,10 @@ public function upload($context, $filePathArray)`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`/**`
`440`		`- * @param array $chArr`
	`440`	`+ * @param array $chArr`
`441`	`441`	`* @param resource $mh`
`442`		`- * @param string $body`
`443`		`- * @param int $result_code`
	`442`	`+ * @param string $body`
	`443`	`+ * @param int $result_code`
`444`	`444`	`*`
`445`	`445`	`* @throws \JiraRestApi\JiraException`
`446`	`446`	`*/`
`@@ -549,9 +549,9 @@ public function toHttpQueryParameter(array $paramArray)`
`549`	`549`	`/**`
`550`	`550`	`* download and save into outDir.`
`551`	`551`	`*`
`552`		`- * @param string $url full url`
`553`		`- * @param string $outDir save dir`
`554`		`- * @param string $file save filename`
	`552`	`+ * @param string $url full url`
	`553`	`+ * @param string $outDir save dir`
	`554`	`+ * @param string $file save filename`
`555`	`555`	`* @param string $cookieFile cookie filename`
`556`	`556`	`*`
`557`	`557`	`* @throws JiraException`
`@@ -575,16 +575,16 @@ public function download(string $url, string $outDir, string $file, string $cook`
`575`	`575`	`curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $this->getConfiguration()->isCurlOptSslVerifyHost());`
`576`	`576`	`curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $this->getConfiguration()->isCurlOptSslVerifyPeer());`
`577`	`577`
`578`		`- if($this->getConfiguration()->isCurlOptSslCert()) {`
	`578`	`+ if ($this->getConfiguration()->isCurlOptSslCert()) {`
`579`	`579`	`curl_setopt($ch, CURLOPT_SSLCERT, $this->getConfiguration()->isCurlOptSslCert());`
`580`	`580`	`}`
`581`		`- if($this->getConfiguration()->isCurlOptSslCertPassword()) {`
	`581`	`+ if ($this->getConfiguration()->isCurlOptSslCertPassword()) {`
`582`	`582`	`curl_setopt($ch, CURLOPT_SSLCERTPASSWD, $this->getConfiguration()->isCurlOptSslCertPassword());`
`583`	`583`	`}`
`584`		`- if($this->getConfiguration()->isCurlOptSslKey()) {`
	`584`	`+ if ($this->getConfiguration()->isCurlOptSslKey()) {`
`585`	`585`	`curl_setopt($ch, CURLOPT_SSLKEY, $this->getConfiguration()->isCurlOptSslKey());`
`586`	`586`	`}`
`587`		`- if($this->getConfiguration()->isCurlOptSslKeyPassword()) {`
	`587`	`+ if ($this->getConfiguration()->isCurlOptSslKeyPassword()) {`
`588`	`588`	`curl_setopt($ch, CURLOPT_SSLKEYPASSWD, $this->getConfiguration()->isCurlOptSslKeyPassword());`
`589`	`589`	`}`
`590`	`590`
Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,11 @@ public function getStatuses($projectIdOrKey)`
`101`	`101`	`* make transition info array for project issue transition.`
`102`	`102`	`*`
`103`	`103`	`* @param string\|int $projectIdOrKey`
`104`		`- * @return array`
	`104`	`+ *`
`105`	`105`	`* @throws JiraException`
`106`	`106`	`*`
`107`	`107`	`* @return array`
	`108`	`+ * @return array`
`108`	`109`	`*/`
`109`	`110`	`public function getProjectTransitionsToArray($projectIdOrKey)`
`110`	`111`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,11 @@ public function getSprintFromJSON($json)`
`39`	`39`	`* get all Sprint list.`
`40`	`40`	`*`
`41`	`41`	`* @param string $sprintId`
`42`		`- * @return object`
	`42`	`+ *`
`43`	`43`	`* @throws JiraException`
`44`	`44`	`* @throws \JsonMapper_Exception`
	`45`	`+ *`
	`46`	`+ * @return object`
`45`	`47`	`*/`
`46`	`48`	`public function getSprint(string $sprintId)`
`47`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,11 @@ public function move(Version $version)`
`56`	`56`	`*`
`57`	`57`	`* @param string $id version id`
`58`	`58`	`*`
`59`		`- * @return Version`
`60`		`- *`
`61`	`59`	`* @throws JiraException`
`62`	`60`	`* @throws \JsonMapper_Exception`
	`61`	`+ *`
	`62`	`+ * @return Version`
	`63`	`+ *`
`63`	`64`	`* @see ProjectService::getVersions()`
`64`	`65`	`*/`
`65`	`66`	`public function get(string $id)`