support custom fields

Author: lesstif

src/Issue/Issue.php

@@ -27,11 +27,4 @@ public function jsonSerialize()
     {
         return array_filter(get_object_vars($this));
     }
-
-    public function addCustomFields($data)
-    {
-        if ($this->fields) {
-            $this->fields->addCustomFields($data);
-        }
-    }
 }

src/Issue/IssueField.php

@@ -26,6 +26,11 @@ public function jsonSerialize()
         return array_filter(get_object_vars($this));
     }
 
+    public function getCustomFields()
+    {
+        return $this->customFields;
+    }
+
     public function getProjectKey()
     {
         return $this->project->key;
@@ -189,20 +194,6 @@ public function getIssueType()
         return $this->issuetype;
     }
 
-    /**
-     * add custom field.
-     *
-     * @param array $data
-     */
-    public function addCustomFields($data)
-    {
-        foreach ($data as $key => $value) {
-            if (substr($key, 0, 12) == 'customfield_') {
-                $this->{$key} = $value;
-            }
-        }
-    }
-
     /**
      *  set parent issue.
      *
@@ -335,4 +326,7 @@ public function setParent(Issue $parent)
 
     /** @var object|null */
     public $parent;
+
+    /** @var array|null */
+    public $customFields;
 }

src/Issue/IssueService.php

@@ -14,8 +14,6 @@ public function getIssueFromJSON($json)
             $json, new Issue()
         );
 
-        $issue->addCustomFields($issue->fields);
-
         return $issue;
     }
 
@@ -289,10 +287,6 @@ public function search($jql, $startAt = 0, $maxResults = 15, $fields = [])
             $json, new IssueSearchResult()
         );
 
-        foreach ($result->issues as $ndx => $issue_json) {
-            $result->getIssue($ndx)->addCustomFields($json->issues[$ndx]->fields);
-        }
-
         return $result;
     }
 

src/Issue/IssueStatus.php

@@ -19,6 +19,9 @@ class IssueStatus implements \JsonSerializable
     /* @var string */
     public $name;
 
+    /* @var Statuscategory */
+    public $statuscategory;
+
     public function jsonSerialize()
     {
         return array_filter(get_object_vars($this));

src/Issue/Statuscategory.php

@@ -0,0 +1,21 @@
+<?php
+namespace JiraRestApi\Issue;
+
+
+class Statuscategory
+{
+    /* @var string */
+    public $self;
+
+    /* @var string */
+    public $id;
+
+    /* @var string|null */
+    public $key;
+
+    /* @var string */
+    public $colorName;
+
+    /* @var string */
+    public $name;
+}

src/JiraClient.php

@@ -74,6 +74,8 @@ public function __construct(ConfigurationInterface $configuration = null, Logger
         $this->configuration = $configuration;
         $this->json_mapper = new \JsonMapper();
 
+        $this->json_mapper->undefinedPropertyHandler = [\JiraRestApi\JsonMapperHelper::class, 'setUndefinedProperty'];
+
         // create logger
         if ($logger) {
             $this->log = $logger;

src/JsonMapperHelper.php

@@ -0,0 +1,29 @@
+<?php
+namespace JiraRestApi;
+
+
+class JsonMapperHelper
+{
+    /**
+     * Handle undefined properties during JsonMapper::map()
+     *
+     * @param object $object    Object that is being filled
+     * @param string $propName  Name of the unknown JSON property
+     * @param mixed  $jsonValue JSON value of the property
+     *
+     * @return void
+     */
+    static function setUndefinedProperty($object, $propName, $jsonValue)
+    {
+        // If the property is a custom field type, assign a value to the custom Fields array.
+        if (substr($propName, 0, 12) == 'customfield_') {
+            if (!empty($jsonValue)) {
+                $object->{$propName} = $jsonValue;
+                $object->customFields[$propName] = $jsonValue;
+            }
+        } else {
+            $object->{$propName} = $jsonValue;
+        }
+
+    }
+}