Merge branch 'master' into pr/45

# Conflicts:
#	src/Issue/IssueField.php

Author: lesstif

src/Issue/IssueService.php

@@ -24,22 +24,25 @@ public function getIssueFromJSON($json)
      *
      * @param $issueIdOrKey
      * @param array $paramArray Query Parameter key-value Array.
+     * @param Issue $issueObject
      *
      * @return Issue class
      *
      * @throws JiraException
      * @throws \JsonMapper_Exception
      */
-    public function get($issueIdOrKey, $paramArray = [])
+    public function get($issueIdOrKey, $paramArray = [], $issueObject = null)
     {
+        $issueObject = ($issueObject) ? $issueObject : new Issue();
+
         $queryParam = '?'.http_build_query($paramArray);
 
         $ret = $this->exec($this->uri.'/'.$issueIdOrKey.$queryParam, null);
 
         $this->log->addInfo("Result=\n".$ret);
 
         return $issue = $this->json_mapper->map(
-            json_decode($ret), new Issue()
+            json_decode($ret), $issueObject
         );
     }
 

src/JiraClient.php

@@ -58,8 +58,9 @@ class JiraClient
      * Constructor.
      *
      * @param ConfigurationInterface $configuration
+     * @param Logger $logger
      */
-    public function __construct(ConfigurationInterface $configuration = null)
+    public function __construct(ConfigurationInterface $configuration = null, Logger $logger = null)
     {
         if ($configuration === null) {
             $path = './';
@@ -74,11 +75,15 @@ public function __construct(ConfigurationInterface $configuration = null)
         $this->json_mapper = new \JsonMapper();
 
         // create logger
-        $this->log = new Logger('JiraClient');
-        $this->log->pushHandler(new StreamHandler(
-            $configuration->getJiraLogFile(),
-            $this->convertLogLevel($configuration->getJiraLogLevel())
-        ));
+        if ($logger) {
+            $this->log = $logger;
+        } else {
+            $this->log = new Logger('JiraClient');
+            $this->log->pushHandler(new StreamHandler(
+                $configuration->getJiraLogFile(),
+                $this->convertLogLevel($configuration->getJiraLogLevel())
+            ));
+        }
 
         $this->http_response = 200;
     }

src/User/UserService.php

@@ -27,8 +27,27 @@ public function get($paramArray)
 
         $this->log->addInfo("Result=\n".$ret);
 
-        return $issue = $this->json_mapper->map(
+        return $this->json_mapper->map(
                 json_decode($ret), new User()
         );
     }
+
+    public function search($paramArray)
+    {
+        $queryParam = '?'.http_build_query($paramArray);
+
+        $ret = $this->exec($this->uri.'/search'.$queryParam, null);
+
+        $this->log->addInfo("Result=\n".$ret);
+
+        $userData = json_decode($ret);
+        $users = [];
+
+        foreach($userData as $user) {
+            $users[] = $this->json_mapper->map(
+                $user, new User()
+            );
+        }
+        return $users;
+    }
 }