Adding and Removing groups.

Small fix of casesensitive variable name error.
Group list and element objects added.

Author: Artur (Seti) Łabudziński

src/Account/AccountService.php

@@ -3,6 +3,7 @@
 namespace Jira\Api\Account;
 
 use \Jira\Api\Account\Group;
+use \Jira\Api\Account\GroupList;
 
 class AccountService extends \Jira\Api\Client
 {
@@ -85,6 +86,38 @@ public function getGroup($name)
         return $group;
     }
 
+    public function findGroups($query = '')
+    {
+        if (self::$isJIRAUtf8)
+            $ret = $this->exec($this->uri.'s/picker?maxResults=1&'.($query?('query=' . str_replace(' ', '+', urlencode($query)).'&useUnicode=true&characterEncoding=unicode'):''));
+        else
+            $ret = $this->exec($this->uri.'s/picker?maxResults=1&'.($query?('query=' . str_replace(' ', '+', urlencode($query))):''));// .'&useUnicode=false&characterEncoding=unicode');
+//        $ret = $this->exec($this->uri.'?groupname=' . ($this->filterName($name,'+')) .'&useUnicode=true&characterEncoding=UTF8');
+//        $ret = $this->exec($this->uri, $json, 'POST');
+//        $ret = $this->exec($this->uri.'/member?groupname=' . $name);
+//var_dump($ret);
+
+        $groups = $this->json_mapper->map(
+             json_decode($ret), new GroupList()
+        );
+
+        if (self::$isJIRAUtf8)
+            $ret = $this->exec($this->uri.'s/picker?maxResults='.$groups->total.'&'.($query?('query=' . str_replace(' ', '+', urlencode($query)).'&useUnicode=true&characterEncoding=unicode'):''));
+        else
+            $ret = $this->exec($this->uri.'s/picker?maxResults='.$groups->total.'&'.($query?('query=' . str_replace(' ', '+', urlencode($query))):''));// .'&useUnicode=false&characterEncoding=unicode');
+//        $ret = $this->exec($this->uri.'?groupname=' . ($this->filterName($name,'+')) .'&useUnicode=true&characterEncoding=UTF8');
+//        $ret = $this->exec($this->uri, $json, 'POST');
+//        $ret = $this->exec($this->uri.'/member?groupname=' . $name);
+//var_dump($ret);
+
+        $groups = $this->json_mapper->map(
+             json_decode($ret), new GroupList()
+        );
+
+
+        return $groups;        
+    }
+    
     /**
      * @return \Jira\Api\Account\Group[]
      */
@@ -135,7 +168,7 @@ public function createGroup($name)
         $json = json_encode([
             'name' => $this->filterName($name),
         ]);
-        var_dump($json);
+//        var_dump($json);
         try {
             $ret = $this->exec($this->uri, $json, 'POST');
         } catch (\Exception $e) {
@@ -151,4 +184,22 @@ public function createGroup($name)
 
         return $group;
     }
+    
+    public function removeGroup($name)
+    {
+        $json = json_encode([
+            'groupname' => $this->filterName($name),
+            'name' => $this->filterName($name),
+            'group' => $this->filterName($name),
+        ]);
+        $ret = false;
+        try {
+            $ret = $this->exec($this->uri . '?groupname='.str_replace(' ', '+', urlencode($name)).'&useUnicode=true&characterEncoding=unicode', null, 'DELETE');
+        } catch (\Exception $e) {
+            return false;
+//            var_dump($e->getMessage());
+        }
+        
+        return $ret;
+    }
 }

src/Account/GroupElement.php

@@ -0,0 +1,13 @@
+<?php
+namespace Jira\Api\Account;
+
+
+class GroupElement //implements \JsonSerializable
+{
+    /** @var string */
+    public $name;
+    /** @var string */
+    public $html;
+    /** @var string[] */
+    public $labels;
+}

src/Account/GroupList.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Jira\Api\Account;
+
+class GroupList implements \JsonSerializable
+{
+    /**
+     * @var string
+     */
+    public $header;
+
+    /* @var integer */
+    public $total;
+
+    /** @var GroupElement[] */
+    public $groups;
+
+    public function jsonSerialize()
+    {
+        return array_filter(get_object_vars($this));
+    }
+}

src/Client.php

@@ -181,6 +181,7 @@ public function exec($context, $post_data = null, $custom_request = null, $tries
             }
             if (!is_null($custom_request) && $custom_request == 'DELETE') {
                 curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data);
             } else {
                 curl_setopt($ch, CURLOPT_POST, true);
                 curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data);
@@ -195,9 +196,11 @@ public function exec($context, $post_data = null, $custom_request = null, $tries
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($ch, CURLOPT_USERAGENT, self::$UserAgent . ($this->getConfiguration()->getUserAgent() ? ' ['.$this->getConfiguration()->getUserAgent().']' : ''));
         curl_setopt($ch, CURLOPT_HTTPHEADER,
-            array('Accept: */*', 'Content-Type: application/json'));
+            array('Accept: */*', 'Content-Type: application/json')
+        );
         curl_setopt($ch, CURLOPT_VERBOSE, $this->getConfiguration()->isCurlOptVerbose());
         $this->log->addDebug("Curl [".($custom_request ? $custom_request : 'GET')."] exec=".$url);
+//        echo "Curl [".($custom_request ? $custom_request : 'GET')."] exec=".$url;
 
         if ($context === 'issue' && strtolower($custom_request) === 'delete') {
             $url .= '/'.$post_data;

src/Issue/IssueField.php

@@ -190,7 +190,7 @@ public function getIssueType()
     public $progress;
 
     /** @var TimeTracking */
-    public $timeTracking;
+    public $timetracking;
 
     /** @var IssueType */
     public $issuetype;