Merge branch 'master' into master

Author: say1hello

.gitignore

@@ -26,3 +26,9 @@ screen_capture.png
 bug-description.pdf
 
 .env
+
+# Ignore Vagrant Stuff
+.vagrant
+Vagrantfile
+# Ignore scotch.io box and the folders of them
+public/

README.md

@@ -91,6 +91,7 @@ $iss = new IssueService(new ArrayConfiguration(
 ### Project
 - [Get Project Info](#get-project-info)
 - [Get All Project list](#get-all-project-list)
+- [Get Project Type](#get-project-type)
 
 ### Custom Field
 - [Get All Field list](#get-all-field-list)
@@ -103,6 +104,8 @@ $iss = new IssueService(new ArrayConfiguration(
 - [Create Sub Task](#create-sub-task)
 - [Add Attachment](#add-attachment)
 - [Update issue](#update-issue)
+- [Change assignee](#change-assignee)
+- [Remove issue](#remove-issue)
 - [Add comment](#add-comment)
 - [Perform a transition on an issue](#perform-a-transition-on-an-issue)
 - [Perform an advanced search, using the JQL](#perform-an-advanced-search)
@@ -160,6 +163,36 @@ try {
 
 ```
 
+#### Get Project type
+
+```php
+<?php
+require 'vendor/autoload.php';
+
+use JiraRestApi\Project\ProjectService;
+use JiraRestApi\Project\ProjectType;
+use JiraRestApi\JiraException;
+
+try {
+	$proj = new ProjectService();
+
+    // get all project type
+	$prjtyps = $proj->getProjectTypes();
+
+	foreach ($prjtyps as $pt) {
+	    var_dump($pt);
+	}
+
+	// get specific project type.
+	$pt = $proj->getProjectType('software');
+	var_dump($pt);
+
+} catch (JiraException $e) {
+	print("Error Occured! " . $e->getMessage());
+}
+
+```
+
 #### Get All Field List
 
 ```php
@@ -451,9 +484,15 @@ try {
 				->setDescription("This is a shorthand for a set operation on the summary field")
 				;
 
+	// optionally set some query params
+	$editParams = array(
+		'notifyUsers' => false
+	);
+	
 	$issueService = new IssueService();
 
-	$ret = $issueService->update($issueKey, $issueField);
+	// You can set the $paramArray param to disable notifications in example
+	$ret = $issueService->update($issueKey, $issueField, $editParams);
 
     var_dump($ret);
 } catch (JiraException $e) {
@@ -463,6 +502,56 @@ try {
 
 If you want to change the custom field type when updating an issue, you can call the *addCustomField* function just as you did for creating issue.
 
+#### Change Assignee
+
+```php
+<?php
+require 'vendor/autoload.php';
+
+use JiraRestApi\Issue\IssueService;
+use JiraRestApi\JiraException;
+
+$issueKey = "TEST-879";
+
+try {
+	$issueService = new IssueService();
+
+    // if assignee is -1, automatic assignee used.
+    // A null assignee will remove the assignee.
+    $assignee = 'newAssigneeName';
+
+    $ret = $issueService->changeAssignee($issueKey, $assignee);
+
+    var_dump($ret);
+} catch (JiraException $e) {
+	$this->assertTrue(FALSE, "Change Assignee Failed : " . $e->getMessage());
+}
+```
+
+#### Remove Issue
+
+```php
+<?php
+require 'vendor/autoload.php';
+
+use JiraRestApi\Issue\IssueService;
+use JiraRestApi\JiraException;
+
+$issueKey = "TEST-879";
+
+try {
+	$issueService = new IssueService();
+
+    $ret = $issueService->deleteIssue($issueKey);
+    // if you want to delete issues with sub-tasks
+    //$ret = $issueService->deleteIssue($issueKey, array('deleteSubtasks' => 'true'));
+
+    var_dump($ret);
+} catch (JiraException $e) {
+	$this->assertTrue(FALSE, "Change Assignee Failed : " . $e->getMessage());
+}
+```
+
 #### Add comment
 
 ```php

src/Issue/IssueService.php

@@ -127,6 +127,10 @@ private function bulkInsert($issues)
      */
     public function addAttachments($issueIdOrKey, $filePathArray)
     {
+        if (is_array($filePathArray) == false) {
+            $filePathArray = [$filePathArray];
+        }
+
         $results = $this->upload($this->uri."/$issueIdOrKey/attachments", $filePathArray);
 
         $this->log->addInfo('addAttachments result='.var_export($results, true));
@@ -155,10 +159,11 @@ public function addAttachments($issueIdOrKey, $filePathArray)
      *
      * @param   $issueIdOrKey Issue Key
      * @param   $issueField   object of Issue class
+     * @param array $paramArray Query Parameter key-value Array.
      *
      * @return created issue key
      */
-    public function update($issueIdOrKey, $issueField)
+    public function update($issueIdOrKey, $issueField, $paramArray = [])
     {
         $issue = new Issue();
 
@@ -171,7 +176,9 @@ public function update($issueIdOrKey, $issueField)
 
         $this->log->addInfo("Update Issue=\n".$data);
 
-        $ret = $this->exec($this->uri."/$issueIdOrKey", $data, 'PUT');
+        $queryParam = '?'.http_build_query($paramArray);
+
+        $ret = $this->exec($this->uri."/$issueIdOrKey".$queryParam, $data, 'PUT');
 
         return $ret;
     }
@@ -200,6 +207,53 @@ public function addComment($issueIdOrKey, $comment)
         return $comment;
     }
 
+    /**
+     * Change a issue assignee
+     *
+     * @param Issue $issueIdOrKey
+     * @param Assigns $assigneeName Assigns an issue to a user.
+     *    If the assigneeName is "-1" automatic assignee is used.
+     *    A null name will remove the assignee.
+     * @return true | false
+     * @throws JiraException
+     *
+     */
+    public function changeAssignee($issueIdOrKey, $assigneeName)
+    {
+        $this->log->addInfo("changeAssignee=\n");
+
+        $ar = ['name' => $assigneeName];
+
+        $data = json_encode($ar);
+
+        $ret = $this->exec($this->uri."/$issueIdOrKey/assignee", $data, 'PUT');
+
+        $this->log->addInfo('change assignee of '.$issueIdOrKey.' to ' . $assigneeName .' result='.var_export($ret, true));
+
+        return $ret;
+    }
+
+    /**
+      * Delete a issue.
+      *
+      * @param issueIdOrKey Issue id or key
+      * @param array $paramArray Query Parameter key-value Array.
+      * @return true | false
+      *
+      */
+    public function deleteIssue($issueIdOrKey, $paramArray = [])
+    {
+        $this->log->addInfo("deleteIssue=\n");
+
+        $queryParam = '?'.http_build_query($paramArray);
+
+        $ret = $this->exec($this->uri."/$issueIdOrKey".$queryParam, '', 'DELETE');
+
+        $this->log->addInfo('delete issue '.$issueIdOrKey.' result='.var_export($ret, true));
+
+        return $ret;
+    }
+    
     /**
      * Get a list of the transitions possible for this issue by the current user, along with fields that are required and their types.
      *

src/JiraClient.php

@@ -193,7 +193,7 @@ public function exec($context, $post_data = null, $custom_request = null)
 
             //The server successfully processed the request, but is not returning any content.
             if ($this->http_response == 204) {
-                return '';
+                return true;
             }
 
             // HostNotFound, No route to Host, etc Network error

src/Project/ProjectService.php

@@ -2,8 +2,8 @@
 
 namespace JiraRestApi\Project;
 
-use JiraRestApi\Issue\Reporter;
 use JiraRestApi\Issue\IssueType;
+use JiraRestApi\Issue\Reporter;
 
 class ProjectService extends \JiraRestApi\JiraClient
 {
@@ -19,7 +19,7 @@ public function getAllProjects()
         $ret = $this->exec($this->uri, null);
 
         $prjs = $this->json_mapper->mapArray(
-             json_decode($ret, false), new \ArrayObject(), '\JiraRestApi\Project\Project'
+            json_decode($ret, false), new \ArrayObject(), '\JiraRestApi\Project\Project'
         );
 
         return $prjs;
@@ -36,12 +36,12 @@ public function getAllProjects()
      */
     public function get($projectIdOrKey)
     {
-        $ret = $this->exec($this->uri."/$projectIdOrKey", null);
+        $ret = $this->exec($this->uri . "/$projectIdOrKey", null);
 
-        $this->log->addInfo('Result='.$ret);
+        $this->log->addInfo('Result=' . $ret);
 
         $prj = $this->json_mapper->map(
-             json_decode($ret), new Project()
+            json_decode($ret), new Project()
         );
 
         return $prj;
@@ -69,12 +69,63 @@ public function getAssignable($projectIdOrKey)
 
     public function getStatuses($projectIdOrKey)
     {
-        $ret = $this->exec($this->uri."/$projectIdOrKey/statuses", null);
+        $ret = $this->exec($this->uri . "/$projectIdOrKey/statuses", null);
         $json = json_decode($ret);
         $results = array_map(function ($elem) {
             return $this->json_mapper->map($elem, new IssueType());
         }, $json);
 
         return $results;
     }
+
+    /**
+     * @return ProjectType[]
+     */
+    public function getProjectTypes()
+    {
+        $ret = $this->exec($this->uri . "/type");
+
+        $this->log->addInfo('Result=' . $ret);
+
+        $json = json_decode($ret);
+        $results = array_map(function ($elem) {
+            return $this->json_mapper->map($elem, new ProjectType());
+        }, $json);
+
+        return $results;
+    }
+
+    /**
+     * @param string|int $key
+     * @return ProjectType
+     */
+    public function getProjectType($key)
+    {
+        $ret = $this->exec($this->uri . "/type/$key");
+
+        $this->log->addInfo('Result=' . $ret);
+
+        $type = $this->json_mapper->map(
+            json_decode($ret, false), new ProjectType()
+        );
+
+        return $type;
+    }
+
+    /**
+     * @param string|int $key
+     * @return ProjectType
+     */
+    public function getAccessibleProjectType($key)
+    {
+        $ret = $this->exec($this->uri . "/type/$key/accessible");
+
+        $this->log->addInfo('Result=' . $ret);
+
+        $type = $this->json_mapper->map(
+            json_decode($ret, false), new ProjectType()
+        );
+
+        return $type;
+    }
 }

src/Project/ProjectType.php

@@ -0,0 +1,25 @@
+<?php
+namespace JiraRestApi\Project;
+
+use JiraRestApi\ClassSerialize;
+
+class ProjectType
+{
+    use ClassSerialize;
+
+    /** @var  string */
+    public $key;
+
+    /** @var  string */
+    public $formattedKey;
+
+    /** @var  string */
+    public $descriptionI18nKey;
+
+    /** @var  string */
+    public $icon;
+
+    /** @var  string */
+    public $color;
+
+}