Merge pull request #238 from ConnectingElement/master

added removeWatcher to issue service

Author: lesstif

README.md

@@ -149,6 +149,7 @@ $iss = new IssueService(new ArrayConfiguration(
 - [Edit worklog in Issue](#edit-worklog-in-issue)
 - [Get Issue worklog](#get-issue-worklog)
 - [Add watcher to Issue](#add-watcher-to-issue)
+- [Remove watcher from Issue](#remove-watcher-from-issue)
 - [Send a notification to the recipients](#issue-notify)
 
 ### Comment
@@ -1393,6 +1394,32 @@ try {
 }
 ```
 
+#### Remove watcher from Issue
+
+[See Jira API reference](https://docs.atlassian.com/software/jira/docs/api/REST/latest/#api/2/issue-removeWatcher)
+
+```php
+<?php
+require 'vendor/autoload.php';
+
+use JiraRestApi\Issue\IssueService;
+use JiraRestApi\JiraException;
+
+$issueKey = 'TEST-961';
+
+try {
+    $issueService = new IssueService();
+    
+    // watcher's id
+    $watcher = 'lesstif';
+    
+    $issueService->removeWatcher($issueKey, $watcher);
+    
+} catch (JiraException $e) {
+    $this->assertTrue(false, 'add watcher Failed : '.$e->getMessage());
+}
+```
+
 #### issue notify
 
 [See Jira API reference](https://docs.atlassian.com/software/jira/docs/api/REST/latest/#api/2/issue-notify)

src/Issue/IssueService.php

@@ -764,6 +764,27 @@ public function addWatcher($issueIdOrKey, $watcher)
         return $this->http_response == 204 ? true : false;
     }
 
+    /**
+     * remove watcher from issue.
+     *
+     * @param string|int $issueIdOrKey
+     * @param string     $watcher      watcher id
+     *
+     * @throws JiraException
+     *
+     * @return bool
+     */
+    public function removeWatcher($issueIdOrKey, $watcher)
+    {
+        $this->log->addInfo("removeWatcher=\n");
+
+        $ret = $this->exec($this->uri."/$issueIdOrKey/watchers/?username=$watcher", '', 'DELETE');
+
+        $this->log->addInfo('remove watcher '.$issueIdOrKey.' result='.var_export($ret, true));
+
+        return $this->http_response == 204 ? true : false;
+    }
+
     /**
      * Get the meta data for creating issues.
      *

tests/WatcherLogTest.php

@@ -22,4 +22,18 @@ public function testAddWatcherLog()
             $this->assertTrue(false, 'testAddWatcherLog Failed : '.$e->getMessage());
         }
     }
+
+    public function testRemoveWatcherLog()
+    {
+        try {
+            $issueService = new IssueService();
+
+            // remove issue watcher
+            $ret = $issueService->removeWatcher($this->issueKey, 'lesstif');
+
+            Dumper::dump($ret);
+        } catch (JiraException $e) {
+            $this->assertTrue(false, 'testRemoveWatcherLog Failed : '.$e->getMessage());
+        }
+    }
 }