Skip to content

Commit f8feccb

Browse files
lesstiflesstif
committed
Merge branch 'develop'
* develop: to update mixed method return value to Model class. (Ex: User|object => User)
2 parents 203e0b5 + fee79e1 commit f8feccb

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎src/Auth/AuthService.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function __construct(ConfigurationInterface $configuration = null, Logger
9595
* @throws \JiraRestApi\JiraException
9696
* @throws \JsonMapper_Exception
9797
*
98-
* @return CurrentUser|object
98+
* @return CurrentUser
9999
*/
100100
public function getCurrentUser()
101101
{
@@ -140,7 +140,7 @@ public function logout()
140140
* @throws \JiraRestApi\JiraException
141141
* @throws \JsonMapper_Exception
142142
*
143-
* @return AuthSession|object
143+
* @return AuthSession
144144
*/
145145
public function login($username = null, $password = null)
146146
{

‎src/Field/FieldService.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function getCustomFieldOption($id)
7676
* @throws \JiraRestApi\JiraException
7777
* @throws \JsonMapper_Exception
7878
*
79-
* @return Field|object created field class
79+
* @return Field created field class
8080
*/
8181
public function create(Field $field)
8282
{

‎src/Group/GroupService.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class GroupService extends \JiraRestApi\JiraClient
1818
* @throws \JiraRestApi\JiraException
1919
* @throws \JsonMapper_Exception
2020
*
21-
* @return Group|object
21+
* @return Group
2222
*/
2323
public function get($paramArray)
2424
{
@@ -42,7 +42,7 @@ public function get($paramArray)
4242
* @throws \JiraRestApi\JiraException
4343
* @throws \JsonMapper_Exception
4444
*
45-
* @return GroupSearchResult|object
45+
* @return GroupSearchResult
4646
*/
4747
public function getMembers($paramArray)
4848
{
@@ -67,7 +67,7 @@ public function getMembers($paramArray)
6767
* @throws \JiraRestApi\JiraException
6868
* @throws \JsonMapper_Exception
6969
*
70-
* @return Group|object
70+
* @return Group
7171
*/
7272
public function createGroup(Group $group)
7373
{
@@ -94,7 +94,7 @@ public function createGroup(Group $group)
9494
* @throws \JiraRestApi\JiraException
9595
* @throws \JsonMapper_Exception
9696
*
97-
* @return Group|object Returns the current state of the group.
97+
* @return Group Returns the current state of the group.
9898
*/
9999
public function addUserToGroup(string $groupName, string $userName)
100100
{

‎src/Issue/IssueService.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class IssueService extends \JiraRestApi\JiraClient
1414
*
1515
* @throws \JsonMapper_Exception
1616
*
17-
* @return Issue|object
17+
* @return Issue
1818
*/
1919
public function getIssueFromJSON($json)
2020
{
@@ -36,7 +36,7 @@ public function getIssueFromJSON($json)
3636
* @throws JiraException
3737
* @throws \JsonMapper_Exception
3838
*
39-
* @return Issue|object class
39+
* @return Issue class
4040
*/
4141
public function get($issueIdOrKey, $paramArray = [], $issueObject = null)
4242
{
@@ -65,7 +65,7 @@ public function get($issueIdOrKey, $paramArray = [], $issueObject = null)
6565
* @throws JiraException
6666
* @throws \JsonMapper_Exception
6767
*
68-
* @return Issue|object created issue key
68+
* @return Issue created issue key
6969
*/
7070
public function create($issueField)
7171
{
@@ -227,7 +227,7 @@ public function update($issueIdOrKey, $issueField, $paramArray = [])
227227
* @throws JiraException
228228
* @throws \JsonMapper_Exception
229229
*
230-
* @return Comment|object Comment class
230+
* @return Comment Comment class
231231
*/
232232
public function addComment($issueIdOrKey, $comment)
233233
{
@@ -260,7 +260,7 @@ public function addComment($issueIdOrKey, $comment)
260260
* @throws JiraException
261261
* @throws \JsonMapper_Exception
262262
*
263-
* @return Comment|object Comment class
263+
* @return Comment Comment class
264264
*/
265265
public function updateComment($issueIdOrKey, $id, $comment)
266266
{
@@ -293,7 +293,7 @@ public function updateComment($issueIdOrKey, $id, $comment)
293293
* @throws JiraException
294294
* @throws \JsonMapper_Exception
295295
*
296-
* @return Comment|object Comment class
296+
* @return Comment Comment class
297297
*/
298298
public function getComment($issueIdOrKey, $id, array $paramArray = [])
299299
{
@@ -319,7 +319,7 @@ public function getComment($issueIdOrKey, $id, array $paramArray = [])
319319
* @throws JiraException
320320
* @throws \JsonMapper_Exception
321321
*
322-
* @return Comment|object Comment class
322+
* @return Comment Comment class
323323
*/
324324
public function getComments($issueIdOrKey, array $paramArray = [])
325325
{
@@ -539,7 +539,7 @@ public function transition($issueIdOrKey, $transition)
539539
* @throws JiraException
540540
* @throws \JsonMapper_Exception
541541
*
542-
* @return IssueSearchResult|object
542+
* @return IssueSearchResult
543543
*/
544544
public function search($jql, $startAt = 0, $maxResults = 15, $fields = [], $expand = [], $validateQuery = true)
545545
{
@@ -632,7 +632,7 @@ public function timeTracking($issueIdOrKey, $timeTracking)
632632
* @throws JiraException
633633
* @throws \JsonMapper_Exception
634634
*
635-
* @return PaginatedWorklog|object
635+
* @return PaginatedWorklog
636636
*/
637637
public function getWorklog($issueIdOrKey)
638638
{
@@ -655,7 +655,7 @@ public function getWorklog($issueIdOrKey)
655655
* @throws JiraException
656656
* @throws \JsonMapper_Exception
657657
*
658-
* @return Worklog|object PaginatedWorklog object
658+
* @return Worklog PaginatedWorklog object
659659
*/
660660
public function getWorklogById($issueIdOrKey, $workLogId)
661661
{
@@ -678,7 +678,7 @@ public function getWorklogById($issueIdOrKey, $workLogId)
678678
* @throws JiraException
679679
* @throws \JsonMapper_Exception
680680
*
681-
* @return Worklog|object Worklog Object
681+
* @return Worklog Worklog Object
682682
*/
683683
public function addWorklog($issueIdOrKey, $worklog)
684684
{
@@ -708,7 +708,7 @@ public function addWorklog($issueIdOrKey, $worklog)
708708
* @throws JiraException
709709
* @throws \JsonMapper_Exception
710710
*
711-
* @return Worklog|object
711+
* @return Worklog
712712
*/
713713
public function editWorklog($issueIdOrKey, $worklog, $worklogId)
714714
{
@@ -779,7 +779,7 @@ public function getAllPriorities()
779779
* @throws JiraException
780780
* @throws \JsonMapper_Exception
781781
*
782-
* @return Priority|object priority
782+
* @return Priority priority
783783
*/
784784
public function getPriority($priorityId)
785785
{
@@ -804,7 +804,7 @@ public function getPriority($priorityId)
804804
* @throws JiraException
805805
* @throws \JsonMapper_Exception
806806
*
807-
* @return Priority|object priority
807+
* @return Priority priority
808808
*/
809809
public function getCustomFields($priorityId)
810810
{

‎src/Project/ProjectService.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function getAllProjects($paramArray = [])
4242
* @throws \JiraRestApi\JiraException
4343
* @throws \JsonMapper_Exception
4444
*
45-
* @return Project|object
45+
* @return Project
4646
*/
4747
public function get($projectIdOrKey)
4848
{
@@ -156,7 +156,7 @@ public function getProjectTypes()
156156
* @throws \JiraRestApi\JiraException
157157
* @throws \JsonMapper_Exception
158158
*
159-
* @return ProjectType|object
159+
* @return ProjectType
160160
*/
161161
public function getProjectType($key)
162162
{
@@ -178,7 +178,7 @@ public function getProjectType($key)
178178
* @throws \JiraRestApi\JiraException
179179
* @throws \JsonMapper_Exception
180180
*
181-
* @return ProjectType|object
181+
* @return ProjectType
182182
*/
183183
public function getAccessibleProjectType($key)
184184
{

‎src/User/UserService.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class UserService extends \JiraRestApi\JiraClient
2121
* @throws \JiraRestApi\JiraException
2222
* @throws \JsonMapper_Exception
2323
*
24-
* @return User|object User class
24+
* @return User User class
2525
*/
2626
public function create($user)
2727
{
@@ -46,7 +46,7 @@ public function create($user)
4646
* @throws \JiraRestApi\JiraException
4747
* @throws \JsonMapper_Exception
4848
*
49-
* @return User|object User class
49+
* @return User User class
5050
*/
5151
public function get($paramArray)
5252
{

0 commit comments

Comments
 (0)