fixed incorrect json mapping && add timetracking entity

src/Issue/Issue.php

@@ -20,7 +20,7 @@ class Issue implements \JsonSerializable
    /* @var string */
    public $key;
 
-   /* @var IssueField */
+    /** @var IssueField */
    public $fields;
 
     public function jsonSerialize()

src/Issue/IssueField.php

@@ -14,6 +14,7 @@ public function __construct($updateIssue = false)
             $this->versions = array();
 
             $this->issuetype = new \JiraRestApi\Issue\IssueType();
+            $this->timetracking = new \JiraRestApi\Issue\TimeTracking();
         }
     }
 
@@ -45,17 +46,6 @@ public function setProjectId($id)
         return $this;
     }
 
-    public function setIssueType($name)
-    {
-        if (is_null($this->issuetype)) {
-            $this->issuetype = new \JiraRestApi\Issue\IssueType();
-        }
-
-        $this->issuetype->name = $name;
-
-        return $this;
-    }
-
     public function setSummary($summary)
     {
         $this->summary = $summary;
@@ -144,7 +134,7 @@ public function addLabel($label)
     /** @var string */
     //public $progress;
 
-    /** @var string */
+    /** @var Timetracking */
     public $timetracking;
 
     /** @var IssueType */
@@ -156,10 +146,10 @@ public function addLabel($label)
     /** @var Reporter */
     public $reporter;
 
-    /** @var DateTime */
+    /** @var \DateTime */
     public $created;
 
-    /** @var DateTime */
+    /** @var \DateTime */
     public $updated;
 
     /** @var string */
@@ -168,48 +158,57 @@ public function addLabel($label)
     /** @var Priority */
     public $priority;
 
-    /** @var IssueStatus */
+    /** @var object */
     public $status;
 
-    /** @var string */
+    /** @var object[] */
     public $labels;
 
-    /** @var JiraRestApi\Project\Project */
+    /** @var \JiraRestApi\Project\Project */
     public $project;
 
     /** @var string */
     public $environment;
 
-    /** @var string */
+    /** @var string[] */
     public $components;
 
     /** @var Comments */
     public $comments;
 
-    /** @var string */
+    /** @var object */
     public $votes;
 
-    /** @var string */
+    /** @var object */
     public $resolution;
 
-    /** @var string */
+    /** @var string[] */
     public $fixVersions;
 
     /** @var Reporter */
     public $creator;
 
-    /** @var string */
+    /** @var object */
     public $watches;
 
-    /** @var string */
+    /** @var object */
     public $worklog;
 
     /** @var Reporter */
     public $assignee;
 
-    /* @var VersionList[\JiraRestApi\Issue\Version] */
+    /** @var \JiraRestApi\Issue\Version[] */
     public $versions;
 
-    /** @var AttachmentList[\JiraRestApi\Issue\Attachment] */
+    /** @var \JiraRestApi\Issue\Attachment[] */
     public $attachments;
+
+    /** @var  string */
+    public $aggregatetimespent;
+
+    /** @var  string */
+    public $timeestimate;
+
+    /** @var  string */
+    public $aggregatetimeoriginalestimate;
 }

src/Issue/IssueService.php

@@ -207,7 +207,7 @@ public function transition($issueIdOrKey, $transition)
      * @param int   $maxResults
      * @param array $fields
      *
-     * @return object
+     * @return IssueSearchResult
      */
     public function search($jql, $startAt=0, $maxResults=15, $fields=[])
     {

src/Issue/TimeTracking.php

@@ -0,0 +1,170 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: keanor
+ * Date: 29.07.15
+ * Time: 21:27
+ */
+namespace JiraRestApi\Issue;
+
+/**
+ * Class TimeTracking
+ *
+ * @package JiraRestApi\Issue
+ */
+class TimeTracking implements \JsonSerializable
+{
+    /**
+     * Original estimate
+     *
+     * @var string (ex 90m, 2h, 1d 2h 30m)
+     */
+    public $originalEstimate;
+
+    /**
+     * Remaining estimate
+     *
+     * @var string (ex 90m, 2h, 1d 2h 30m)
+     */
+    public $remainingEstimate;
+
+    /**
+     * Time spent
+     *
+     * @var string (ex 90m, 2h, 1d 2h 30m)
+     */
+    public $timeSpent;
+
+    /**
+     * Original estimate in seconds, generated in jira
+     * for create/update issue set $this->originalEstimate
+     *
+     * @var int
+     */
+    public $originalEstimateSeconds;
+
+    /**
+     * Remaining estimate in seconds, generated in jira
+     * for create/update issue set $this->remainingEstimate
+     *
+     * @var int
+     */
+    public $remainingEstimateSeconds;
+
+    /**
+     * Time spent in seconds, generated in jira
+     * for create/update issue set $this->timeSpent
+     *
+     * @var int
+     */
+    public $timeSpentSeconds;
+
+    /**
+     * @return string
+     */
+    public function getOriginalEstimate()
+    {
+        return $this->originalEstimate;
+    }
+
+    /**
+     * @param string $originalEstimate
+     */
+    public function setOriginalEstimate($originalEstimate)
+    {
+        $this->originalEstimate = $originalEstimate;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRemainingEstimate()
+    {
+        return $this->remainingEstimate;
+    }
+
+    /**
+     * @param string $remainingEstimate
+     */
+    public function setRemainingEstimate($remainingEstimate)
+    {
+        $this->remainingEstimate = $remainingEstimate;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTimeSpent()
+    {
+        return $this->timeSpent;
+    }
+
+    /**
+     * @param string $timeSpent
+     */
+    public function setTimeSpent($timeSpent)
+    {
+        $this->timeSpent = $timeSpent;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOriginalEstimateSeconds()
+    {
+        return $this->originalEstimateSeconds;
+    }
+
+    /**
+     * @param int $originalEstimateSeconds
+     */
+    public function setOriginalEstimateSeconds($originalEstimateSeconds)
+    {
+        $this->originalEstimateSeconds = $originalEstimateSeconds;
+    }
+
+    /**
+     * @return int
+     */
+    public function getRemainingEstimateSeconds()
+    {
+        return $this->remainingEstimateSeconds;
+    }
+
+    /**
+     * @param int $remainingEstimateSeconds
+     */
+    public function setRemainingEstimateSeconds($remainingEstimateSeconds)
+    {
+        $this->remainingEstimateSeconds = $remainingEstimateSeconds;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTimeSpentSeconds()
+    {
+        return $this->timeSpentSeconds;
+    }
+
+    /**
+     * @param int $timeSpentSeconds
+     */
+    public function setTimeSpentSeconds($timeSpentSeconds)
+    {
+        $this->timeSpentSeconds = $timeSpentSeconds;
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.4.0)<br/>
+     * Specify data which should be serialized to JSON
+     *
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     *       which is a value of any type other than a resource.
+     */
+    function jsonSerialize()
+    {
+        return array_filter(get_object_vars($this));
+    }
+}

src/JiraClient.php

@@ -84,13 +84,12 @@ protected function filterNullVariable($haystack)
 
     public function __construct($path = '.')
     {     
-        $dotenv = Dotenv::load($path);    
+        Dotenv::load($path);
 
         // not available in dotenv 1.1
         // $dotenv->required(['JIRA_HOST', 'JIRA_USER', 'JIRA_PASS']);
 
         $this->json_mapper = new \JsonMapper();
-        $this->json_mapper->bExceptionOnUndefinedProperty = true;
 
         $this->host = $this->env('JIRA_HOST');
         $this->username = $this->env('JIRA_USER');